From 225e1b887423a6a5972cf90216156eebc727a41d Mon Sep 17 00:00:00 2001
From: Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>
Date: Tue, 30 Jun 2020 16:22:34 +0000
Subject: [PATCH] DG changes for the closed loop and async support in MDONS

Change-Id: Ibb16b84cd37d8d41dd0f511fea81ec329a0f8021
Issue-ID: SDNC-1233
Signed-off-by: Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>
---
 installation/sdnc/src/main/resources/sdnctl.dump   |    1 +
 .../main/properties/optical-service-dg.properties  |    2 +
 ...ptical-service_aai-delete-service-handling.json |  208 +--
 .../json/optical-service_create-service-async.json |  269 ++--
 ...ptical-service_create-service-relationship.json |  166 +--
 .../optical-service_inter-domain-handling.json     | 1226 ++++++++++--------
 .../json/optical-service_mdons-closed-loop.json    |  868 +++++++++++++
 ...ervice_optical-service-create-sync-success.json |  142 +-
 .../optical-service_optical-service-create.json    |  880 +++++++------
 .../optical-service_optical-service-delete.json    | 1355 ++++++++------------
 .../json/optical-service_service-delete-tapi.json  |  480 +++----
 .../src/main/resources/graph.versions              |    1 +
 ...optical-service_aai-delete-service-handling.xml |   48 +-
 .../xml/optical-service_create-service-async.xml   |   30 +-
 ...optical-service_create-service-relationship.xml |   20 +-
 .../xml/optical-service_inter-domain-handling.xml  |  330 ++---
 .../main/xml/optical-service_mdons-closed-loop.xml |  237 ++++
 ...service_optical-service-create-sync-success.xml |    4 +-
 .../xml/optical-service_optical-service-create.xml |   69 +-
 .../xml/optical-service_optical-service-delete.xml |  234 ++--
 .../xml/optical-service_service-delete-tapi.xml    |    1 +
 .../src/main/json/async-response-so.json           |    8 +
 .../restapi-templates/src/main/json/oof-mdons.json |   30 +
 .../src/main/json/optical-service-create-msa.json  |    4 +-
 .../src/main/json/optical-service-delete-msa.json  |    2 +-
 25 files changed, 3876 insertions(+), 2739 deletions(-)
 create mode 100644 platform-logic/optical-service/src/main/json/optical-service_mdons-closed-loop.json
 create mode 100644 platform-logic/optical-service/src/main/xml/optical-service_mdons-closed-loop.xml
 create mode 100644 platform-logic/restapi-templates/src/main/json/async-response-so.json
 create mode 100644 platform-logic/restapi-templates/src/main/json/oof-mdons.json

diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump
index f47e1a32..72fdc857 100644
--- a/installation/sdnc/src/main/resources/sdnctl.dump
+++ b/installation/sdnc/src/main/resources/sdnctl.dump
@@ -1907,6 +1907,7 @@ CREATE TABLE `REQUEST_DETAILS` (
   `global_customer_id` varchar(255) DEFAULT NULL,
   `notification_url` varchar(255) DEFAULT NULL,
   `domain_requests` varchar(255) DEFAULT NULL,
+  `pinterface_list` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`request_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/installation/src/main/properties/optical-service-dg.properties b/installation/src/main/properties/optical-service-dg.properties
index c659aa26..07a3ec66 100644
--- a/installation/src/main/properties/optical-service-dg.properties
+++ b/installation/src/main/properties/optical-service-dg.properties
@@ -17,3 +17,5 @@ so.password=password1$
 tapi.cep.details.url=/cxf/tapi/v2/connectivities/service-interface-points?topology-id-or-name=otn&sip-id-or-name=
 tapi.delete.service.url=/cxf/tapi/v2/connectivities/tapi-services?topology-id-or-name=otn&service-id-or-name=
 tapi.get.services.url=/cxf/tapi/v2/connectivities/tapi-services?topology-id-or-name=otn&service-id-or-name=
+oof.mdons.url=https://oof-osdf.onap:8698/api/oof/mdons/route/v1
+
diff --git a/platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json b/platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json
index 86ae420f..82703571 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "dc8e74bc.6b0e6",
+        "id": "c59cd7ed.c18398",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 201.5,
-        "y": 89.5,
-        "z": "78cee624.48d318",
+        "x": 296.6761169433594,
+        "y": 220.00946044921875,
+        "z": "21304dc.3a53bb2",
         "wires": [
             [
-                "793fbbb8.688d0c"
+                "7775f962.7d1d48"
             ]
         ]
     },
     {
-        "id": "793fbbb8.688d0c",
+        "id": "7775f962.7d1d48",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,237 +22,269 @@
         "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='optical-service' version='${project.version}'>",
         "outputs": 1,
-        "x": 388.5,
-        "y": 38.5,
-        "z": "78cee624.48d318",
+        "x": 483.6761169433594,
+        "y": 169.00946044921875,
+        "z": "21304dc.3a53bb2",
         "wires": [
             [
-                "fac8c114.6a11a"
+                "b8012816.18beb8"
             ]
         ]
     },
     {
-        "id": "fac8c114.6a11a",
+        "id": "b8012816.18beb8",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='aai-delete-service-handling' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 242.5,
-        "y": 212.5,
-        "z": "78cee624.48d318",
+        "x": 337.6761169433594,
+        "y": 343.00946044921875,
+        "z": "21304dc.3a53bb2",
         "wires": [
             [
-                "af5e3982.ec86d8"
+                "196e7dad.1c2812"
             ]
         ]
     },
     {
-        "id": "af5e3982.ec86d8",
+        "id": "196e7dad.1c2812",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 415.5,
-        "y": 211.5,
-        "z": "78cee624.48d318",
+        "x": 510.6761169433594,
+        "y": 342.00946044921875,
+        "z": "21304dc.3a53bb2",
         "wires": [
             [
-                "47ce9b8c.699c64",
-                "532ef147.e30af8",
-                "d5300514.b84e18",
-                "e3be8795.085c9",
-                "31c5321a.c7540e",
-                "137b4c1c.0ee49c"
+                "a6739c0e.92be6",
+                "f1965e9d.262ad",
+                "683ccc80.4a0d74",
+                "2d2c4969.e00236",
+                "25b8985d.2f67f8",
+                "5ffac464.a53b7c"
             ]
         ]
     },
     {
-        "id": "47ce9b8c.699c64",
+        "id": "a6739c0e.92be6",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 646.5,
-        "y": 98.5,
-        "z": "78cee624.48d318",
+        "x": 741.6761169433594,
+        "y": 229.00946044921875,
+        "z": "21304dc.3a53bb2",
         "wires": [
             []
         ]
     },
     {
-        "id": "532ef147.e30af8",
+        "id": "f1965e9d.262ad",
         "type": "get-resource",
         "name": "Get service from AAI",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\n key='customer.global-customer-id = $output.global-customer-id AND\n     service-subscription.service-type = $output.service-type AND\n     service-instance.service-instance-id = $output.service-instance-id' \npfx='aai.service'      local-only='false'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 665.5,
-        "y": 214.5,
-        "z": "78cee624.48d318",
+        "x": 760.6761169433594,
+        "y": 345.00946044921875,
+        "z": "21304dc.3a53bb2",
         "wires": [
             []
         ]
     },
     {
-        "id": "d5300514.b84e18",
+        "id": "683ccc80.4a0d74",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n<parameter name=\"field2\" value=\"`$aai.service.orchestration-status`\"/>\n<parameter name=\"field3\" value=\"`$aai.service.relationship-list.relationship_length`\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 675.5,
-        "y": 280.5,
-        "z": "78cee624.48d318",
+        "x": 770.6761169433594,
+        "y": 411.00946044921875,
+        "z": "21304dc.3a53bb2",
         "wires": [
             []
         ]
     },
     {
-        "id": "e3be8795.085c9",
+        "id": "2d2c4969.e00236",
         "type": "for",
         "name": "for",
-        "xml": "<for index='idx' start='1' end='`$aai.service.relationship-list.relationship_length`' >\n",
+        "xml": "<for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 648.5,
-        "y": 343.5,
-        "z": "78cee624.48d318",
+        "x": 743.6761169433594,
+        "y": 474.00946044921875,
+        "z": "21304dc.3a53bb2",
         "wires": [
             [
-                "3755c730.096448"
+                "8c2d23c8.832ee"
             ]
         ]
     },
     {
-        "id": "9620ad1b.3b5ab",
+        "id": "9ec6b9b8.0d7588",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />\n<parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />\n\n",
         "comments": "",
-        "x": 1058.5,
-        "y": 30.5,
-        "z": "78cee624.48d318",
+        "x": 1322.0094909667969,
+        "y": 134.34279251098633,
+        "z": "21304dc.3a53bb2",
         "wires": []
     },
     {
-        "id": "7afe7104.170b88",
+        "id": "9554b44d.e6e5c8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n<parameter name=\"field2\" value=\"`$pnf-name`\"/>\n<parameter name=\"field3\" value=\"`$pinterface-name`\"/>\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1081.5,
-        "y": 99.5,
-        "z": "78cee624.48d318",
+        "x": 1315.0093841552734,
+        "y": 213.34278774261475,
+        "z": "21304dc.3a53bb2",
         "wires": [
             []
         ]
     },
     {
-        "id": "31c5321a.c7540e",
+        "id": "25b8985d.2f67f8",
         "type": "delete",
         "name": "delete service instance AAI",
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\nkey='customer.global-customer-id = $output.global-customer-id AND\nservice-subscription.service-type = $output.service-type AND\nservice-instance.service-instance-id = $output.service-instance-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 668.5,
-        "y": 419.5,
-        "z": "78cee624.48d318",
+        "x": 763.6761169433594,
+        "y": 550.0094604492188,
+        "z": "21304dc.3a53bb2",
         "wires": [
             []
         ]
     },
     {
-        "id": "3755c730.096448",
+        "id": "4840f1f2.10ca4",
         "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 832.5,
-        "y": 347.5,
-        "z": "78cee624.48d318",
+        "x": 1097.6760864257812,
+        "y": 408.00942039489746,
+        "z": "21304dc.3a53bb2",
         "wires": [
             [
-                "9620ad1b.3b5ab",
-                "7afe7104.170b88",
-                "d6286179.01c048",
-                "651efb55.9daa24",
-                "24dec78d.b7fd48",
-                "3e61b022.837b4"
+                "9ec6b9b8.0d7588",
+                "9554b44d.e6e5c8",
+                "c93b81e9.ed754",
+                "1719f86d.9ee9a8",
+                "d599af84.718a",
+                "e87968c4.4c12d8"
             ]
         ]
     },
     {
-        "id": "137b4c1c.0ee49c",
+        "id": "5ffac464.a53b7c",
         "type": "delete",
         "name": "delete from db",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id\">",
         "comments": "",
         "outputs": 1,
-        "x": 605.5,
-        "y": 476.5,
-        "z": "78cee624.48d318",
+        "x": 700.6761169433594,
+        "y": 607.0094604492188,
+        "z": "21304dc.3a53bb2",
         "wires": [
             []
         ]
     },
     {
-        "id": "24dec78d.b7fd48",
+        "id": "d599af84.718a",
         "type": "get-resource",
         "name": "get p-interface total capacity",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name ' \npfx='p.in.details'      local-only='false'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1178.3887939453125,
-        "y": 155.61111450195312,
-        "z": "78cee624.48d318",
+        "x": 1403.5649185180664,
+        "y": 284.45390129089355,
+        "z": "21304dc.3a53bb2",
         "wires": [
             []
         ]
     },
     {
-        "id": "3e61b022.837b4",
+        "id": "e87968c4.4c12d8",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='new-rate' value='`$p.in.details.speed-value`' />\n",
         "comments": "",
-        "x": 1118.611083984375,
-        "y": 245.83334350585938,
-        "z": "78cee624.48d318",
+        "x": 1330.4538688659668,
+        "y": 359.6761236190796,
+        "z": "21304dc.3a53bb2",
         "wires": []
     },
     {
-        "id": "d6286179.01c048",
+        "id": "c93b81e9.ed754",
         "type": "update",
         "name": "update p-interface capacity AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='p-interface'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name '\n      local-only='false'>\n<parameter name='available-capacity' value='`$new-rate`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
         "comments": "",
         "outputs": 1,
-        "x": 1085.5,
-        "y": 351.5,
-        "z": "78cee624.48d318",
+        "x": 1357.3428497314453,
+        "y": 425.34275674819946,
+        "z": "21304dc.3a53bb2",
         "wires": [
             []
         ]
     },
     {
-        "id": "651efb55.9daa24",
+        "id": "1719f86d.9ee9a8",
         "type": "save",
         "name": "update pinterface rate DB",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $new-rate WHERE interface_name = $pinterface-name '\nforce='true' pfx='save-result'>",
         "comments": "",
         "outputs": 1,
-        "x": 1076.5,
-        "y": 419.5,
-        "z": "78cee624.48d318",
+        "x": 1360.009407043457,
+        "y": 503.34279108047485,
+        "z": "21304dc.3a53bb2",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "8c2d23c8.832ee",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$aai.service.relationship-list.relationship[$idx].related-to == 'p-interface'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 918.9488182067871,
+        "y": 410.0094404220581,
+        "z": "21304dc.3a53bb2",
+        "wires": [
+            [
+                "161999ff.507a66"
+            ]
+        ]
+    },
+    {
+        "id": "161999ff.507a66",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1015.6155395507811,
+        "y": 348.3428064982096,
+        "z": "21304dc.3a53bb2",
+        "wires": [
+            [
+                "4840f1f2.10ca4"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_create-service-async.json b/platform-logic/optical-service/src/main/json/optical-service_create-service-async.json
index 6926f79a..0b04c88e 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_create-service-async.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_create-service-async.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "ef271e98.1343d",
+        "id": "f8033564.9370d8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 225.5555419921875,
-        "y": 244.44442749023438,
-        "z": "d7735114.f6066",
+        "x": 181.6761474609375,
+        "y": 191.33330249786377,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "69929ea4.2407d"
+                "396bd8ff.6c58d8"
             ]
         ]
     },
     {
-        "id": "69929ea4.2407d",
+        "id": "396bd8ff.6c58d8",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,304 +22,361 @@
         "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='optical-service' version='${project.version}'>",
         "outputs": 1,
-        "x": 412.5555419921875,
-        "y": 193.44442749023438,
-        "z": "d7735114.f6066",
+        "x": 425.3428039550781,
+        "y": 190.33333206176758,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "926e362a.257c68"
+                "f3cde665.570898"
             ]
         ]
     },
     {
-        "id": "926e362a.257c68",
+        "id": "f3cde665.570898",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='create-service-async' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 266.5555419921875,
-        "y": 367.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 279.3428039550781,
+        "y": 364.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "1e677fcc.18edb"
+                "5d03132f.ed8e9c"
             ]
         ]
     },
     {
-        "id": "1e677fcc.18edb",
+        "id": "5d03132f.ed8e9c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 439.5555419921875,
-        "y": 366.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 452.3428039550781,
+        "y": 363.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "570787b6.c60918",
-                "8b32ac88.06a0b",
-                "d11ad8e1.0343c8"
+                "c00ad46.901e428",
+                "740307b2.aec648",
+                "8396b208.e8981",
+                "f2d65098.e5d31",
+                "88fbe255.2e8d8"
             ]
         ]
     },
     {
-        "id": "570787b6.c60918",
+        "id": "c00ad46.901e428",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Create Service Async\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 612.5555419921875,
-        "y": 277.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 625.3428039550781,
+        "y": 274.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": [
             []
         ]
     },
     {
-        "id": "28c538c4.2302f8",
+        "id": "2095fee4.0c3a12",
         "type": "record",
         "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Finished updating service in AAI and DB to CREATED\"/>\n\n",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Finished updating service in AAI and DB to CREATED\"/>\n<parameter name=\"field2\" value=\"`$access.request-id`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1140.5555419921875,
-        "y": 359.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 1153.3428039550781,
+        "y": 356.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e382c44.972184",
+        "id": "c0a2442.32b91b8",
         "type": "update",
         "name": "update AAI service 'CREATED'",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='service-instance'\n     key='customer.global-customer-id = $output.global-customer-id AND\n     service-subscription.service-type = $output.service-type AND\n     service-instance.service-instance-id = $output.service-instance-id' \n      local-only='false'>\n<parameter name='orchestration-status' value='CREATED' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
         "comments": "",
         "outputs": 1,
-        "x": 1163.5555419921875,
-        "y": 227.44442749023438,
-        "z": "d7735114.f6066",
+        "x": 1171.342788696289,
+        "y": 124.33332633972168,
+        "z": "be3a2ce6.bef39",
         "wires": [
             []
         ]
     },
     {
-        "id": "11f258cf.0cfbe7",
+        "id": "1636ba76.3cb676",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='200'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 744.5555419921875,
-        "y": 328.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 757.3428039550781,
+        "y": 325.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "6823decd.1c0f4"
+                "6a3de87a.5b8598"
             ]
         ]
     },
     {
-        "id": "1f9398a1.9403f7",
+        "id": "40e998b6.692d98",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 735.5555419921875,
-        "y": 440.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 748.3428039550781,
+        "y": 437.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "a0d9ffaf.322a"
+                "c72fdddc.3040e"
             ]
         ]
     },
     {
-        "id": "6823decd.1c0f4",
+        "id": "6a3de87a.5b8598",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 914.5555419921875,
-        "y": 306.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 927.3428039550781,
+        "y": 303.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "28c538c4.2302f8",
-                "5e382c44.972184",
-                "8124c756.1dde88",
-                "15476d01.4a1043"
+                "2095fee4.0c3a12",
+                "c0a2442.32b91b8",
+                "c32477f.3156e88",
+                "28d57db1.c0d9d2",
+                "deb2202e.47c5f",
+                "60087b41.b7d234"
             ]
         ]
     },
     {
-        "id": "a0d9ffaf.322a",
+        "id": "c72fdddc.3040e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 907.5555419921875,
-        "y": 443.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 920.3428039550781,
+        "y": 440.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "20546055.63c8f",
-                "7353aa4c.564df4"
+                "8b92a1e7.bc27c",
+                "aff39e4d.84164"
             ]
         ]
     },
     {
-        "id": "8b32ac88.06a0b",
+        "id": "740307b2.aec648",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$response-code`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 613.5555419921875,
-        "y": 366.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 626.3428039550781,
+        "y": 363.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "11f258cf.0cfbe7",
-                "1f9398a1.9403f7"
+                "1636ba76.3cb676",
+                "40e998b6.692d98"
             ]
         ]
     },
     {
-        "id": "8124c756.1dde88",
+        "id": "c32477f.3156e88",
         "type": "save",
         "name": "update DB 'CREATED'",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"CREATED\" WHERE request_id = $request-id'\nforce='true' pfx='save-result'>",
         "comments": "",
         "outputs": 1,
-        "x": 1177.5555419921875,
-        "y": 299.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 1177.0094146728516,
+        "y": 192.99999713897705,
+        "z": "be3a2ce6.bef39",
         "wires": [
             []
         ]
     },
     {
-        "id": "20546055.63c8f",
+        "id": "8b92a1e7.bc27c",
         "type": "call",
         "name": "call",
         "xml": "<call module='optical-service' rpc='aai-delete-service-handling' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1058.5555419921875,
-        "y": 471.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 1071.3428039550781,
+        "y": 468.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": [
             []
         ]
     },
     {
-        "id": "d11ad8e1.0343c8",
+        "id": "8396b208.e8981",
         "type": "execute",
         "name": "execute",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.template.so.response.filename`\" />\n<parameter name=\"restapiUrl\" value=\"`$output.notification-url`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.so.username`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.so.password`\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"so-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/async-response-so.json'`\" />\n<parameter name=\"restapiUrl\" value=\"http://so-bpmn-infra.onap:8081/mso/async/services/updateStatus\"/>\n<parameter name=\"restapiUser\" value=\"sdncaBpmn\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.so.password`\"/>\n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"so-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />",
         "comments": "",
         "outputs": 1,
-        "x": 600.5555419921875,
-        "y": 501.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 476.6761817932129,
+        "y": 611.6665420532227,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "7c0eb31b.04d7bc",
-                "f4076cb2.329c4"
+                "5f7ef8af.965fc8",
+                "9e60f285.734b9"
             ]
         ]
     },
     {
-        "id": "7c0eb31b.04d7bc",
+        "id": "5f7ef8af.965fc8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 762.5555419921875,
-        "y": 494.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 640.3428001403809,
+        "y": 551.3333511352539,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "d698b0bd.4bbda"
+                "5070ed23.8c9e54"
             ]
         ]
     },
     {
-        "id": "f4076cb2.329c4",
+        "id": "9e60f285.734b9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 764.5555419921875,
-        "y": 564.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 655.6761627197266,
+        "y": 746.3332901000977,
+        "z": "be3a2ce6.bef39",
         "wires": [
             [
-                "43f03cc3.9bf324"
+                "a1bca3b0.e469f"
             ]
         ]
     },
     {
-        "id": "d698b0bd.4bbda",
+        "id": "5070ed23.8c9e54",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Send to SO fails for service create\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 904.5555419921875,
-        "y": 494.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 800.6762237548828,
+        "y": 552.9999961853027,
+        "z": "be3a2ce6.bef39",
         "wires": [
             []
         ]
     },
     {
-        "id": "43f03cc3.9bf324",
+        "id": "a1bca3b0.e469f",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Send to SO Success for service create\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 904.5555419921875,
-        "y": 564.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 804.0094413757324,
+        "y": 747.9999389648438,
+        "z": "be3a2ce6.bef39",
         "wires": [
             []
         ]
     },
     {
-        "id": "15476d01.4a1043",
+        "id": "28d57db1.c0d9d2",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='response-message' value='SUCCESS' />\n",
         "comments": "",
-        "x": 1073.5555419921875,
-        "y": 146.44442749023438,
-        "z": "d7735114.f6066",
+        "x": 1088.0094108581543,
+        "y": 65.00000095367432,
+        "z": "be3a2ce6.bef39",
         "wires": []
     },
     {
-        "id": "7353aa4c.564df4",
+        "id": "aff39e4d.84164",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='response-message' value='FAILURE' />\n",
         "comments": "",
-        "x": 1052.5555419921875,
-        "y": 401.4444274902344,
-        "z": "d7735114.f6066",
+        "x": 1065.3428039550781,
+        "y": 398.3333320617676,
+        "z": "be3a2ce6.bef39",
         "wires": []
+    },
+    {
+        "id": "deb2202e.47c5f",
+        "type": "get-resource",
+        "name": "get access db",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey=\"SELECT * from REQUEST_DETAILS WHERE domain_requests = $request-id \"\npfx='access'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n     \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1168.3428573608398,
+        "y": 261.67612648010254,
+        "z": "be3a2ce6.bef39",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "60087b41.b7d234",
+        "type": "save",
+        "name": "update DB 'CREATED' access",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"CREATED\" WHERE request_id = $access.request-id'\nforce='true' pfx='save-result'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1185.0093460083008,
+        "y": 301.67611503601074,
+        "z": "be3a2ce6.bef39",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f2d65098.e5d31",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='so.service-instance-id' value='`$access.service-instance-id`' />\n<parameter name='so.service-type' value='`$access.service-type`' />\n<parameter name='so.svc-request-id' value='`$access.request-id`' />\n<parameter name='so.response-code' value='`$response-code`' />\n<parameter name='so.response-message' value='`$response-message`' />\n<parameter name='so.ack-final-indicator' value='Y' />\n\n",
+        "comments": "",
+        "x": 628.3427734375,
+        "y": 460.0093746185303,
+        "z": "be3a2ce6.bef39",
+        "wires": []
+    },
+    {
+        "id": "88fbe255.2e8d8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"SO Parameters\"/>\n<parameter name=\"field2\" value=\"`$so.service-instance-id`\"/>\n<parameter name=\"field3\" value=\"`$so.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"`$so.response-code`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 563.342830657959,
+        "y": 516.6761665344238,
+        "z": "be3a2ce6.bef39",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_create-service-relationship.json b/platform-logic/optical-service/src/main/json/optical-service_create-service-relationship.json
index 569e23b7..677ecfb8 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_create-service-relationship.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_create-service-relationship.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "acab78dd.697a38",
+        "id": "8469fb91.605138",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 382.5,
-        "y": 262.5,
-        "z": "c7becd47.884",
+        "x": 293.3428039550781,
+        "y": 163.34280395507812,
+        "z": "e2d31f86.7e711",
         "wires": [
             [
-                "c2dcb871.d886d8"
+                "65b11c2c.287414"
             ]
         ]
     },
     {
-        "id": "56ba0c7c.085e74",
+        "id": "f41fcd25.5614c",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='create-service-relationship' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 381.5,
-        "y": 337.5,
-        "z": "c7becd47.884",
+        "x": 292.3428039550781,
+        "y": 238.34280395507812,
+        "z": "e2d31f86.7e711",
         "wires": [
             [
-                "f37956ce.4bd828"
+                "c43dc2ab.62791"
             ]
         ]
     },
     {
-        "id": "c2dcb871.d886d8",
+        "id": "65b11c2c.287414",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -38,185 +38,201 @@
         "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='optical-service' version='${project.version}'>",
         "outputs": 1,
-        "x": 593.3333435058594,
-        "y": 198.83333206176758,
-        "z": "c7becd47.884",
+        "x": 504.1761474609375,
+        "y": 99.6761360168457,
+        "z": "e2d31f86.7e711",
         "wires": [
             [
-                "56ba0c7c.085e74"
+                "f41fcd25.5614c"
             ]
         ]
     },
     {
-        "id": "f37956ce.4bd828",
+        "id": "c43dc2ab.62791",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 564.5,
-        "y": 332.5,
-        "z": "c7becd47.884",
+        "x": 475.3428039550781,
+        "y": 233.34280395507812,
+        "z": "e2d31f86.7e711",
         "wires": [
             [
-                "c34ad1e6.1b049",
-                "49230af2.d808d4",
-                "30a10176.609d7e",
-                "dc89cfb.651ad3"
+                "b524a229.9b341",
+                "aa8633b7.9450f",
+                "431986ba.331828",
+                "cd86f64d.b2ee08"
             ]
         ]
     },
     {
-        "id": "c34ad1e6.1b049",
+        "id": "b524a229.9b341",
         "type": "get-resource",
         "name": "get-resource",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom REQUEST_DETAILS\nWHERE request_id = $as-request-id'\npfx='access-service'>",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom REQUEST_DETAILS\nWHERE request_id = $access-request-id'\npfx='access-service'>",
         "comments": "",
         "outputs": 1,
-        "x": 749.1666946411133,
-        "y": 316.05555152893066,
-        "z": "c7becd47.884",
+        "x": 663.3428268432617,
+        "y": 211.89835357666016,
+        "z": "e2d31f86.7e711",
         "wires": [
             []
         ]
     },
     {
-        "id": "49230af2.d808d4",
+        "id": "aa8633b7.9450f",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$access-service.domain-requests`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"domain-services\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 741.5,
-        "y": 361.5,
-        "z": "c7becd47.884",
+        "x": 652.3428039550781,
+        "y": 262.3428039550781,
+        "z": "e2d31f86.7e711",
         "wires": [
             []
         ]
     },
     {
-        "id": "30a10176.609d7e",
+        "id": "431986ba.331828",
         "type": "for",
         "name": "for",
         "xml": "<for index='idc' start='0' end='`$domain-services_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 713.5,
-        "y": 448.5,
-        "z": "c7becd47.884",
+        "x": 624.3428039550781,
+        "y": 349.3428039550781,
+        "z": "e2d31f86.7e711",
         "wires": [
             [
-                "c1fe8f71.3771e"
+                "e35ff615.9d0f88"
             ]
         ]
     },
     {
-        "id": "c1fe8f71.3771e",
+        "id": "e35ff615.9d0f88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 859.5,
-        "y": 441.5,
-        "z": "c7becd47.884",
+        "x": 770.3428039550781,
+        "y": 342.3428039550781,
+        "z": "e2d31f86.7e711",
         "wires": [
             [
-                "a9fba6b1.9ea4a8",
-                "5b28c4f8.97075c"
+                "f0b5dca1.f7424",
+                "925da1f9.f5dbc"
             ]
         ]
     },
     {
-        "id": "a9fba6b1.9ea4a8",
+        "id": "f0b5dca1.f7424",
         "type": "get-resource",
         "name": "get-resource",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom REQUEST_DETAILS\nWHERE request_id = $domain-services[$idc]'\npfx='ds-details'>",
         "comments": "",
         "outputs": 1,
-        "x": 1007.1666946411133,
-        "y": 279.8333444595337,
-        "z": "c7becd47.884",
+        "x": 918.0094985961914,
+        "y": 180.67614841461182,
+        "z": "e2d31f86.7e711",
         "wires": [
             []
         ]
     },
     {
-        "id": "d767bb7e.ede568",
+        "id": "252e0c6e.633014",
         "type": "save",
         "name": "save domain service",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $access-service.service-instance-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"service-instance\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/business/customers/customer/' + $optical-service-create-input.global-customer-id + '/service-subscriptions/service-subscription/' + $optical-service-create-input.service-type + '/service-instances/service-instance/' + $ds-details.service-instance-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"service-instance.service-instance-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$ds-details.service-instance-id`\" /> \n",
         "comments": "",
         "outputs": 1,
-        "x": 1247.1666107177734,
-        "y": 443.61108779907227,
-        "z": "c7becd47.884",
+        "x": 1158.0094146728516,
+        "y": 344.4538917541504,
+        "z": "e2d31f86.7e711",
         "wires": [
             []
         ]
     },
     {
-        "id": "3081486c.145aa8",
+        "id": "8b192abd.7a0838",
         "type": "save",
         "name": "save lgical-link",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $access-service.service-instance-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"service-instance\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $inter.logical-link[$ida].link-name`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$inter.logical-link[$ida].link-name`\" /> \n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $access-service.service-instance-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"service-instance\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $oof-response.solutions.routeInfo.linkList[$idml]`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$oof-response.solutions.routeInfo.linkList[$idml]`\" /> \n",
         "comments": "",
         "outputs": 1,
-        "x": 939.0277938842773,
-        "y": 535.0000419616699,
-        "z": "c7becd47.884",
+        "x": 974.8706130981445,
+        "y": 429.1761817932129,
+        "z": "e2d31f86.7e711",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b28c4f8.97075c",
+        "id": "925da1f9.f5dbc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1047.083396911621,
-        "y": 446.9444456100464,
-        "z": "c7becd47.884",
+        "x": 957.9262008666992,
+        "y": 347.7872495651245,
+        "z": "e2d31f86.7e711",
         "wires": [
             [
-                "d767bb7e.ede568"
+                "252e0c6e.633014"
             ]
         ]
     },
     {
-        "id": "dc89cfb.651ad3",
+        "id": "cd86f64d.b2ee08",
         "type": "switchNode",
         "name": "switch",
-        "xml": "<switch test='`$domain-services_length`'>\n",
+        "xml": "<switch test='`$domain-services_length == 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 637.9165725708008,
-        "y": 527.499927520752,
-        "z": "c7becd47.884",
+        "x": 548.7593765258789,
+        "y": 428.3427314758301,
+        "z": "e2d31f86.7e711",
         "wires": [
             [
-                "4df19f89.f43cf"
+                "1f1dd0d4.a4b09f"
             ]
         ]
     },
     {
-        "id": "4df19f89.f43cf",
-        "type": "outcome",
-        "name": "2",
-        "xml": "<outcome value='2'>\n",
+        "id": "3e15b2bb.83cb2e",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idml' start='0' end='`$oof-response.solutions.routeInfo.linkList_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 811.6760292053223,
+        "y": 425.0094413757324,
+        "z": "e2d31f86.7e711",
+        "wires": [
+            [
+                "8b192abd.7a0838"
+            ]
+        ]
+    },
+    {
+        "id": "1f1dd0d4.a4b09f",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 774.3055114746094,
-        "y": 530.2776975631714,
-        "z": "c7becd47.884",
+        "x": 685.0094375610352,
+        "y": 426.6761360168457,
+        "z": "e2d31f86.7e711",
         "wires": [
             [
-                "3081486c.145aa8"
+                "3e15b2bb.83cb2e"
             ]
         ]
     }
diff --git a/platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json b/platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json
index 57ebd257..ad4f079c 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "389b367f.fc91aa",
+        "id": "5ba96896.d350c8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 157.5,
-        "y": 140,
-        "z": "f30c4ed5.582ba",
+        "x": 168.34280395507812,
+        "y": 81.67613983154297,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "247d6de0.b063f2"
+                "d954cf42.cad98"
             ]
         ]
     },
     {
-        "id": "247d6de0.b063f2",
+        "id": "d954cf42.cad98",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,1012 +22,1126 @@
         "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='optical-service' version='${project.version}'>",
         "outputs": 1,
-        "x": 170.5,
-        "y": 200,
-        "z": "f30c4ed5.582ba",
+        "x": 181.34280395507812,
+        "y": 141.67613983154297,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "163fe816.9d3ba8"
+                "a76eb24b.7f3af"
             ]
         ]
     },
     {
-        "id": "163fe816.9d3ba8",
+        "id": "a76eb24b.7f3af",
         "type": "method",
-        "name": "method service-create-tapi",
+        "name": "method inter-domain-handling",
         "xml": "<method rpc='inter-domain-handling' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 190.5,
-        "y": 280,
-        "z": "f30c4ed5.582ba",
+        "x": 201.34280395507812,
+        "y": 221.67613983154297,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "af3a973b.40dd08"
+                "176cd8d3.95c8f7"
             ]
         ]
     },
     {
-        "id": "af3a973b.40dd08",
+        "id": "176cd8d3.95c8f7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 401,
-        "y": 264.99998474121094,
-        "z": "f30c4ed5.582ba",
+        "x": 411.8428039550781,
+        "y": 206.6761245727539,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "c7bde6fd.a9cd08"
+                "c6df00ed.f385e",
+                "3310b5d5.f4a8aa",
+                "2a456240.dc1abe",
+                "9d292dd3.d61d5",
+                "931cea8d.540f58",
+                "be4d387.f7123c8",
+                "6b039fe8.8cd18",
+                "24f05c89.0950a4",
+                "23b942d9.71933e"
             ]
         ]
     },
     {
-        "id": "c7bde6fd.a9cd08",
-        "type": "get-resource",
-        "name": "get-resource",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"logical-links\"\nkey=\" \"\npfx='inter' local-only='false' >\n",
+        "id": "c6df00ed.f385e",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n<parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />\n<parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 567.8333435058594,
-        "y": 219.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 543.3427886962891,
+        "y": 20,
+        "z": "23af8cef.968934",
         "wires": [
-            [
-                "33ac5ab7.2291a6",
-                "a16804ab.521db8",
-                "fcb475cb.a0be98"
-            ]
+            []
         ]
     },
     {
-        "id": "33ac5ab7.2291a6",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "3310b5d5.f4a8aa",
+        "type": "get-resource",
+        "name": "get-resource",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT * from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE interface_name = $src-port-id'\npfx='src'>",
         "comments": "",
         "outputs": 1,
-        "x": 724.8333435058594,
-        "y": 160.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 610.0094604492188,
+        "y": 131.6761350631714,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "5eb01f99.89617"
+                "893c6078.bb7b4"
             ]
         ]
     },
     {
-        "id": "a16804ab.521db8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "2a456240.dc1abe",
+        "type": "get-resource",
+        "name": "get-resource",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $dst-port-id'\npfx='dst'>",
         "comments": "",
         "outputs": 1,
-        "x": 733.8333435058594,
-        "y": 211.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 611.6760559082031,
+        "y": 235.0094451904297,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "47cadf70.ddac9"
+                "af263c0f.2614b"
             ]
         ]
     },
     {
-        "id": "5eb01f99.89617",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='No inter-domain-links available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "id": "5ed5d68f.a14598",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='src-node-id' value='`$src.pnf-name`' />\n<parameter name='src-esr-id' value='`$src.controller-id`' />\n",
         "comments": "",
-        "x": 888.8333435058594,
-        "y": 158.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 886.6759757995605,
+        "y": 125.00944519042969,
+        "z": "23af8cef.968934",
         "wires": []
     },
     {
-        "id": "47cadf70.ddac9",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Could not retrieve logical-links' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "id": "9d292dd3.d61d5",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$src-esr-id`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/> ",
         "comments": "",
-        "x": 895.8333435058594,
-        "y": 211.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "outputs": 1,
+        "x": 645.0094680786133,
+        "y": 173.34279251098633,
+        "z": "23af8cef.968934",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5b792691.30eb98",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='dst-node-id' value='`$dst.pnf-name`' />\n<parameter name='dst-esr-id' value='`$dst.controller-id`' />\n",
+        "comments": "",
+        "x": 895.0093269348145,
+        "y": 235.00942134857178,
+        "z": "23af8cef.968934",
         "wires": []
     },
     {
-        "id": "fcb475cb.a0be98",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "931cea8d.540f58",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$dst-esr-id`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 554.8333435058594,
-        "y": 361.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 606.6761322021484,
+        "y": 271.67615509033203,
+        "z": "23af8cef.968934",
         "wires": [
-            [
-                "1cd2f550.3b31eb"
-            ]
+            []
         ]
     },
     {
-        "id": "1cd2f550.3b31eb",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
+        "id": "be4d387.f7123c8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='src-controller-id' value='`$param-prefix[2]`' />\n<parameter name='dst-controller-id' value='`$param-prefix1[2]`' />\n<parameter name='flag' value='true' />\n<parameter name='domain-requests' value='' />\n<parameter name='access-status' value='success' />\n<parameter name='domain-status' value='' />\n",
+        "comments": "",
+        "x": 573.3427734375,
+        "y": 325.0094871520996,
+        "z": "23af8cef.968934",
+        "wires": []
+    },
+    {
+        "id": "6b039fe8.8cd18",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"oof-request-id\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 558.8333435058594,
-        "y": 448.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 521.676097869873,
+        "y": 408.342791557312,
+        "z": "23af8cef.968934",
         "wires": [
-            [
-                "61403202.67ffac",
-                "5cf9c1.73b5e64",
-                "b39431ae.10e55"
-            ]
+            []
         ]
     },
     {
-        "id": "5cf9c1.73b5e64",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/inter-domain.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`'Aaccess bend---' + $access-bend`\"/>\n<parameter name=\"field2\" value=\"`'Aaccess cend---' + $access-cend`\"/>\n<parameter name=\"field3\" value=\"`'Service 1 req id---' + $service1-request-id`\"/>\n<parameter name=\"field4\" value=\"`'Service 2 req id---' + $service2-request-id`\"/>\n\n\n\n",
+        "id": "24f05c89.0950a4",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"oof-transaction-id\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 722.8333435058594,
-        "y": 503.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 478.3427848815918,
+        "y": 455.00944900512695,
+        "z": "23af8cef.968934",
         "wires": [
             []
         ]
     },
     {
-        "id": "61f864fb.8ad3fc",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$inter.logical-link[$ida].link-type`'>\n",
+        "id": "23b942d9.71933e",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/oof-mdons.json'`\" />\n<parameter name=\"restapiUrl\" value=\"` $prop.oof.mdons.url`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"oof-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 848.8333435058594,
-        "y": 454.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 415.00947761535645,
+        "y": 531.6761074066162,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "750846eb.eb1858"
+                "2cca4c57.d9d904",
+                "6023813.dc6018"
             ]
         ]
     },
     {
-        "id": "61403202.67ffac",
-        "type": "for",
-        "name": "for",
-        "xml": "<for index='ida' start='0' end='`$inter.logical-link_length`' >\n",
+        "id": "2cca4c57.d9d904",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 717.8333435058594,
-        "y": 454.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 588.3428077697754,
+        "y": 511.67611598968506,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "61f864fb.8ad3fc"
+                "735a8eb3.b2849"
             ]
         ]
     },
     {
-        "id": "750846eb.eb1858",
-        "type": "outcome",
-        "name": "inter-domain",
-        "xml": "<outcome value='inter-domain'>\n",
+        "id": "6023813.dc6018",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 990.8333435058594,
-        "y": 454.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 586.676212310791,
+        "y": 581.6761236190796,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "4071f83b.54b008"
+                "e278c72e.5e1da8"
             ]
         ]
     },
     {
-        "id": "bb3b4d5f.2b2bc",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='access-bend' value='`$inter.logical-link[$ida].relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n<parameter name='access-cend' value='`$inter.logical-link[$ida].relationship-list.relationship[1].relationship-data[1].relationship-value`' />\n",
-        "comments": "",
-        "x": 1557.583396911621,
-        "y": 305.4166898727417,
-        "z": "f30c4ed5.582ba",
-        "wires": []
-    },
-    {
-        "id": "e9fe864f.b1d708",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
+        "id": "735a8eb3.b2849",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='No service route found by OOF' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 1575.333396911621,
-        "y": 403.91669178009033,
-        "z": "f30c4ed5.582ba",
+        "x": 760.0094184875488,
+        "y": 508.3427724838257,
+        "z": "23af8cef.968934",
         "wires": []
     },
     {
-        "id": "8c88b9bd.0e2f28",
+        "id": "e278c72e.5e1da8",
         "type": "block",
         "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1418.583396911621,
-        "y": 397.416690826416,
-        "z": "f30c4ed5.582ba",
+        "x": 721.6760787963867,
+        "y": 583.3426895141602,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "bb3b4d5f.2b2bc",
-                "e9fe864f.b1d708"
+                "b0f4f043.fcedf",
+                "d89aa620.de5f38",
+                "8541aa72.6ad1b8",
+                "790ae4a6.71d53c",
+                "8c94f919.1112d8"
             ]
         ]
     },
     {
-        "id": "b39431ae.10e55",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test=\"`$access-bend == ''`\">\n",
+        "id": "b0f4f043.fcedf",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idml' start='0' end='`$oof-response.solutions.routeInfo.linkList_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 680.8333435058594,
-        "y": 560.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 868.3428344726562,
+        "y": 581.6760711669922,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "1bff9a4a.aa1c56",
-                "c7a0ae8a.585af"
+                "f7cea59b.5d9848"
             ]
         ]
     },
     {
-        "id": "1bff9a4a.aa1c56",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "8a90fbb0.af3a68",
+        "type": "get-resource",
+        "name": "get-resource",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"logical-link\"\nkey=\"logical-link.link-name = $oof-response.solutions.routeInfo.linkList[$idml]\"\npfx='inter' local-only='false' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 824.8333435058594,
-        "y": 560.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1168.3427734375,
+        "y": 415.00934886932373,
+        "z": "23af8cef.968934",
         "wires": [
-            [
-                "99508862.dd9ed8"
-            ]
+            []
         ]
     },
     {
-        "id": "99508862.dd9ed8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='No inter-domain-links available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
-        "comments": "",
-        "x": 973.8333435058594,
-        "y": 561.6666717529297,
-        "z": "f30c4ed5.582ba",
-        "wires": []
-    },
-    {
-        "id": "c7a0ae8a.585af",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "f7cea59b.5d9848",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 559.8333435058594,
-        "y": 636.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1003.3427200317383,
+        "y": 576.6761045455933,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "64bdfe75.3731a"
+                "8a90fbb0.af3a68",
+                "2a13ccaf.714454"
             ]
         ]
     },
     {
-        "id": "64bdfe75.3731a",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
+        "id": "2a13ccaf.714454",
+        "type": "switchNode",
+        "name": "check link status",
+        "xml": "<switch test=\"`$inter.operational-status == up`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 704.8333435058594,
-        "y": 637.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1183.3429260253906,
+        "y": 573.3427724838257,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "d71ceee8.2cc21",
-                "5812464d.ff2318",
-                "d5d60b0e.6b7598",
-                "e899697c.47e108"
+                "71599559.97cb7c"
             ]
         ]
     },
     {
-        "id": "d71ceee8.2cc21",
-        "type": "for",
-        "name": "for",
-        "xml": "<for index='idb' start='0' end='2' >\n",
+        "id": "71599559.97cb7c",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 893.8333435058594,
-        "y": 635.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1315.0094413757324,
+        "y": 520.0094766616821,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "4df590dd.62851"
+                "86e4c880.1fc408"
             ]
         ]
     },
     {
-        "id": "f4b1528e.2b869",
-        "type": "call",
-        "name": "call",
-        "xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",
+        "id": "b9982bc5.eb26e8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='flag' value='false' />\n",
+        "comments": "",
+        "x": 1575.009407043457,
+        "y": 513.3427467346191,
+        "z": "23af8cef.968934",
+        "wires": []
+    },
+    {
+        "id": "d89aa620.de5f38",
+        "type": "switchNode",
+        "name": "check flag",
+        "xml": "<switch test=\"`$flag == 'true' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1444.8333435058594,
-        "y": 650.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 921.6761512756348,
+        "y": 648.3427076339722,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "b82ddceb.8c1de",
-                "11734593.7b34da"
+                "5b915e75.cc34e",
+                "b8d2bc77.f938a"
             ]
         ]
     },
     {
-        "id": "4df590dd.62851",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$idb`'>\n",
+        "id": "5b915e75.cc34e",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1019.8333435058594,
-        "y": 635.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1098.3427085876465,
+        "y": 621.6760578155518,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "e24cf2b6.2e8bb",
-                "fcc6fd38.e5cb2"
+                "946ef420.757b28"
             ]
         ]
     },
     {
-        "id": "e24cf2b6.2e8bb",
-        "type": "outcome",
-        "name": "outcome",
-        "xml": "<outcome value='0'>\n",
+        "id": "b8d2bc77.f938a",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1147.8333435058594,
-        "y": 602.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1076.6761093139648,
+        "y": 683.3427886962891,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "14ca5977.d20f97"
+                "4b341d0.dcf13e4"
             ]
         ]
     },
     {
-        "id": "14ca5977.d20f97",
+        "id": "4b341d0.dcf13e4",
         "type": "block",
         "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1291.8333435058594,
-        "y": 602.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1215.6156425476074,
+        "y": 688.342743396759,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "f4b1528e.2b869",
-                "13ff6105.eaad1f"
+                "8dbf5643.27c098"
             ]
         ]
     },
     {
-        "id": "a1dafaaf.167958",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-cend`' />\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-zend`' />\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$access-service-name + '_MDONS-OTN'`\" />\n<parameter name='domain-type' value=\"TAPI\" />\n<parameter name='optical-service-create-input.request-id' value=\"`$service2-request-id`\" />\n<parameter name='optical-service-create-input.service-id' value=\"`$service2-svc-instance-id`\" />\n",
-        "comments": "",
-        "x": 1452.8333435058594,
-        "y": 856.6666717529297,
-        "z": "f30c4ed5.582ba",
-        "wires": []
-    },
-    {
-        "id": "c16d7ee9.39a1a",
-        "type": "call",
-        "name": "call",
-        "xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",
+        "id": "8dbf5643.27c098",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idmk' start='0' end='`$oof-response.solutions.routeInfo.linkList_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1289.8333435058594,
-        "y": 1143.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1363.9487037658691,
+        "y": 688.3428287506104,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "eadb5b74.6cde68",
-                "2fe5acd9.03dff4"
+                "17fcda64.b52d86"
             ]
         ]
     },
     {
-        "id": "fcc6fd38.e5cb2",
-        "type": "outcome",
-        "name": "outcome",
-        "xml": "<outcome value='1'>\n",
+        "id": "21ebe060.eb5b2",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$oof-response.solutions.routeInfo.serviceRoute[$idomainsvc].srcInterfaceId`' />\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$oof-response.solutions.routeInfo.serviceRoute[$idomainsvc].dstInterfaceId`' />\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$access-service-name +  '_MDONS-OTN'`\" />\n<parameter name='domain-type' value=\"TAPI\" />\n<parameter name='optical-service-create-input.request-id' value=\"`$domain-request-id`\" />\n<parameter name='optical-service-create-input.service-id' value=\"`$domain-instance-id`\" />\n\n",
+        "comments": "",
+        "x": 1399.5549354553223,
+        "y": 873.1910076141357,
+        "z": "23af8cef.968934",
+        "wires": []
+    },
+    {
+        "id": "8541aa72.6ad1b8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idomainsvc' start='0' end='`$oof-response.solutions.routeInfo.serviceRoute_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1131.8333435058594,
-        "y": 850.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 909.5549011230469,
+        "y": 758.1912117004395,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "6d4682a2.6cf8ac"
+                "9e699e75.e8a28"
             ]
         ]
     },
     {
-        "id": "6d4682a2.6cf8ac",
+        "id": "9e699e75.e8a28",
         "type": "block",
         "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1281.8333435058594,
-        "y": 873.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1154.5548858642578,
+        "y": 774.8578758239746,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "a1dafaaf.167958",
-                "c16d7ee9.39a1a"
+                "abf6824.23e3b8",
+                "2039896a.be3116",
+                "21ebe060.eb5b2",
+                "bc8e66e3.f1c2b8",
+                "1c7045f1.ce177a"
             ]
         ]
     },
     {
-        "id": "13ff6105.eaad1f",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-aend`' />\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-bend`' />\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$access-service-name +  '_MDONS-OTN'`\" />\n<parameter name='domain-type' value=\"TAPI\" />\n<parameter name='optical-service-create-input.request-id' value=\"`$service1-request-id`\" />\n<parameter name='optical-service-create-input.service-id' value=\"`$service1-svc-instance-id`\" />\n\n",
-        "comments": "",
-        "x": 1444.8333435058594,
-        "y": 585.6666717529297,
-        "z": "f30c4ed5.582ba",
-        "wires": []
-    },
-    {
-        "id": "5812464d.ff2318",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$service1 == $service2 == success`'>\n",
+        "id": "abf6824.23e3b8",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"domain-request-id\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 455.3333511352539,
-        "y": 1077.9166975021362,
-        "z": "f30c4ed5.582ba",
+        "x": 1394.5548477172852,
+        "y": 724.8578109741211,
+        "z": "23af8cef.968934",
         "wires": [
-            [
-                "5c9c5b68.cd5504",
-                "495561a5.fec34"
-            ]
+            []
         ]
     },
     {
-        "id": "2552ecde.5a89f4",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Multi-domain-service successfully created' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "id": "2039896a.be3116",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"domain-instance-id\"/> ",
         "comments": "",
-        "x": 959.8333892822266,
-        "y": 1075.4167022705078,
-        "z": "f30c4ed5.582ba",
-        "wires": []
+        "outputs": 1,
+        "x": 1427.8881454467773,
+        "y": 779.8579711914062,
+        "z": "23af8cef.968934",
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "e8dd732b.52f0b",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Multi-domain-service creation failed' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "id": "ed60a18f.df4a7",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='domain-requests' value=\"`$domain-requests + $domain-request-id + ','`\" />\n",
         "comments": "",
-        "x": 874.0833892822266,
-        "y": 1287.9167022705078,
-        "z": "f30c4ed5.582ba",
+        "x": 1877.8881530761719,
+        "y": 819.8578510284424,
+        "z": "23af8cef.968934",
         "wires": []
     },
     {
-        "id": "b82ddceb.8c1de",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "bc8e66e3.f1c2b8",
+        "type": "call",
+        "name": "call",
+        "xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1589.8333435058594,
-        "y": 625.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1236.221565246582,
+        "y": 917.7366065979004,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "35cec1fe.7cd71e"
+                "e39ae564.2e9528"
             ]
         ]
     },
     {
-        "id": "eadb5b74.6cde68",
+        "id": "e39ae564.2e9528",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1431.8333435058594,
-        "y": 1139.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1367.8881645202637,
+        "y": 931.069995880127,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "72d0218e.8f2fd"
+                "18342550.e06acb"
             ]
         ]
     },
     {
-        "id": "d5d60b0e.6b7598",
+        "id": "5c52d0a6.4eb0b",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='access-service-name' value='`$optical-service-create-input.payload.service-name`' />\n",
+        "xml": "<set>\n<parameter name='service-status' value='`$final-response-code`' />\n\n",
         "comments": "",
-        "x": 840.8333435058594,
-        "y": 598.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1667.5548210144043,
+        "y": 860.7367286682129,
+        "z": "23af8cef.968934",
         "wires": []
     },
     {
-        "id": "caf045ec.2f23f8",
+        "id": "18342550.e06acb",
         "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 764.5833892822266,
-        "y": 995.6666994094849,
-        "z": "f30c4ed5.582ba",
+        "x": 1509.2215728759766,
+        "y": 909.4033145904541,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "9e317702.903b08",
-                "2552ecde.5a89f4",
-                "146e2604.39be4a",
-                "2c1dad44.b6ddc2"
+                "5c52d0a6.4eb0b",
+                "46946a06.9ee744",
+                "e38c5eae.94d3d"
             ]
         ]
     },
     {
-        "id": "9e317702.903b08",
-        "type": "save",
-        "name": "update acc service db",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"CREATED\" WHERE request_id = $as-request-id'\nforce='true' pfx='save-result'>",
+        "id": "46946a06.9ee744",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$service-status == 200`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 970.8333892822266,
-        "y": 895.6666984558105,
-        "z": "f30c4ed5.582ba",
+        "x": 1688.8884048461914,
+        "y": 912.736647605896,
+        "z": "23af8cef.968934",
         "wires": [
-            []
+            [
+                "d9fd1d0e.e0fce",
+                "533db999.55c468"
+            ]
         ]
     },
     {
-        "id": "9b1c21a0.1f564",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/inter-domain.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Access service creation failed\"/>\n\n\n\n",
+        "id": "d9fd1d0e.e0fce",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 850.3333892822266,
-        "y": 1189.4167003631592,
-        "z": "f30c4ed5.582ba",
+        "x": 1837.888168334961,
+        "y": 884.403256893158,
+        "z": "23af8cef.968934",
         "wires": [
-            []
+            [
+                "bd83526e.c9e3c"
+            ]
         ]
     },
     {
-        "id": "eb99418.1ac6dc",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "533db999.55c468",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 713.0833854675293,
-        "y": 1228.916766166687,
-        "z": "f30c4ed5.582ba",
+        "x": 1835.5547695159912,
+        "y": 956.4033432006836,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "9b1c21a0.1f564",
-                "e8dd732b.52f0b"
+                "5d7a5d7.cc9afa4"
             ]
         ]
     },
     {
-        "id": "c5ae62a0.518d9",
+        "id": "bd83526e.c9e3c",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",
+        "xml": "<set>\n<parameter name='status' value='success' />\n",
         "comments": "",
-        "x": 1837.8333435058594,
-        "y": 553.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1977.8879470825195,
+        "y": 880.0699634552002,
+        "z": "23af8cef.968934",
         "wires": []
     },
     {
-        "id": "35cec1fe.7cd71e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
+        "id": "5d7a5d7.cc9afa4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='status' value='failure' />\n<parameter name='access-status' value='failure' />\n",
         "comments": "",
-        "outputs": 1,
-        "x": 1687.8333435058594,
-        "y": 555.6666717529297,
-        "z": "f30c4ed5.582ba",
-        "wires": [
-            [
-                "c5ae62a0.518d9",
-                "cc685478.44b5d8"
-            ]
-        ]
+        "x": 1974.8880081176758,
+        "y": 957.0698642730713,
+        "z": "23af8cef.968934",
+        "wires": []
     },
     {
-        "id": "cc685478.44b5d8",
+        "id": "e38c5eae.94d3d",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='domain-status' value=\"`$domain-status + $domain-request-id + '_' + $status` \" />\n",
+        "comments": "",
+        "x": 1649.554946899414,
+        "y": 996.221586227417,
+        "z": "23af8cef.968934",
+        "wires": []
+    },
+    {
+        "id": "790ae4a6.71d53c",
         "type": "switchNode",
         "name": "switch",
-        "xml": "<switch test='`$service1-status == 200`'>\n",
+        "xml": "<switch test=\"`$access-status == 'success'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1715.8333435058594,
-        "y": 685.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 764.1002426147461,
+        "y": 1096.2215242385864,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "4120a771.cb7b78",
-                "304cf1d.95f070e"
+                "d43038a6.7e9fc8"
             ]
         ]
     },
     {
-        "id": "4120a771.cb7b78",
+        "id": "d43038a6.7e9fc8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1884.8333435058594,
-        "y": 640.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 916.676139831543,
+        "y": 1049.4034128189087,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "b8c2bbf6.152258"
+                "6c2d775e.ec6158"
             ]
         ]
     },
     {
-        "id": "304cf1d.95f070e",
+        "id": "ec6a3394.1e3aa",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1885.8333435058594,
-        "y": 707.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 815.0094375610352,
+        "y": 1242.7365236282349,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "d123f6e.9b1a508"
+                "b2d48de7.71bcd"
             ]
         ]
     },
     {
-        "id": "b8c2bbf6.152258",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='service1' value='success' />\n",
+        "id": "2f6b622f.337eae",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Multi-domain-service successfully created' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 2019.8333435058594,
-        "y": 629.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1251.676170349121,
+        "y": 1151.07004737854,
+        "z": "23af8cef.968934",
         "wires": []
     },
     {
-        "id": "d123f6e.9b1a508",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='service1' value='failure' />\n",
+        "id": "6c2d775e.ec6158",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
-        "x": 2021.8333435058594,
-        "y": 706.6666717529297,
-        "z": "f30c4ed5.582ba",
-        "wires": []
+        "outputs": 1,
+        "x": 1048.0927734375,
+        "y": 1097.9866914749146,
+        "z": "23af8cef.968934",
+        "wires": [
+            [
+                "65715a4d.096ba4",
+                "2f6b622f.337eae",
+                "25648259.4bf36e"
+            ]
+        ]
     },
     {
-        "id": "72d0218e.8f2fd",
+        "id": "65715a4d.096ba4",
+        "type": "save",
+        "name": "update acc service db",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"CREATED\", domain_requests = $domain-requests WHERE request_id = $access-request-id'\nforce='true' pfx='save-result'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1254.3427734375,
+        "y": 997.9866905212402,
+        "z": "23af8cef.968934",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "25648259.4bf36e",
+        "type": "call",
+        "name": "create-service-relationship",
+        "xml": "<call module='optical-service' rpc='create-service-relationship' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1267.6760711669922,
+        "y": 1066.736717224121,
+        "z": "23af8cef.968934",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8c94f919.1112d8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/oof-mdons.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Domain Status\"/>\n<parameter name=\"field2\" value=\"`$domain-status`\"/>\n<parameter name=\"field3\" value=\"`$flag`\"/>\n<parameter name=\"field4\" value=\"`$access-status`\"/>\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 866.8276214599609,
+        "y": 859.5548648834229,
+        "z": "23af8cef.968934",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b2d48de7.71bcd",
         "type": "block",
         "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1604.8333435058594,
-        "y": 1120.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 956.3730545043945,
+        "y": 1247.585117340088,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "1b71dbd0.f488a4",
-                "f3c54b18.1b0eb8"
+                "4e7fc079.04b4a",
+                "7b36ef0f.c082b",
+                "cc6c823.0642a8",
+                "fc4d8ab2.5ec108",
+                "aec89fbb.ad742"
             ]
         ]
     },
     {
-        "id": "f3c54b18.1b0eb8",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$service2-status == 200`'>\n",
+        "id": "4e7fc079.04b4a",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$domain-status`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix2\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 1736.8333435058594,
-        "y": 1219.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1116.372932434082,
+        "y": 1244.251636505127,
+        "z": "23af8cef.968934",
         "wires": [
-            [
-                "d06b5ea3.2c7da",
-                "9a666773.f65fe8"
-            ]
+            []
         ]
     },
     {
-        "id": "d06b5ea3.2c7da",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "7b36ef0f.c082b",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idelsvc' start='0' end='`$param-prefix2_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1892.8333435058594,
-        "y": 1144.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1104.7063179016113,
+        "y": 1301.0698909759521,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "be86fbe9.594738"
+                "f59ddd81.b432b"
             ]
         ]
     },
     {
-        "id": "9a666773.f65fe8",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "f59ddd81.b432b",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$param-prefix2[$idelsvc] == 'success'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1949.8333435058594,
-        "y": 1226.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1244.7062797546387,
+        "y": 1299.4032649993896,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "4df0a4d2.d2637c"
+                "831a7caf.8175e"
             ]
         ]
     },
     {
-        "id": "be86fbe9.594738",
+        "id": "21058360.3ce7ec",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='service2' value='success' />\n",
+        "xml": "<set>\n<parameter name='optical-service-delete-input.request-id' value=\"`$param-prefix2[$idelsvc]`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$access-service-name + '_MDONS-OTN_'`\"/>\n\n",
         "comments": "",
-        "x": 2093.8333435058594,
-        "y": 1134.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1651.3730010986328,
+        "y": 1182.7366724014282,
+        "z": "23af8cef.968934",
         "wires": []
     },
     {
-        "id": "4df0a4d2.d2637c",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='service2' value='success' />\n",
+        "id": "831a7caf.8175e",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
-        "x": 2092.8333435058594,
-        "y": 1204.6666717529297,
-        "z": "f30c4ed5.582ba",
-        "wires": []
+        "outputs": 1,
+        "x": 1383.0397186279297,
+        "y": 1291.0701208114624,
+        "z": "23af8cef.968934",
+        "wires": [
+            [
+                "b469d53f.363e68"
+            ]
+        ]
     },
     {
-        "id": "1b71dbd0.f488a4",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='service2-status' value='`$final-response-code`' />\n",
+        "id": "b469d53f.363e68",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
-        "x": 1774.8333435058594,
-        "y": 1067.6666717529297,
-        "z": "f30c4ed5.582ba",
-        "wires": []
+        "outputs": 1,
+        "x": 1514.7064208984375,
+        "y": 1289.4033203125,
+        "z": "23af8cef.968934",
+        "wires": [
+            [
+                "21058360.3ce7ec",
+                "a9a6976b.e9a218"
+            ]
+        ]
     },
     {
-        "id": "e899697c.47e108",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='inter' value='' />\n",
+        "id": "a9a6976b.e9a218",
+        "type": "call",
+        "name": "call TAPI DELETE DG",
+        "xml": "<call module='optical-service' rpc='service-delete-tapi' mode='sync' >\n",
         "comments": "",
-        "x": 889.3333854675293,
-        "y": 683.4166970252991,
-        "z": "f30c4ed5.582ba",
-        "wires": []
+        "outputs": 1,
+        "x": 1689.8578872680664,
+        "y": 1322.7366399765015,
+        "z": "23af8cef.968934",
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "11734593.7b34da",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "cc6c823.0642a8",
+        "type": "delete",
+        "name": "delete access from db",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $access-request-id\">",
         "comments": "",
         "outputs": 1,
-        "x": 1592.8333435058594,
-        "y": 720.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1074.554832458496,
+        "y": 1430.9185132980347,
+        "z": "23af8cef.968934",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fc4d8ab2.5ec108",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idml' start='0' end='`$oof-response.solutions.routeInfo.linkList_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1082.88818359375,
+        "y": 1362.585205078125,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "528f2a75.c81264"
+                "8f2b32ff.b0e4f"
             ]
         ]
     },
     {
-        "id": "528f2a75.c81264",
+        "id": "8f2b32ff.b0e4f",
+        "type": "save",
+        "name": "change link status",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'  \n     key='locgical-link.link-name = $oof-response.solution.routeInfo.linkList[$idmk]' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"operational-status\" value=\"up\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1249.554666519165,
+        "y": 1362.5851860046387,
+        "z": "23af8cef.968934",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "aec89fbb.ad742",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Main Create Dg not available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Access service failed as one of the domain services failed' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 1752.8333435058594,
-        "y": 741.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 914.5549583435059,
+        "y": 1477.5852184295654,
+        "z": "23af8cef.968934",
         "wires": []
     },
     {
-        "id": "2fe5acd9.03dff4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "86e4c880.1fc408",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1390.8333435058594,
-        "y": 1221.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1446.676025390625,
+        "y": 516.5245971679688,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "c76d7b74.481948"
+                "b9982bc5.eb26e8"
             ]
         ]
     },
     {
-        "id": "c76d7b74.481948",
+        "id": "946ef420.757b28",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Main Create Dg not available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Inter domain links not available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 1550.8333435058594,
-        "y": 1242.6666717529297,
-        "z": "f30c4ed5.582ba",
+        "x": 1266.070068359375,
+        "y": 623.0397338867188,
+        "z": "23af8cef.968934",
         "wires": []
     },
     {
-        "id": "5c9c5b68.cd5504",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "893c6078.bb7b4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 623.833381652832,
-        "y": 1001.1666984558105,
-        "z": "f30c4ed5.582ba",
+        "x": 751.6761016845703,
+        "y": 126.67614555358887,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "caf045ec.2f23f8"
+                "5ed5d68f.a14598"
             ]
         ]
     },
     {
-        "id": "495561a5.fec34",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "af263c0f.2614b",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 588.083381652832,
-        "y": 1230.166699886322,
-        "z": "f30c4ed5.582ba",
+        "x": 760.0094604492188,
+        "y": 235.00946044921875,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "eb99418.1ac6dc"
+                "5b792691.30eb98"
             ]
         ]
     },
     {
-        "id": "146e2604.39be4a",
-        "type": "call",
-        "name": "create-service-relationship",
-        "xml": "<call module='optical-service' rpc='create-service-relationship' mode='sync' >\n",
+        "id": "17fcda64.b52d86",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1495.7669105529785,
+        "y": 681.3730545043945,
+        "z": "23af8cef.968934",
+        "wires": [
+            [
+                "fb18a4c2.061f18"
+            ]
+        ]
+    },
+    {
+        "id": "fb18a4c2.061f18",
+        "type": "update",
+        "name": "update logical-link-status AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\n     key='logical-link.link-name = $oof-response.solutions.routeInfo.linkList[$idmk]'\n      local-only='false'>\n<parameter name='operational-status' value='occupied' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
         "comments": "",
         "outputs": 1,
-        "x": 970.8333892822266,
-        "y": 994.4166984558105,
-        "z": "f30c4ed5.582ba",
+        "x": 1698.4942245483398,
+        "y": 681.3730535507202,
+        "z": "23af8cef.968934",
         "wires": [
             []
         ]
     },
     {
-        "id": "4071f83b.54b008",
+        "id": "1c7045f1.ce177a",
         "type": "switchNode",
         "name": "switch",
-        "xml": "<switch test='`$inter.logical-link[$ida].operational-status == occupied`'>\n",
+        "xml": "<switch test=\"`$idomainsvc == $oof-response.solutions.routeInfo.serviceRoute_length - 1`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1132.5,
-        "y": 346.25,
-        "z": "f30c4ed5.582ba",
+        "x": 1542.4336471557617,
+        "y": 821.3730182647705,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "9d6b0593.4c7858",
-                "1087939c.29799c"
+                "25791c4d.039894",
+                "dfe061cd.f2699"
             ]
         ]
     },
     {
-        "id": "9d6b0593.4c7858",
+        "id": "25791c4d.039894",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1250.0000190734863,
-        "y": 295.00000190734863,
-        "z": "f30c4ed5.582ba",
+        "x": 1690.7669677734375,
+        "y": 756.373046875,
+        "z": "23af8cef.968934",
         "wires": [
-            []
+            [
+                "da7f9e41.f2bdd"
+            ]
         ]
     },
     {
-        "id": "1087939c.29799c",
+        "id": "dfe061cd.f2699",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1256.2500190734863,
-        "y": 401.2500057220459,
-        "z": "f30c4ed5.582ba",
+        "x": 1714.100341796875,
+        "y": 809.7064208984375,
+        "z": "23af8cef.968934",
         "wires": [
             [
-                "8c88b9bd.0e2f28"
+                "ed60a18f.df4a7"
             ]
         ]
     },
     {
-        "id": "2c1dad44.b6ddc2",
-        "type": "update",
-        "name": "update logical-link-status AAI",
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\n     key='logical-link.link-name = $inter.logical-link[$ida].link-name '\n      local-only='false'>\n<parameter name='operational-status' value='occupied' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "id": "da7f9e41.f2bdd",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='domain-requests' value=\"`$domain-requests + $domain-request-id`\" />\n",
         "comments": "",
-        "outputs": 1,
-        "x": 1015,
-        "y": 946.25,
-        "z": "f30c4ed5.582ba",
-        "wires": [
-            []
-        ]
+        "x": 1822.4335594177246,
+        "y": 748.0397148132324,
+        "z": "23af8cef.968934",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_mdons-closed-loop.json b/platform-logic/optical-service/src/main/json/optical-service_mdons-closed-loop.json
new file mode 100644
index 00000000..e4f798da
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_mdons-closed-loop.json
@@ -0,0 +1,868 @@
+[
+    {
+        "id": "979b170b.501f38",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 146.67613220214844,
+        "y": 100.00946807861328,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "acdc3697.044ca8"
+            ]
+        ]
+    },
+    {
+        "id": "acdc3697.044ca8",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 159.67613220214844,
+        "y": 160.00946807861328,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "6aa276a4.5ff2e8"
+            ]
+        ]
+    },
+    {
+        "id": "6aa276a4.5ff2e8",
+        "type": "method",
+        "name": "mdons-closed-loop",
+        "xml": "<method rpc='mdons-closed-loop' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 179.67613220214844,
+        "y": 240.00946807861328,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "5edf7731.e3c8c8"
+            ]
+        ]
+    },
+    {
+        "id": "5edf7731.e3c8c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 377.17613220214844,
+        "y": 243.3428020477295,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "7714851d.5602ac",
+                "be199a1c.cd8e38",
+                "bd51736d.93a7a",
+                "c3ceda79.d79428",
+                "7f5a72c8.570a9c",
+                "184db38e.d6d8fc",
+                "a1e03d53.01d48",
+                "2f199490.edb30c",
+                "23f3d42a.2bdd4c",
+                "74b53348.a5012c",
+                "1421c3d7.48360c",
+                "f93758f.8d8faa8",
+                "6200ff9b.d9304",
+                "e1a11a59.e81cd8",
+                "9f686b58.9ed108",
+                "785dc0fe.0394b",
+                "998851ce.e8b6c",
+                "761b7172.3b156",
+                "1a8fcaf7.2d73b5",
+                "dcfc43a0.4f0e8"
+            ]
+        ]
+    },
+    {
+        "id": "7714851d.5602ac",
+        "type": "get-resource",
+        "name": "get domain for access",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom REQUEST_DETAILS\nWHERE service_instance_id = $access-service-id'\npfx='access'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 583.3427810668945,
+        "y": 83.34281826019287,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "74b53348.a5012c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='domain-services' value='`$access.domain-requests`' />\n<parameter name='pinterface-list' value='`$access.pinterface-list`' />\n<parameter name='optical-service-delete-input.request-id' value='`$access.request-id`' />\n<parameter name='optical-service-delete-input.payload.param[0].name' value='service-name' />\n<parameter name='optical-service-delete-input.payload.param[0].value' value='`$service-name`' />\n<parameter name='service-instance-id' value='`$access.service-instance-id`' />\n<parameter name='service-rate' value='`$access.service-rate`' />\n<parameter name='service-type' value='`$access.service-type`' />\n<parameter name='global-customer-id' value='`$access.global-customer-id`' />\n<parameter name='notification-url' value='`$access.notification-url`' />\n\n",
+        "comments": "",
+        "x": 586.6761436462402,
+        "y": 168.3428077697754,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "c3ceda79.d79428",
+        "type": "execute",
+        "name": "split p-interfaces",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$pinterface-list`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 756.6761703491211,
+        "y": 341.6760678291321,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "be199a1c.cd8e38",
+        "type": "call",
+        "name": "call optical delete",
+        "xml": "<call module='optical-service' rpc='optical-service-delete' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 836.3730087280273,
+        "y": 233.3427505493164,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bd51736d.93a7a",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/mdons-closed-loop.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete successful\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 746.6760864257812,
+        "y": 286.67609786987305,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a1e03d53.01d48",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.request-id' value='`$access.request-id`' />\n<parameter name='optical-service-create-input.global-customer-id' value='`$global-customer-id`' />\n<parameter name='optical-service-create-input.service-type' value='`$service-type`' />\n<parameter name='optical-service-create-input.notification-url' value='`$notification-url`' />\n<parameter name='optical-service-create-input.service-id' value='`$service-instance-id`' />\n<parameter name='optical-service-create-input.source' value='SO' />\n\n",
+        "comments": "",
+        "x": 448.3428554534912,
+        "y": 780.0092144012451,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "7f5a72c8.570a9c",
+        "type": "execute",
+        "name": "split p-interfaces",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$param-prefix[0]`'/>\n<parameter name=\"regex\" value=\"--\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"new-aend\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 778.3427124023438,
+        "y": 396.6761243343353,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "184db38e.d6d8fc",
+        "type": "execute",
+        "name": "split p-interfaces",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$param-prefix[1]`'/>\n<parameter name=\"regex\" value=\"--\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"new-zend\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 738.3427658081055,
+        "y": 461.67614459991455,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2f199490.edb30c",
+        "type": "execute",
+        "name": "coding func split",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$new-aend[0]`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"coding1\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 706.6761093139648,
+        "y": 523.3428020477295,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "23f3d42a.2bdd4c",
+        "type": "execute",
+        "name": "coding func split",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$new-zend[0]`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"coding2\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 610.0095977783203,
+        "y": 583.3426520824432,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dcfc43a0.4f0e8",
+        "type": "call",
+        "name": "call optical create",
+        "xml": "<call module='optical-service' rpc='optical-service-create' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 102.5,
+        "y": 1340.009355545044,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1421c3d7.48360c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/mdons-closed-loop.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Length\"/>\n<parameter name=\"field2\" value=\"`$optical-service-create-input.payload.param_length`\"/>\n<parameter name=\"field\" value=\"`$access.service-instance-id`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 400.0093765258789,
+        "y": 856.5243883132935,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f93758f.8d8faa8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='ido' start='0' end='`$optical-service-create-input.payload.param_length`' >\n    \n    \n    \n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 485.0094223022461,
+        "y": 686.3730640411377,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "f31b8fd1.5f4d1"
+            ]
+        ]
+    },
+    {
+        "id": "f31b8fd1.5f4d1",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$ido`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 668.3428268432617,
+        "y": 664.8578968048096,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "1b5199d0.96ea36",
+                "177f77ff.52ac08",
+                "19c1462c.c59aca",
+                "544106b6.aa1f68",
+                "7bd3ca6d.2b8474",
+                "f4220e5f.9f972",
+                "5bbf3ebf.d41c6"
+            ]
+        ]
+    },
+    {
+        "id": "1b5199d0.96ea36",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 790.0094909667969,
+        "y": 618.1913185119629,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "e297f2a2.edf72"
+            ]
+        ]
+    },
+    {
+        "id": "177f77ff.52ac08",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 843.3427314758301,
+        "y": 694.7063417434692,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "2a899320.3dd4cc"
+            ]
+        ]
+    },
+    {
+        "id": "19c1462c.c59aca",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 836.676082611084,
+        "y": 748.0396919250488,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "b64d4d5e.2cc7e"
+            ]
+        ]
+    },
+    {
+        "id": "544106b6.aa1f68",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='3'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 790.0094680786133,
+        "y": 806.373140335083,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "33f61f5f.31288"
+            ]
+        ]
+    },
+    {
+        "id": "7bd3ca6d.2b8474",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='4'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 738.3427658081055,
+        "y": 889.7063961029053,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "a24de250.4b975"
+            ]
+        ]
+    },
+    {
+        "id": "f4220e5f.9f972",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='5'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 678.3427276611328,
+        "y": 964.5548820495605,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "381e4d54.13d312"
+            ]
+        ]
+    },
+    {
+        "id": "5bbf3ebf.d41c6",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='6'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 633.3428230285645,
+        "y": 1034.5549030303955,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "2d962f70.5e047"
+            ]
+        ]
+    },
+    {
+        "id": "6200ff9b.d9304",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.param_length' value='7' />\n",
+        "comments": "",
+        "x": 538.3427810668945,
+        "y": 634.7064361572266,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "e5f0cfb8.b833e",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.param[$ido].name' value='service-name' />\n<parameter name='optical-service-create-input.payload.param[$ido].value' value='`$original-name`' />\n\n",
+        "comments": "",
+        "x": 1033.3427352905273,
+        "y": 589.5548629760742,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "ad0c9856.4ccac8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.param[$ido].name' value='`$new-aend[0]`' />\n<parameter name='optical-service-create-input.payload.param[$ido].value' value='`$new-aend[1]`' />\n\n",
+        "comments": "",
+        "x": 1108.3427734375,
+        "y": 687.8881416320801,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "e472f759.3896c8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.param[$ido].name' value='`$new-zend[0]`' />\n<parameter name='optical-service-create-input.payload.param[$ido].value' value='`$new-zend[1]`' />\n\n",
+        "comments": "",
+        "x": 1100.009479522705,
+        "y": 781.221529006958,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "9391881.856cf78",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.param[$ido].name' value=\"`$coding1[0] + '_coding_func'`\" />\n<parameter name='optical-service-create-input.payload.param[$ido].value' value='`$service-rate`' />\n\n",
+        "comments": "",
+        "x": 1046.6760711669922,
+        "y": 866.2215518951416,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "edc8b201.188e4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.param[$ido].name' value=\"`$coding2[0] + '_coding_func'`\" />\n<parameter name='optical-service-create-input.payload.param[$ido].value' value='`$service-rate`' />\n\n",
+        "comments": "",
+        "x": 1028.3428497314453,
+        "y": 961.2215480804443,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "dd9f4672.ff9e18",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.param[$ido].name' value=\"`$coding1[0] + '_client_proto'`\" />\n<parameter name='optical-service-create-input.payload.param[$ido].value' value='Ethernet' />\n\n",
+        "comments": "",
+        "x": 1015.0093116760254,
+        "y": 1061.2214584350586,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "6e60aabd.002cf4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.param[$ido].name' value=\"`$coding2[0] + '_client_proto'`\" />\n<parameter name='optical-service-create-input.payload.param[$ido].value' value='Ethernet' />\n",
+        "comments": "",
+        "x": 890.0094223022461,
+        "y": 1151.2214546203613,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "e297f2a2.edf72",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 923.342809677124,
+        "y": 577.8882331848145,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "e5f0cfb8.b833e",
+                "32355890.221888"
+            ]
+        ]
+    },
+    {
+        "id": "32355890.221888",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/mdons-closed-loop.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Param details 0\"/>\n<parameter name=\"field2\" value=\"`$optical-service-create-input.payload.param[$ido].name`\"/>\n<parameter name=\"field3\" value=\"`$optical-service-create-input.payload.param[$ido].value`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1033.3427734375,
+        "y": 639.5548706054688,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2a899320.3dd4cc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 996.6761207580566,
+        "y": 697.8881816864014,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "ad0c9856.4ccac8",
+                "1923e41a.3df5ec"
+            ]
+        ]
+    },
+    {
+        "id": "b64d4d5e.2cc7e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 946.6760902404785,
+        "y": 772.8882360458374,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "e472f759.3896c8",
+                "708de688.ffe158"
+            ]
+        ]
+    },
+    {
+        "id": "33f61f5f.31288",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 923.3427352905273,
+        "y": 821.2215518951416,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "9391881.856cf78",
+                "cba7e744.47fa48"
+            ]
+        ]
+    },
+    {
+        "id": "a24de250.4b975",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 843.3427734375,
+        "y": 887.8882446289062,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "edc8b201.188e4",
+                "d0395cd6.55c81"
+            ]
+        ]
+    },
+    {
+        "id": "381e4d54.13d312",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 823.3427734375,
+        "y": 934.5548706054688,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "dd9f4672.ff9e18",
+                "1f93d608.fb2cea"
+            ]
+        ]
+    },
+    {
+        "id": "2d962f70.5e047",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 778.3426818847656,
+        "y": 1037.8882722854614,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "6e60aabd.002cf4",
+                "d2d6743b.265be8"
+            ]
+        ]
+    },
+    {
+        "id": "1923e41a.3df5ec",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/mdons-closed-loop.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Param details 1\"/>\n<parameter name=\"field2\" value=\"`$optical-service-create-input.payload.param[$ido].name`\"/>\n<parameter name=\"field3\" value=\"`$optical-service-create-input.payload.param[$ido].value`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1101.676067352295,
+        "y": 736.2215881347656,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "708de688.ffe158",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/mdons-closed-loop.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Param details 2\"/>\n<parameter name=\"field2\" value=\"`$optical-service-create-input.payload.param[$ido].name`\"/>\n<parameter name=\"field3\" value=\"`$optical-service-create-input.payload.param[$ido].value`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1106.6761474609375,
+        "y": 831.2215576171875,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cba7e744.47fa48",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/mdons-closed-loop.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Param details 3\"/>\n<parameter name=\"field2\" value=\"`$optical-service-create-input.payload.param[$ido].name`\"/>\n<parameter name=\"field3\" value=\"`$optical-service-create-input.payload.param[$ido].value`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1033.3427352905273,
+        "y": 909.5548648834229,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d0395cd6.55c81",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/mdons-closed-loop.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Param details 4\"/>\n<parameter name=\"field2\" value=\"`$optical-service-create-input.payload.param[$ido].name`\"/>\n<parameter name=\"field3\" value=\"`$optical-service-create-input.payload.param[$ido].value`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1008.3428115844727,
+        "y": 1004.5548820495605,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1f93d608.fb2cea",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/mdons-closed-loop.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Param details 5\"/>\n<parameter name=\"field2\" value=\"`$optical-service-create-input.payload.param[$ido].name`\"/>\n<parameter name=\"field3\" value=\"`$optical-service-create-input.payload.param[$ido].value`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 998.3427734375,
+        "y": 1121.2215576171875,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d2d6743b.265be8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/mdons-closed-loop.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Param details 6\"/>\n<parameter name=\"field2\" value=\"`$optical-service-create-input.payload.param[$ido].name`\"/>\n<parameter name=\"field3\" value=\"`$optical-service-create-input.payload.param[$ido].value`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 776.6761817932129,
+        "y": 1207.8881950378418,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e1a11a59.e81cd8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='original-name' value='`$service-name`' />\n\n\n",
+        "comments": "",
+        "x": 575.0094604492188,
+        "y": 130.00946044921875,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "9f686b58.9ed108",
+        "type": "get-resource",
+        "name": "Get service from AAI",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\n key='customer.global-customer-id = $global-customer-id AND\n     service-subscription.service-type = $service-type AND\n     service-instance.service-instance-id = $access.service-instance-id' \npfx='mdons-access'      local-only='false'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 368.3427963256836,
+        "y": 929.5548934936523,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "998851ce.e8b6c",
+        "type": "delete",
+        "name": "delete service instance AAI",
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\nkey='customer.global-customer-id = $global-customer-id AND\nservice-subscription.service-type = $service-type AND\nservice-instance.service-instance-id = $access.service-instance-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 255.00948333740234,
+        "y": 1164.4033229351044,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "785dc0fe.0394b",
+        "type": "save",
+        "name": "save service-instance details in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  \n     key='customer.global-customer-id = $global-customer-id AND\n     service-subscription.service-type = $service-type AND\n     service-instance.service-instance-id = $access.service-instance-id' >\n<parameter name='service-instance-id' value='`$mdons-access.service-instance-id`' />\n<parameter name='service-instance-name' value='`$mdons-access.service-instance-name`' />\n<parameter name='service-type' value='`$mdons-access.service-type`' />\n<parameter name='orchestration-status' value='`$mdons-access.orchestration-status`' />\n<parameter name='service-role' value='`$mdons-access.service-role`' />\n<parameter name='model-invariant-id' value='`$mdons-access.model-invariant-id`' />\n<parameter name='model-version-id' value='`$mdons-access.model-version-id`' />\n<parameter name='input-parameters' value='`$mdons-access.input-parameters`' />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 203.34280395507812,
+        "y": 1274.4032859802246,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b69e4eae.e0c08",
+        "type": "update",
+        "name": "update logical-link-status AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\n     key='logical-link.link-name = $link-name '\n      local-only='false'>\n<parameter name='operational-status' value='down' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 719.2497253417969,
+        "y": 1304.7064723968506,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "761b7172.3b156",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idl' start='0' end='`$mdons-access.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 246.66663360595703,
+        "y": 1069.5897617340088,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "95b466aa.ccbde8"
+            ]
+        ]
+    },
+    {
+        "id": "95b466aa.ccbde8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$mdons-access.relationship-list.relationship[$idl].related-to == 'logical-link'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 386.6665267944336,
+        "y": 1047.7714805603027,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "1e17c1fc.5337de"
+            ]
+        ]
+    },
+    {
+        "id": "1e17c1fc.5337de",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 486.6665153503418,
+        "y": 1189.4380588531494,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "475e659a.b3afcc"
+            ]
+        ]
+    },
+    {
+        "id": "475e659a.b3afcc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 483.3332214355469,
+        "y": 1324.438066482544,
+        "z": "701fc60a.170548",
+        "wires": [
+            [
+                "b69e4eae.e0c08",
+                "65078486.abf53c"
+            ]
+        ]
+    },
+    {
+        "id": "65078486.abf53c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='link-name' value='`$mdons-access.relationship-list.relationship[$idl].relationship-data[0].relationship-value`' />\n",
+        "comments": "",
+        "x": 636.6760864257812,
+        "y": 1249.7064208984375,
+        "z": "701fc60a.170548",
+        "wires": []
+    },
+    {
+        "id": "1a8fcaf7.2d73b5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/mdons-closed-loop.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Service Details\"/>\n<parameter name=\"field3\" value=\"`$access.service-instance-id`\"/>\n<parameter name=\"field4\" value=\"`$mdons-access.model-invariant-id`\"/>\n<parameter name=\"field5\" value=\"`$mdons-access.input-parameters`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 298.3427791595459,
+        "y": 994.4032897949219,
+        "z": "701fc60a.170548",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_optical-service-create-sync-success.json b/platform-logic/optical-service/src/main/json/optical-service_optical-service-create-sync-success.json
index b99102d2..a83834c6 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_optical-service-create-sync-success.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_optical-service-create-sync-success.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "ed855935.68b9c",
+        "id": "d4295740.c12e18",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 105.5,
-        "y": 109,
-        "z": "7dd93eb8.cfce58",
+        "x": 278.3428039550781,
+        "y": 140.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             [
-                "3c249c15.d445ac"
+                "5b3e4a47.637864"
             ]
         ]
     },
     {
-        "id": "aeb9ff8.19b168",
+        "id": "ac487a45.8727c8",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='optical-service-create-sync-success' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 299.5,
-        "y": 81,
-        "z": "7dd93eb8.cfce58",
+        "x": 472.3428039550781,
+        "y": 112.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             [
-                "2bc24e2c.b2707a"
+                "f7120a00.d17148"
             ]
         ]
     },
     {
-        "id": "3c249c15.d445ac",
+        "id": "5b3e4a47.637864",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -38,173 +38,173 @@
         "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='optical-service' version='${project.version}'>",
         "outputs": 1,
-        "x": 141,
-        "y": 232,
-        "z": "7dd93eb8.cfce58",
+        "x": 313.8428039550781,
+        "y": 263.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             [
-                "aeb9ff8.19b168"
+                "ac487a45.8727c8"
             ]
         ]
     },
     {
-        "id": "2bc24e2c.b2707a",
+        "id": "f7120a00.d17148",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 402.5,
-        "y": 145,
-        "z": "7dd93eb8.cfce58",
+        "x": 575.3428039550781,
+        "y": 176.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             [
-                "45c29ba0.1a8f6c",
-                "8ae2e619.562c8",
-                "f8f48edd.64e44",
-                "4cef2908.13e6b8",
-                "b6ddb6e7.407d88",
-                "861e288.ff5a6d8",
-                "d66dfe6f.f22d28",
-                "3cba8d47.890d8a",
-                "9679e92f.973568",
-                "4a3b5ff.ccb33a"
+                "10419a02.5279a6",
+                "dec6cfa9.b29a2",
+                "f6dad6b5.f6a6d8",
+                "abf2f09.770521",
+                "78255cf4.62dbd4",
+                "1a4fe0d2.9104df",
+                "950ee350.7984c",
+                "6433103.5b64df",
+                "2f74f1c4.b8113e",
+                "127d45c8.8b89aa"
             ]
         ]
     },
     {
-        "id": "f8f48edd.64e44",
+        "id": "f6dad6b5.f6a6d8",
         "type": "save",
         "name": "update rate in aend in DB",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $available-bandwidth-aend WHERE \ninterface_name = $optical-service-create-input.payload.service-aend.port-id'\nforce='true' pfx='save-result'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 803.5,
-        "y": 189,
-        "z": "7dd93eb8.cfce58",
+        "x": 976.3428039550781,
+        "y": 220.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             []
         ]
     },
     {
-        "id": "b6ddb6e7.407d88",
+        "id": "78255cf4.62dbd4",
         "type": "update",
         "name": "update p-interface a-End in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='p-interface'\nkey = 'pnf.pnf-name = $a-end-pnf-name\n      AND p-interface.interface-name = $optical-service-create-input.payload.service-aend.port-id'\n      local-only='false'>\n<parameter name='available-capacity' value='`$available-bandwidth-aend`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 727.5,
-        "y": 319,
-        "z": "7dd93eb8.cfce58",
+        "x": 900.3428039550781,
+        "y": 350.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             []
         ]
     },
     {
-        "id": "4cef2908.13e6b8",
+        "id": "abf2f09.770521",
         "type": "save",
         "name": "update rate in azend DB",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $available-bandwidth-zend WHERE \ninterface_name = $optical-service-create-input.payload.service-zend.port-id'\nforce='true' pfx='save-result'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 741.5,
-        "y": 263,
-        "z": "7dd93eb8.cfce58",
+        "x": 914.3428039550781,
+        "y": 294.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             []
         ]
     },
     {
-        "id": "861e288.ff5a6d8",
+        "id": "1a4fe0d2.9104df",
         "type": "update",
         "name": "update p-interface z-End in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='p-interface'\nkey = 'pnf.pnf-name = $z-end-pnf-name\n      AND p-interface.interface-name = $optical-service-create-input.payload.service-zend.port-id'\n      local-only='false'>\n<parameter name='available-capacity' value='`$available-bandwidth-zend`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 723.5,
-        "y": 391,
-        "z": "7dd93eb8.cfce58",
+        "x": 896.3428039550781,
+        "y": 422.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             []
         ]
     },
     {
-        "id": "45c29ba0.1a8f6c",
+        "id": "10419a02.5279a6",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside sync success\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 562.5,
-        "y": 92,
-        "z": "7dd93eb8.cfce58",
+        "x": 735.3428039550781,
+        "y": 123.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             []
         ]
     },
     {
-        "id": "8ae2e619.562c8",
+        "id": "dec6cfa9.b29a2",
         "type": "set",
         "name": "set available rate as 0",
         "xml": "<set>\n<parameter name='available-bandwidth-aend' value='0' />\n<parameter name='available-bandwidth-zend' value='0' />\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 674.5,
-        "y": 142,
-        "z": "7dd93eb8.cfce58",
+        "x": 847.3428039550781,
+        "y": 173.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": []
     },
     {
-        "id": "9679e92f.973568",
+        "id": "2f74f1c4.b8113e",
         "type": "save",
         "name": "save Service Request Details in DB",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url) VALUES ( $optical-service-create-input.request-id , $controller-id , 'CREATED' , $optical-service-create-input.payload.service-rate ,  $optical-service-create-input.service-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url );\">\n",
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url) VALUES ( $optical-service-create-input.request-id , $controller-id , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $optical-service-create-input.service-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url );\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 667.5,
-        "y": 467,
-        "z": "7dd93eb8.cfce58",
+        "x": 840.3428039550781,
+        "y": 498.00946044921875,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             []
         ]
     },
     {
-        "id": "4a3b5ff.ccb33a",
+        "id": "127d45c8.8b89aa",
         "type": "save",
         "name": "save service-instance details in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $optical-service-create-input.service-id' >\n<parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />\n<parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />\n<parameter name='service-type' value='Domain-Service' />\n<parameter name='orchestration-status' value='CREATED' />\n<parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />\n<parameter name='service-layer' value='`$optical-service-create-input.payload.service-layer`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $optical-service-create-input.service-id' >\n<parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />\n<parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />\n<parameter name='service-type' value='Domain-Service' />\n<parameter name='orchestration-status' value='CREATING' />\n<parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />\n<parameter name='service-layer' value='`$optical-service-create-input.payload.service-layer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 636.5,
-        "y": 535,
-        "z": "7dd93eb8.cfce58",
+        "x": 809.3428039550781,
+        "y": 566.0094604492188,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             []
         ]
     },
     {
-        "id": "d66dfe6f.f22d28",
+        "id": "950ee350.7984c",
         "type": "save",
         "name": "save service-instance relation with p-interface",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $optical-service-create-input.service-id' 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/' + $a-end-pnf-name + '/p-interfaces/p-interface/' + $optical-service-create-input.payload.service-aend.port-id `\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$a-end-pnf-name`\" /> \n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $z-end-pnf-name + '/p-interfaces/p-interface/' + $optical-service-create-input.payload.service-zend.port-id `\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$z-end-pnf-name`\" />\n   \n    ",
         "comments": "",
         "outputs": 1,
-        "x": 621.5,
-        "y": 608,
-        "z": "7dd93eb8.cfce58",
+        "x": 794.3428039550781,
+        "y": 639.0094604492188,
+        "z": "5af8d27f.fc4b1c",
         "wires": [
             []
         ]
     },
     {
-        "id": "3cba8d47.890d8a",
+        "id": "6433103.5b64df",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='final-response-code' value='200' />\n",
         "comments": "",
-        "x": 469.566650390625,
-        "y": 703.566650390625,
-        "z": "7dd93eb8.cfce58",
+        "x": 642.4094543457031,
+        "y": 734.5761108398438,
+        "z": "5af8d27f.fc4b1c",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json b/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json
index 6edd77f8..0fe22a3a 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "b74a66d5.9bb398",
+        "id": "51ee7ceb.84e7d4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 295.5000305175781,
-        "y": 78.99999237060547,
-        "z": "be119e26.f34f9",
+        "x": 292.0000305175781,
+        "y": 61.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "f760250f.2146"
+                "29401623.aa2d9a"
             ]
         ]
     },
     {
-        "id": "3de2d7a.f5149a8",
+        "id": "69c7c01f.2eeed",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='optical-service-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 294.5000305175781,
-        "y": 153.99999237060547,
-        "z": "be119e26.f34f9",
+        "x": 291.0000305175781,
+        "y": 136.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "a5ce55fe.28ddd"
+                "6db2445a.fdb20c"
             ]
         ]
     },
     {
-        "id": "f760250f.2146",
+        "id": "29401623.aa2d9a",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -38,1089 +38,1173 @@
         "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='optical-service' version='${project.version}'>",
         "outputs": 1,
-        "x": 513.0000305175781,
-        "y": 61.99999237060547,
-        "z": "be119e26.f34f9",
+        "x": 509.5000305175781,
+        "y": 44.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "3de2d7a.f5149a8"
+                "69c7c01f.2eeed"
             ]
         ]
     },
     {
-        "id": "a5ce55fe.28ddd",
+        "id": "6db2445a.fdb20c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 386.5000305175781,
-        "y": 235,
-        "z": "be119e26.f34f9",
+        "x": 383.0000305175781,
+        "y": 217.67614364624023,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "2ab36a9f.f1f24e",
-                "77ca198e.37e04",
-                "68ebe78a.dd3bb",
-                "360c94f6.31041c",
-                "c21735a0.60eee",
-                "13d6217f.3fa927",
-                "f6fda81a.c05dd8",
-                "52cfcf48.59a01",
-                "47962899.7c2",
-                "e4b9f8f.0986908",
-                "3bfa7a37.3c6426"
+                "2a6bbade.0929c6",
+                "69ca9e9b.b8ce5",
+                "ea5ef9b3.a11be8",
+                "382353e4.d87fec",
+                "cb94ab5f.1c20d8",
+                "24684bb0.9b2da4",
+                "5d24d34c.f7200c",
+                "ba9a69d4.39ab08",
+                "67091f02.08a3b",
+                "1d744f82.b13ab",
+                "62f70543.ff887c",
+                "fc46660a.dc2e38",
+                "b5e0902f.10aa8",
+                "fabb7d83.a75cf"
             ]
         ]
     },
     {
-        "id": "2ab36a9f.f1f24e",
+        "id": "2a6bbade.0929c6",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end='`$optical-service-create-input.payload.param_length`' >\n    \n    \n    \n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 519.5,
-        "y": 199,
-        "z": "be119e26.f34f9",
+        "x": 557.666690826416,
+        "y": 160.00946807861328,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "9060c9c5.3504f8",
-                "5d6c79de.a3b868",
-                "3ef65e63.bc200a",
-                "cbdd335e.bb59e8",
-                "1e17c676.d6b4d2",
-                "e5856afd.4a9d48",
-                "7ddb4531.494d44",
-                "dc75f16e.caefe8",
-                "80d81673.f6bb08",
-                "da2fcf8b.57e868",
-                "84b92024.42fc4",
-                "b3fa14e7.d8f17",
-                "ee48055b.43515",
-                "27cdd875.835958"
+                "b230a9a.ea8ce58",
+                "7d62685a.1cf978",
+                "3899c3f5.ff0d1c",
+                "8bbd32f1.3b139",
+                "aa2f59bb.8696e8",
+                "dc258e2b.55a04",
+                "9af0bcca.add39",
+                "2d8bacd.16af554",
+                "e3a5dc08.672ca",
+                "c3013a1c.f0d408",
+                "b458c88.b917f38",
+                "2daaa41a.965f4c",
+                "178649c0.6dafb6",
+                "a5d44eff.c5775"
             ]
         ]
     },
     {
-        "id": "9060c9c5.3504f8",
+        "id": "b230a9a.ea8ce58",
         "type": "switchNode",
         "name": "switch uni1",
         "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 739.5,
-        "y": 97.00000762939453,
-        "z": "be119e26.f34f9",
+        "x": 736,
+        "y": 79.67615127563477,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "b6665015.8f12d"
+                "f1cbc9ae.931cf8"
             ]
         ]
     },
     {
-        "id": "b3fa14e7.d8f17",
+        "id": "2daaa41a.965f4c",
         "type": "set",
         "name": "set parameter",
         "xml": "<set>\n<parameter name='params' value='`$optical-service-create-input.payload.param[$idx]`' />\n",
         "comments": "",
-        "x": 768.5,
-        "y": 47,
-        "z": "be119e26.f34f9",
+        "x": 765,
+        "y": 29.676143646240234,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "b6665015.8f12d",
+        "id": "f1cbc9ae.931cf8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 903.5,
-        "y": 99.00000762939453,
-        "z": "be119e26.f34f9",
+        "x": 900,
+        "y": 81.67615127563477,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "1e006738.7e7a91"
+                "a064a4f8.6ae9d8"
             ]
         ]
     },
     {
-        "id": "1e006738.7e7a91",
+        "id": "a064a4f8.6ae9d8",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n<parameter name='pinterface-aend' value=\"`'uni1_id--'+ $optical-service-create-input.payload.param[$idx].value`\"/>\n",
         "comments": "",
-        "x": 1043.5,
-        "y": 94.00000762939453,
-        "z": "be119e26.f34f9",
+        "x": 1040,
+        "y": 76.67615127563477,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "5d6c79de.a3b868",
+        "id": "7d62685a.1cf978",
         "type": "switchNode",
         "name": "switch uni2",
         "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni2_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 739.5,
-        "y": 178,
-        "z": "be119e26.f34f9",
+        "x": 736,
+        "y": 160.67614364624023,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "589d96ad.decae8"
+                "acca2ae3.ec4788"
             ]
         ]
     },
     {
-        "id": "589d96ad.decae8",
+        "id": "acca2ae3.ec4788",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 898.5,
-        "y": 183,
-        "z": "be119e26.f34f9",
+        "x": 895,
+        "y": 165.67614364624023,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "ec88e67b.e42a78"
+                "6ec85b7f.521a14"
             ]
         ]
     },
     {
-        "id": "ec88e67b.e42a78",
+        "id": "6ec85b7f.521a14",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n<parameter name='pinterface-zend' value=\"`',uni2_id--'+ $optical-service-create-input.payload.param[$idx].value`\"/>\n",
         "comments": "",
-        "x": 1033.5,
-        "y": 180,
-        "z": "be119e26.f34f9",
+        "x": 1030,
+        "y": 162.67614364624023,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "3ef65e63.bc200a",
+        "id": "3899c3f5.ff0d1c",
         "type": "switchNode",
         "name": "switch uni1 coding_func",
         "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_coding_func'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 743.5,
-        "y": 274.9999694824219,
-        "z": "be119e26.f34f9",
+        "x": 740,
+        "y": 257.6761131286621,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "8b10514f.c61f58"
+                "3a02c2d9.6ce01e"
             ]
         ]
     },
     {
-        "id": "8b10514f.c61f58",
+        "id": "3a02c2d9.6ce01e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 941.5,
-        "y": 274.9999694824219,
-        "z": "be119e26.f34f9",
+        "x": 938,
+        "y": 257.6761131286621,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "fef26935.ee43c"
+                "c9dce196.c5e71"
             ]
         ]
     },
     {
-        "id": "fef26935.ee43c",
+        "id": "c9dce196.c5e71",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n\n\n\n",
         "comments": "",
-        "x": 1078.5,
-        "y": 271.9999694824219,
-        "z": "be119e26.f34f9",
+        "x": 1075,
+        "y": 254.6761131286621,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "cbdd335e.bb59e8",
+        "id": "8bbd32f1.3b139",
         "type": "switchNode",
         "name": "switch uni",
         "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 709.5,
-        "y": 329.99993896484375,
-        "z": "be119e26.f34f9",
+        "x": 706,
+        "y": 312.676082611084,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "a83d6090.08a4a"
+                "117b40a7.23ea5f"
             ]
         ]
     },
     {
-        "id": "a83d6090.08a4a",
+        "id": "117b40a7.23ea5f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 854.5,
-        "y": 334.99993896484375,
-        "z": "be119e26.f34f9",
+        "x": 851,
+        "y": 317.676082611084,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "eec11b63.1ee83"
+                "66cc41f8.ae315"
             ]
         ]
     },
     {
-        "id": "eec11b63.1ee83",
+        "id": "66cc41f8.ae315",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n<parameter name='pinterface-aend' value=\"`'uni_id--'+ $optical-service-create-input.payload.param[$idx].value`\"/>\n",
         "comments": "",
-        "x": 1012.5,
-        "y": 345.99993896484375,
-        "z": "be119e26.f34f9",
+        "x": 1009,
+        "y": 328.676082611084,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "1e17c676.d6b4d2",
+        "id": "aa2f59bb.8696e8",
         "type": "switchNode",
         "name": "switch enni",
         "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 703.5,
-        "y": 383.99993896484375,
-        "z": "be119e26.f34f9",
+        "x": 700,
+        "y": 366.676082611084,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "c1d6057a.bfaba"
+                "ae088ec6.29d92"
             ]
         ]
     },
     {
-        "id": "c1d6057a.bfaba",
+        "id": "ae088ec6.29d92",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 858.5,
-        "y": 398.99993896484375,
-        "z": "be119e26.f34f9",
+        "x": 855,
+        "y": 381.676082611084,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "6c9b34a9.cdab44"
+                "67b586c7.bcf178"
             ]
         ]
     },
     {
-        "id": "6c9b34a9.cdab44",
+        "id": "67b586c7.bcf178",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n<parameter name='pinterface-zend' value=\"`',enni_id--'+ $optical-service-create-input.payload.param[$idx].value`\"/>\n",
         "comments": "",
-        "x": 1016.5,
-        "y": 404.99993896484375,
-        "z": "be119e26.f34f9",
+        "x": 1013,
+        "y": 387.676082611084,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "e5856afd.4a9d48",
+        "id": "dc258e2b.55a04",
         "type": "switchNode",
         "name": "switch uni coding_func",
         "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni_coding_func'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 710.5,
-        "y": 423.39996337890625,
-        "z": "be119e26.f34f9",
+        "x": 707,
+        "y": 406.0761070251465,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "180d2bf0.83ffa4"
+                "1f05175.be186e9"
             ]
         ]
     },
     {
-        "id": "180d2bf0.83ffa4",
+        "id": "1f05175.be186e9",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 910.5,
-        "y": 460.39996337890625,
-        "z": "be119e26.f34f9",
+        "x": 907,
+        "y": 443.0761070251465,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "b518fbe6.6b3d48"
+                "fe24f047.e45ef"
             ]
         ]
     },
     {
-        "id": "b518fbe6.6b3d48",
+        "id": "fe24f047.e45ef",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
         "comments": "",
-        "x": 1050.5,
-        "y": 466.39996337890625,
-        "z": "be119e26.f34f9",
+        "x": 1047,
+        "y": 449.0761070251465,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "7ddb4531.494d44",
+        "id": "9af0bcca.add39",
         "type": "switchNode",
         "name": "switch enni1",
         "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni1_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 689.5,
-        "y": 471.4000244140625,
-        "z": "be119e26.f34f9",
+        "x": 686,
+        "y": 454.07616806030273,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "3f99875.f5fb5f8"
+                "751bffda.f24f9"
             ]
         ]
     },
     {
-        "id": "dc75f16e.caefe8",
+        "id": "2d8bacd.16af554",
         "type": "switchNode",
         "name": "switch enni2",
         "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni2_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 682.5,
-        "y": 535.4000244140625,
-        "z": "be119e26.f34f9",
+        "x": 679,
+        "y": 518.0761680603027,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "5ff8b6da.c93f"
+                "4d014a76.3767e4"
             ]
         ]
     },
     {
-        "id": "3f99875.f5fb5f8",
+        "id": "751bffda.f24f9",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 862.5,
-        "y": 498.4000244140625,
-        "z": "be119e26.f34f9",
+        "x": 859,
+        "y": 481.07616806030273,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "a1dffc1a.4ca8b8"
+                "d29b2dd5.306d9"
             ]
         ]
     },
     {
-        "id": "5ff8b6da.c93f",
+        "id": "4d014a76.3767e4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 847.5,
-        "y": 553.4000244140625,
-        "z": "be119e26.f34f9",
+        "x": 844,
+        "y": 536.0761680603027,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "1195c2b2.9677fd"
+                "351beb55.ce6a24"
             ]
         ]
     },
     {
-        "id": "a1dffc1a.4ca8b8",
+        "id": "d29b2dd5.306d9",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n<parameter name='pinterface-aend' value=\"`'enni1_id--'+ $optical-service-create-input.payload.param[$idx].value`\"/>\n",
         "comments": "",
-        "x": 1004.5,
-        "y": 503.4000244140625,
-        "z": "be119e26.f34f9",
+        "x": 1001,
+        "y": 486.07616806030273,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "1195c2b2.9677fd",
+        "id": "351beb55.ce6a24",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n<parameter name='pinterface-zend' value=\"`',enni2_id--'+ $optical-service-create-input.payload.param[$idx].value`\"/>\n",
         "comments": "",
-        "x": 971.5,
-        "y": 548.4000244140625,
-        "z": "be119e26.f34f9",
+        "x": 968,
+        "y": 531.0761680603027,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "80d81673.f6bb08",
+        "id": "e3a5dc08.672ca",
         "type": "switchNode",
         "name": "switch uni coding_func",
         "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni1_coding_func'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 695.5,
-        "y": 584.800048828125,
-        "z": "be119e26.f34f9",
+        "x": 691.9999771118164,
+        "y": 564.1428337097168,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "11aeaa86.32d365"
+                "7e0a0351.eab4cc"
             ]
         ]
     },
     {
-        "id": "11aeaa86.32d365",
+        "id": "7e0a0351.eab4cc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 872.5,
-        "y": 587.800048828125,
-        "z": "be119e26.f34f9",
+        "x": 869,
+        "y": 570.4761924743652,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "4ffe3b95.e1db4c"
+                "5a51c390.a2526c"
             ]
         ]
     },
     {
-        "id": "4ffe3b95.e1db4c",
+        "id": "5a51c390.a2526c",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
         "comments": "",
-        "x": 1016.5,
-        "y": 588.800048828125,
-        "z": "be119e26.f34f9",
+        "x": 1013,
+        "y": 571.4761924743652,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "77ca198e.37e04",
+        "id": "69ca9e9b.b8ce5",
         "type": "get-resource",
         "name": "get controller_id from DB",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT controller_id \nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE \nWHERE interface_name = $optical-service-create-input.payload.service-aend.port-id' \npfx='db.source1'>\n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 678.5,
-        "y": 779.5999755859375,
-        "z": "be119e26.f34f9",
+        "x": 675,
+        "y": 762.2761192321777,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "8351b374.bb829"
+                "3bc0ebca.20fce4"
             ]
         ]
     },
     {
-        "id": "68ebe78a.dd3bb",
+        "id": "ea5ef9b3.a11be8",
         "type": "get-resource",
         "name": "get controller_id from DB",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT controller_id \nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE \nWHERE interface_name = $optical-service-create-input.payload.service-zend.port-id' \npfx='db.source2'>\n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 659.5000305175781,
-        "y": 831.6000061035156,
-        "z": "be119e26.f34f9",
+        "x": 656.0000305175781,
+        "y": 814.2761497497559,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "b67baa88.7569f8"
+                "f54a3d3d.942aa"
             ]
         ]
     },
     {
-        "id": "2aa1562e.df8772",
+        "id": "f63b3eeb.67f52",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='controller1' value=\"`$db.source1.controller-id`\"/>\n",
         "comments": "",
-        "x": 1005.5,
-        "y": 779.5999755859375,
-        "z": "be119e26.f34f9",
+        "x": 1002,
+        "y": 762.2761192321777,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "723d4991.2456b",
+        "id": "f111e27.da9dc2",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='controller2' value=\"`$db.source2.controller-id`\"/>\n",
         "comments": "",
-        "x": 1001.5,
-        "y": 838.6000061035156,
-        "z": "be119e26.f34f9",
+        "x": 998,
+        "y": 821.2761497497559,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "3bfa7a37.3c6426",
+        "id": "fc46660a.dc2e38",
         "type": "switchNode",
         "name": "controllers-id check",
         "xml": "<switch test='`$controller1==$controller2`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 97.5,
-        "y": 1339.599967956543,
-        "z": "be119e26.f34f9",
+        "x": 94,
+        "y": 1322.2761116027832,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "8218e216.269b68",
-                "abeeec75.5e0a"
+                "cbd08e71.434f",
+                "5cc41004.9acb"
             ]
         ]
     },
     {
-        "id": "8218e216.269b68",
+        "id": "cbd08e71.434f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 278.39996337890625,
-        "y": 1278.89990234375,
-        "z": "be119e26.f34f9",
+        "x": 274.89996337890625,
+        "y": 1261.5760459899902,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "714fe0b3.cbe86"
+                "dfba0215.d64aa"
             ]
         ]
     },
     {
-        "id": "28b59567.3572fa",
+        "id": "96ef7743.5c1a08",
         "type": "call",
         "name": "main-create",
         "xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 697.4000549316406,
-        "y": 1262.900016784668,
-        "z": "be119e26.f34f9",
+        "x": 693.9000549316406,
+        "y": 1245.5761604309082,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "f2170d69.16bd1"
+                "e44b182.8dbb5e8"
             ]
         ]
     },
     {
-        "id": "abeeec75.5e0a",
+        "id": "5cc41004.9acb",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 369.3999938964844,
-        "y": 1445.900016784668,
-        "z": "be119e26.f34f9",
+        "x": 275.8999710083008,
+        "y": 1426.9094772338867,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "9e125ea0.2b4738"
+                "b5b4fca.44564"
             ]
         ]
     },
     {
-        "id": "360c94f6.31041c",
+        "id": "382353e4.d87fec",
         "type": "execute",
         "name": "split node-id a-end retrieved from DB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller1`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 671.3999938964844,
-        "y": 887.8999938964844,
-        "z": "be119e26.f34f9",
+        "x": 667.8999938964844,
+        "y": 870.5761375427246,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "c21735a0.60eee",
+        "id": "cb94ab5f.1c20d8",
         "type": "execute",
         "name": "split node-id a-end retrieved from DB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller2`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix2\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 659.4000244140625,
-        "y": 935.8999938964844,
-        "z": "be119e26.f34f9",
+        "x": 655.9000244140625,
+        "y": 918.5761375427246,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "13d6217f.3fa927",
+        "id": "24684bb0.9b2da4",
         "type": "set",
         "name": "set controller-ip",
         "xml": "<set>\n<parameter name='controller-ip1' value='`$param-prefix1[1]`' />\n<parameter name='domain-type1' value='`$param-prefix1[0]`' />\n<parameter name='controller-ip2' value='`$param-prefix2[1]`' />\n<parameter name='domain-type2' value='`$param-prefix2[0]`' />\n ",
         "comments": "",
-        "x": 584.2500305175781,
-        "y": 983.7499694824219,
-        "z": "be119e26.f34f9",
+        "x": 580.7500305175781,
+        "y": 966.4261131286621,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "9e125ea0.2b4738",
+        "id": "b5b4fca.44564",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 511.0666809082031,
-        "y": 1443.5666427612305,
-        "z": "be119e26.f34f9",
+        "x": 507.5666809082031,
+        "y": 1426.2427864074707,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "cb4e4d03.2320a8",
-                "aabebe1e.a2a91",
-                "ed06089e.edc54",
-                "ee62cd42.65cd58",
-                "be3eb75a.fcea9"
+                "8104d75c.ee8468",
+                "656ab2d4.c3fb6c",
+                "a9e2c26d.57924",
+                "5465bdbd.205a84",
+                "d5363033.a7177"
             ]
         ]
     },
     {
-        "id": "cb4e4d03.2320a8",
+        "id": "8104d75c.ee8468",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='access-aend' value=\"`$optical-service-create-input.payload.service-aend.port-id`\"/>\n<parameter name='access-zend' value=\"`$optical-service-create-input.payload.service-zend.port-id`\"/>\n",
+        "xml": "<set>\n<parameter name='src-port-id' value=\"`$optical-service-create-input.payload.service-aend.port-id`\"/>\n<parameter name='dst-port-id' value=\"`$optical-service-create-input.payload.service-zend.port-id`\"/>\n<parameter name='access-service-name' value=\"`$optical-service-create-input.payload.service-name`\"/>\n\n",
         "comments": "",
-        "x": 682.1500015258789,
-        "y": 1562.6500406265259,
-        "z": "be119e26.f34f9",
+        "x": 693.6499633789062,
+        "y": 1500.3261532783508,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "be3eb75a.fcea9",
+        "id": "5465bdbd.205a84",
         "type": "call",
         "name": "inter-domain DG",
         "xml": "<call module='optical-service' rpc='inter-domain-handling' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 673.6500015258789,
-        "y": 1677.6500415802002,
-        "z": "be119e26.f34f9",
+        "x": 670.1500015258789,
+        "y": 1660.3261852264404,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "714fe0b3.cbe86",
+        "id": "dfba0215.d64aa",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 521.3999938964844,
-        "y": 1267.900016784668,
-        "z": "be119e26.f34f9",
+        "x": 517.8999938964844,
+        "y": 1250.5761604309082,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "912b18e0.6fcbc8",
-                "ce6f9a2a.d58bc",
-                "545d3a33.e4b434",
-                "9be241b.73fe74",
-                "28b59567.3572fa"
+                "a69cc43e.4224a8",
+                "39fef34a.fff3dc",
+                "a0b47622.30a538",
+                "18de46db.9f95f9",
+                "96ef7743.5c1a08"
             ]
         ]
     },
     {
-        "id": "2a30842b.722684",
+        "id": "93240432.64d878",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$final-response-code`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 916.4000549316406,
-        "y": 1175.900016784668,
-        "z": "be119e26.f34f9",
+        "x": 912.9000549316406,
+        "y": 1158.5761604309082,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "13543e22.9a274a"
+                "d35f8f3f.afff5"
             ]
         ]
     },
     {
-        "id": "13543e22.9a274a",
+        "id": "d35f8f3f.afff5",
         "type": "outcome",
         "name": "200",
         "xml": "<outcome value='200'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1054.4000549316406,
-        "y": 1168.900016784668,
-        "z": "be119e26.f34f9",
+        "x": 1050.9000549316406,
+        "y": 1151.5761604309082,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "d10726b7.d3d02"
+                "8ba6bc3c.8340d"
             ]
         ]
     },
     {
-        "id": "d44f3957.51ad4",
+        "id": "46fe0a0d.c44404",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Service Created Successfully' />\n<parameter name='ack-final-indicator' value='Y' />\n",
         "comments": "",
-        "x": 1354.4000549316406,
-        "y": 1211.900016784668,
-        "z": "be119e26.f34f9",
+        "x": 1652.5666961669922,
+        "y": 1242.9096031188965,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "d10726b7.d3d02",
+        "id": "8ba6bc3c.8340d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1192.4000549316406,
-        "y": 1164.900016784668,
-        "z": "be119e26.f34f9",
+        "x": 1188.9000549316406,
+        "y": 1147.5761604309082,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "d44f3957.51ad4",
-                "16c29993.ab7326",
-                "87bdb7fa.7da8d8"
+                "81960bf8.553688",
+                "2784835b.5b854c"
             ]
         ]
     },
     {
-        "id": "da2fcf8b.57e868",
+        "id": "c3013a1c.f0d408",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$optical-service-create-input.payload.service-aend.port-id`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 740.4000244140625,
-        "y": 137.89999389648438,
-        "z": "be119e26.f34f9",
+        "x": 736.9000244140625,
+        "y": 120.57613754272461,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "84b92024.42fc4",
+        "id": "b458c88.b917f38",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$optical-service-create-input.payload.service-zend.port-id`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 735.4000244140625,
-        "y": 214.89999389648438,
-        "z": "be119e26.f34f9",
+        "x": 731.9000244140625,
+        "y": 197.5761375427246,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "ee48055b.43515",
+        "id": "178649c0.6dafb6",
         "type": "switchNode",
         "name": "service-name",
         "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'service-name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 663.0667114257812,
-        "y": 618.566650390625,
-        "z": "be119e26.f34f9",
+        "x": 659.5667114257812,
+        "y": 601.2427940368652,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "5a17268d.005fe8"
+                "41a2a0bb.81352"
             ]
         ]
     },
     {
-        "id": "5a17268d.005fe8",
+        "id": "41a2a0bb.81352",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 840.0667114257812,
-        "y": 634.566650390625,
-        "z": "be119e26.f34f9",
+        "x": 836.5667114257812,
+        "y": 617.2427940368652,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "a2725653.88689"
+                "504e594c.3f8818"
             ]
         ]
     },
     {
-        "id": "a2725653.88689",
+        "id": "504e594c.3f8818",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
         "comments": "",
-        "x": 974.0667724609375,
-        "y": 636.566650390625,
-        "z": "be119e26.f34f9",
+        "x": 970.5667724609375,
+        "y": 619.2427940368652,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "8351b374.bb829",
+        "id": "3bc0ebca.20fce4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 860.4000244140625,
-        "y": 785.9000244140625,
-        "z": "be119e26.f34f9",
+        "x": 856.9000244140625,
+        "y": 768.5761680603027,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "2aa1562e.df8772"
+                "f63b3eeb.67f52"
             ]
         ]
     },
     {
-        "id": "b67baa88.7569f8",
+        "id": "f54a3d3d.942aa",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 858.4000244140625,
-        "y": 835.8999938964844,
-        "z": "be119e26.f34f9",
+        "x": 854.9000244140625,
+        "y": 818.5761375427246,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "723d4991.2456b"
+                "f111e27.da9dc2"
             ]
         ]
     },
     {
-        "id": "f2170d69.16bd1",
+        "id": "e44b182.8dbb5e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 853.3999938964844,
-        "y": 1262.900016784668,
-        "z": "be119e26.f34f9",
+        "x": 849.8999938964844,
+        "y": 1245.5761604309082,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "2a30842b.722684"
+                "93240432.64d878"
             ]
         ]
     },
     {
-        "id": "f6fda81a.c05dd8",
+        "id": "5d24d34c.f7200c",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service1-request-id\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 355.5000305175781,
-        "y": 946.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 352.0000305175781,
+        "y": 929.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "52cfcf48.59a01",
+        "id": "ba9a69d4.39ab08",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service1-svc-instance-id\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 384.5000305175781,
-        "y": 860.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 381.0000305175781,
+        "y": 843.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "47962899.7c2",
+        "id": "67091f02.08a3b",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service2-svc-instance-id\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 318.5000305175781,
-        "y": 1021.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 315.0000305175781,
+        "y": 1004.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "e4b9f8f.0986908",
+        "id": "1d744f82.b13ab",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service2-request-id\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 289.5000305175781,
-        "y": 1098.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 286.0000305175781,
+        "y": 1081.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "16c29993.ab7326",
+        "id": "81960bf8.553688",
         "type": "call",
         "name": "create-service-relationship",
         "xml": "<call module='optical-service' rpc='create-service-relationship' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1450.5000305175781,
-        "y": 1129.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 1447.0000305175781,
+        "y": 1112.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce6f9a2a.d58bc",
+        "id": "39fef34a.fff3dc",
         "type": "set",
         "name": "set acc ser",
         "xml": "<set>\n<parameter name='domain-requests' value=\"`$service1-request-id`\" />\n<parameter name='optical-service-create-input.request-id' value=\"`$service1-request-id`\" />\n<parameter name='optical-service-create-input.service-id' value=\"`$service1-svc-instance-id`\" />\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$optical-service-create-input.payload.service-name + '_' + 'MDONS-OTN'`\" /> \n",
         "comments": "",
-        "x": 690.5000305175781,
-        "y": 1064.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 687.0000305175781,
+        "y": 1047.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "912b18e0.6fcbc8",
+        "id": "a69cc43e.4224a8",
         "type": "save",
         "name": "save access service db",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );\"> ",
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests, pinterface_list ) VALUES ( $access-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests , $pinterface-list );\"> ",
         "comments": "",
         "outputs": 1,
-        "x": 754.5000305175781,
-        "y": 1154.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 751.0000457763672,
+        "y": 1137.6762208938599,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "ed06089e.edc54",
+        "id": "a9e2c26d.57924",
         "type": "set",
         "name": "set acc ser",
-        "xml": "<set>\n<parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />\n<parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />\n<parameter name='domain-requests' value=\"`$service1-request-id + ',' + $service2-request-id`\" />\n\n",
+        "xml": "<set>\n<parameter name='access-request-id' value='`$optical-service-create-input.request-id`' />\n<parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />\n<parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />\n\n\n\n\n\n",
         "comments": "",
-        "x": 690.5000305175781,
-        "y": 1379.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 687.0000305175781,
+        "y": 1362.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "aabebe1e.a2a91",
+        "id": "656ab2d4.c3fb6c",
         "type": "save",
         "name": "save access service db",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );\"> ",
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests, pinterface_list ) VALUES ( $access-request-id , null , 'CREATING' , $service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests , $pinterface-list );\"> ",
         "comments": "",
         "outputs": 1,
-        "x": 752.5000305175781,
-        "y": 1506.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 754.0000915527344,
+        "y": 1439.6760692596436,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "ee62cd42.65cd58",
+        "id": "d5363033.a7177",
         "type": "record",
         "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`'domain rquest_' + $domain-requests`\"/>\n<parameter name=\"field2\" value=\"`'Service 1 req id---' + $service1-request-id`\"/>\n<parameter name=\"field3\" value=\"`'Service 2 req id---' + $service2-request-id`\"/>\n",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Access service details\"/>\n<parameter name=\"field2\" value=\"`$access-request-id`\"/>\n<parameter name=\"field3\" value=\"`$src-port-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 697.6000061035156,
-        "y": 1443.099967956543,
-        "z": "be119e26.f34f9",
+        "x": 682.4333305358887,
+        "y": 1564.1094455718994,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "545d3a33.e4b434",
+        "id": "a0b47622.30a538",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`'domain rquest_' + $domain-requests`\"/>\n<parameter name=\"field2\" value=\"`'Access rquest_' + $as-request-id`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 696.6000061035156,
-        "y": 1110.099967956543,
-        "z": "be119e26.f34f9",
+        "x": 693.1000061035156,
+        "y": 1092.7761116027832,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             []
         ]
     },
     {
-        "id": "9be241b.73fe74",
+        "id": "18de46db.9f95f9",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />\n<parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />",
+        "xml": "<set>\n<parameter name='access-request-id' value='`$optical-service-create-input.request-id`' />\n<parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />",
         "comments": "",
-        "x": 526.5000305175781,
-        "y": 1055.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 523.0000305175781,
+        "y": 1038.6761360168457,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     },
     {
-        "id": "87bdb7fa.7da8d8",
-        "type": "save",
-        "name": "update acc service db",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"CREATED\" WHERE request_id = $as-request-id'\nforce='true' pfx='save-result'>",
+        "id": "a5d44eff.c5775",
+        "type": "switchNode",
+        "name": "protocol",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_client_proto'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1376.5000305175781,
-        "y": 1054.9999923706055,
-        "z": "be119e26.f34f9",
+        "x": 643.0666389465332,
+        "y": 642.5760822296143,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
-            []
+            [
+                "7821583f.1da9f8"
+            ]
         ]
     },
     {
-        "id": "27cdd875.835958",
+        "id": "7821583f.1da9f8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 767.066650390625,
+        "y": 655.2427940368652,
+        "z": "3765d4ee.f4ef7c",
+        "wires": [
+            [
+                "d98fda09.1bb478"
+            ]
+        ]
+    },
+    {
+        "id": "d98fda09.1bb478",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-protocol' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "comments": "",
+        "x": 893.066650390625,
+        "y": 668.2427940368652,
+        "z": "3765d4ee.f4ef7c",
+        "wires": []
+    },
+    {
+        "id": "2784835b.5b854c",
         "type": "switchNode",
-        "name": "protocol",
-        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_client_proto'`\">\n",
+        "name": "switch",
+        "xml": "<switch test=\"`$domain-type == 'MSA'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 646.566650390625,
-        "y": 661.566650390625,
-        "z": "be119e26.f34f9",
+        "x": 1346.373046875,
+        "y": 1191.373046875,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "b3f1926e.bdae08"
+                "85ea004e.44196",
+                "20585705.4cb1a8"
             ]
         ]
     },
     {
-        "id": "b3f1926e.bdae08",
+        "id": "85ea004e.44196",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 770.566650390625,
-        "y": 672.566650390625,
-        "z": "be119e26.f34f9",
+        "x": 1496.3731002807617,
+        "y": 1174.7064771652222,
+        "z": "3765d4ee.f4ef7c",
         "wires": [
             [
-                "487a398d.1fdfb"
+                "5682ade7.0ace44"
             ]
         ]
     },
     {
-        "id": "487a398d.1fdfb",
+        "id": "20585705.4cb1a8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1493.0397987365723,
+        "y": 1249.7064781188965,
+        "z": "3765d4ee.f4ef7c",
+        "wires": [
+            [
+                "46fe0a0d.c44404"
+            ]
+        ]
+    },
+    {
+        "id": "5682ade7.0ace44",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Service Created Successfully' />\n<parameter name='ack-final-indicator' value='N' />\n",
+        "comments": "",
+        "x": 1678.0396728515625,
+        "y": 1176.373046875,
+        "z": "3765d4ee.f4ef7c",
+        "wires": []
+    },
+    {
+        "id": "62f70543.ff887c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Controller Ids\"/>\n<parameter name=\"field2\" value=\"`$controller1`\"/>\n<parameter name=\"field3\" value=\"`$controller2`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 228.34278106689453,
+        "y": 1154.4032135009766,
+        "z": "3765d4ee.f4ef7c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b5e0902f.10aa8",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-protocol' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "xml": "<set>\n<parameter name='pinterface-list' value=\"\"/>\n",
+        "comments": "",
+        "x": 476.6761245727539,
+        "y": 121.6761302947998,
+        "z": "3765d4ee.f4ef7c",
+        "wires": []
+    },
+    {
+        "id": "fabb7d83.a75cf",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='pinterface-list' value=\"`$pinterface-aend + $pinterface-zend`\"/>\n",
         "comments": "",
-        "x": 896.566650390625,
-        "y": 685.566650390625,
-        "z": "be119e26.f34f9",
+        "x": 138.34280395507812,
+        "y": 1229.2518281936646,
+        "z": "3765d4ee.f4ef7c",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_optical-service-delete.json b/platform-logic/optical-service/src/main/json/optical-service_optical-service-delete.json
index 8c2cfb86..bdcecb61 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_optical-service-delete.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_optical-service-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "c17df4ee.ad8458",
+        "id": "e0d62dfb.c4892",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 112.5,
-        "y": 195,
-        "z": "fd6341d7.d80b3",
+        "x": 171.67613220214844,
+        "y": 182.38332986831665,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "2f8ae227.f9075e"
+                "ed0e245d.a59e08"
             ]
         ]
     },
     {
-        "id": "2f8ae227.f9075e",
+        "id": "ed0e245d.a59e08",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,1511 +22,1204 @@
         "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='optical-service' version='${project.version}'>",
         "outputs": 1,
-        "x": 221,
-        "y": 273,
-        "z": "fd6341d7.d80b3",
+        "x": 280.17613220214844,
+        "y": 260.38332986831665,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "34dadbb5.269934"
+                "5edee11.65d4d2"
             ]
         ]
     },
     {
-        "id": "34dadbb5.269934",
+        "id": "5edee11.65d4d2",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='optical-service-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 89.5,
-        "y": 364,
-        "z": "fd6341d7.d80b3",
+        "x": 148.67613220214844,
+        "y": 351.38332986831665,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "e6b811fb.e9938"
+                "30cfbd8.db7ed42"
             ]
         ]
     },
     {
-        "id": "e6b811fb.e9938",
+        "id": "30cfbd8.db7ed42",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 275.5,
-        "y": 360,
-        "z": "fd6341d7.d80b3",
+        "x": 343.00946044921875,
+        "y": 390.7166624069214,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "60962f66.88821",
-                "616349b4.624558",
-                "4ec77896.6688b8",
-                "f1e1cc05.18be2",
-                "e639fab2.57e918",
-                "2b88b50f.6d1f2a"
+                "5a0a00ba.7c221",
+                "21047af0.e45596",
+                "acfa1fdd.4f126",
+                "af71a4c0.67cbc8",
+                "15d56a2d.a7cc46",
+                "5666351c.3fed7c",
+                "1d36fe9a.5fdc81"
             ]
         ]
     },
     {
-        "id": "60962f66.88821",
+        "id": "5a0a00ba.7c221",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n<parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />\n<parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 545.9999771118164,
-        "y": 32.61667013168335,
-        "z": "fd6341d7.d80b3",
+        "x": 605.1761093139648,
+        "y": 20,
+        "z": "23113e64.4c4872",
         "wires": [
             []
         ]
     },
     {
-        "id": "616349b4.624558",
+        "id": "21047af0.e45596",
         "type": "get-resource",
         "name": "get resources from DB -controller_id",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom REQUEST_DETAILS\nWHERE request_id = $optical-service-delete-input.request-id'\npfx='detail-db'>",
         "comments": "",
         "outputs": 1,
-        "x": 659.4999542236328,
-        "y": 126.9999942779541,
-        "z": "fd6341d7.d80b3",
+        "x": 718.6760635375977,
+        "y": 112.71665000915527,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "b9be5065.25db9"
+                "63804231.b88b9c"
             ]
         ]
     },
     {
-        "id": "b9be5065.25db9",
+        "id": "63804231.b88b9c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 887.0000114440918,
-        "y": 118.9999942779541,
-        "z": "fd6341d7.d80b3",
+        "x": 946.1761436462402,
+        "y": 106.38332414627075,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "1b12f198.60face"
+                "e6431c0d.bb995"
             ]
         ]
     },
     {
-        "id": "4ec77896.6688b8",
+        "id": "acfa1fdd.4f126",
         "type": "set",
         "name": "set domain-services",
-        "xml": "<set>\n<parameter name='notification-url' value=\"http://167.254.204.152:31817/asyncNotification\" />\n<parameter name='domain-service1' value='`$param-prefix1[0]`' />\n<parameter name='domain-service2' value='`$param-prefix1[1]`' />",
+        "xml": "<set>\n<parameter name='notification-url' value=\"notificationUrl\" />\n<parameter name='access-status' value=\"success\" />\n",
         "comments": "",
-        "x": 668.4999465942383,
-        "y": 236.00000381469727,
-        "z": "fd6341d7.d80b3",
+        "x": 731.0093307495117,
+        "y": 228.3833179473877,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "f1e1cc05.18be2",
+        "id": "af71a4c0.67cbc8",
         "type": "execute",
         "name": "split domain-requests for access services",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$domain-req`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 704.6166534423828,
-        "y": 188.61665606498718,
-        "z": "fd6341d7.d80b3",
+        "x": 763.7928161621094,
+        "y": 172.66664695739746,
+        "z": "23113e64.4c4872",
         "wires": [
             []
         ]
     },
     {
-        "id": "e639fab2.57e918",
+        "id": "15d56a2d.a7cc46",
         "type": "for",
         "name": "for",
         "xml": "<for index='ppx' start='0' end='`$param-prefix1_length`' >\n    \n    \n    \n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 527.5,
-        "y": 354.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 591.6760711669922,
+        "y": 374.8332996368408,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "623884ec.5f3a8c"
+                "85a69e7e.7e74e"
             ]
         ]
     },
     {
-        "id": "623884ec.5f3a8c",
+        "id": "85a69e7e.7e74e",
         "type": "switchNode",
         "name": "switch",
-        "xml": "<switch test='`$param-prefix1_length`'>\n",
+        "xml": "<switch test='`$param-prefix1_length == 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 681.5,
-        "y": 352.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 740.6761322021484,
+        "y": 339.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "d5d414a3.d47da8",
-                "b4f97507.a007b8"
+                "31b9f2de.b5872e",
+                "e0aaa8d0.545478"
             ]
         ]
     },
     {
-        "id": "d5d414a3.d47da8",
-        "type": "outcome",
-        "name": "1",
-        "xml": "<outcome value='1'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 864.5,
-        "y": 346.1166687011719,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            [
-                "e287faaa.f3da48"
-            ]
-        ]
-    },
-    {
-        "id": "e287faaa.f3da48",
+        "id": "caa8b5a3.b36418",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1033.5,
-        "y": 346.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1092.6761322021484,
+        "y": 333.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "ee746443.f75118",
-                "7b7f945a.86e22c",
-                "97c1a1ae.42a57",
-                "f357d481.8e4f58"
+                "91ecfc44.f143a",
+                "719feef2.99781",
+                "238c69d1.2b6de6",
+                "c2baf636.474808"
             ]
         ]
     },
     {
-        "id": "b4f97507.a007b8",
-        "type": "outcome",
-        "name": "2",
-        "xml": "<outcome value='2'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 614.5,
-        "y": 783.1166687011719,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            [
-                "f4eb142b.f563f8"
-            ]
-        ]
-    },
-    {
-        "id": "7b7f945a.86e22c",
+        "id": "719feef2.99781",
         "type": "execute",
         "name": "split node-id a-end retrieved from DB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller-id1`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1305.5,
-        "y": 351.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1364.6761322021484,
+        "y": 338.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             []
         ]
     },
     {
-        "id": "ee746443.f75118",
+        "id": "91ecfc44.f143a",
         "type": "get-resource",
         "name": "get resources from DB -controller_id",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom REQUEST_DETAILS\nWHERE request_id = $domain-service1'\npfx='detail-db1'>",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom REQUEST_DETAILS\nWHERE request_id = $param-prefix1[$ppx]'\npfx='detail-db1'>",
         "comments": "",
         "outputs": 1,
-        "x": 1309.61669921875,
-        "y": 311.23333740234375,
-        "z": "fd6341d7.d80b3",
+        "x": 1368.7925567626953,
+        "y": 288.6166639328003,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "657a4de1.7e7434"
+                "319883a4.a6298c"
             ]
         ]
     },
     {
-        "id": "657a4de1.7e7434",
+        "id": "319883a4.a6298c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1554.61669921875,
-        "y": 310.23333740234375,
-        "z": "fd6341d7.d80b3",
+        "x": 1613.7928314208984,
+        "y": 297.6166672706604,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "2456ff5f.8ccfc"
+                "fa33f2b4.9586d"
             ]
         ]
     },
     {
-        "id": "2456ff5f.8ccfc",
+        "id": "fa33f2b4.9586d",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='controller-id1' value='`$detail-db1.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1702.61669921875,
-        "y": 312.23333740234375,
-        "z": "fd6341d7.d80b3",
+        "x": 1761.7928314208984,
+        "y": 299.6166672706604,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "97c1a1ae.42a57",
+        "id": "238c69d1.2b6de6",
         "type": "set",
         "name": "set domain-services",
-        "xml": "<set>\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`\"/>",
+        "xml": "<set>\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='optical-service-delete-input.request-id' value=\"`$param-prefix1[$ppx]`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`\"/>\n<parameter name='domain-service1' value=\"`$param-prefix1[$ppx]`\" />\n",
         "comments": "",
-        "x": 1257.61669921875,
-        "y": 423.23333740234375,
-        "z": "fd6341d7.d80b3",
+        "x": 1311.7928314208984,
+        "y": 410.6166763305664,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "f357d481.8e4f58",
+        "id": "c2baf636.474808",
         "type": "switchNode",
         "name": "switch domain-type",
         "xml": "<switch test='`$domain-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1246.5,
-        "y": 558.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1252.3428115844727,
+        "y": 543.8333339691162,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "fccd0b30.b9cbc8",
-                "bef3609.dfed5a"
+                "c3c51e46.241cf",
+                "409a0484.8b3eec"
             ]
         ]
     },
     {
-        "id": "fccd0b30.b9cbc8",
+        "id": "c3c51e46.241cf",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1449.5,
-        "y": 469.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1508.6761322021484,
+        "y": 456.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "a299e8ab.d4c218"
+                "f8fc18f7.4d8af8"
             ]
         ]
     },
     {
-        "id": "bef3609.dfed5a",
+        "id": "409a0484.8b3eec",
         "type": "outcome",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1452.5,
-        "y": 649.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1511.6761322021484,
+        "y": 636.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "6037d29.154702c"
+                "cae5e210.d6395"
             ]
         ]
     },
     {
-        "id": "a299e8ab.d4c218",
+        "id": "f8fc18f7.4d8af8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1589.5,
-        "y": 466.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1648.6761322021484,
+        "y": 453.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "11bafb72.872785"
+                "c176f2f2.5fee2"
             ]
         ]
     },
     {
-        "id": "11bafb72.872785",
+        "id": "c176f2f2.5fee2",
         "type": "call",
         "name": "call MSA DELETE DG",
         "xml": "<call module='optical-service' rpc='service-delete-msa' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1777.5,
-        "y": 467.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1836.6761322021484,
+        "y": 454.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "67a6d9a9.a380e8",
-                "b6015380.84934"
+                "e405e5bb.3a20a8",
+                "4df16ad1.b6ecc4"
             ]
         ]
     },
     {
-        "id": "67a6d9a9.a380e8",
+        "id": "e405e5bb.3a20a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1962.5,
-        "y": 423.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2021.6761322021484,
+        "y": 410.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "bea424de.48e7e8"
+                "8dfeea48.8664a8"
             ]
         ]
     },
     {
-        "id": "b6015380.84934",
+        "id": "4df16ad1.b6ecc4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1964.5,
-        "y": 515.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2023.6761322021484,
+        "y": 502.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "68e25a.54defda8"
+                "22cc809f.74d45"
             ]
         ]
     },
     {
-        "id": "bea424de.48e7e8",
+        "id": "8dfeea48.8664a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2133.5,
-        "y": 414.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2192.6761322021484,
+        "y": 401.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "92667335.f399b"
+                "e0798c41.0c606"
             ]
         ]
     },
     {
-        "id": "92667335.f399b",
+        "id": "e0798c41.0c606",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",
         "comments": "",
-        "x": 2276.5,
-        "y": 389.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2335.6761322021484,
+        "y": 376.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "68e25a.54defda8",
+        "id": "22cc809f.74d45",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Failed to call MSA DG' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 2133.5,
-        "y": 545.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2192.6761322021484,
+        "y": 532.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "6037d29.154702c",
+        "id": "cae5e210.d6395",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1608.5,
-        "y": 651.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1667.6761322021484,
+        "y": 638.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "c1da415.e052fc"
+                "65305f1a.cd63"
             ]
         ]
     },
     {
-        "id": "c1da415.e052fc",
+        "id": "65305f1a.cd63",
         "type": "call",
         "name": "call TAPI DELETE DG",
         "xml": "<call module='optical-service' rpc='service-delete-tapi' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1796.5,
-        "y": 652.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1855.6761322021484,
+        "y": 639.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "c9ff3987.f9cc28",
-                "32a118e.8eb39e8"
+                "10cb997f.2c1b67",
+                "e32d2f8.8429fd"
             ]
         ]
     },
     {
-        "id": "c9ff3987.f9cc28",
+        "id": "10cb997f.2c1b67",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1981.5,
-        "y": 608.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2040.6761322021484,
+        "y": 595.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "d0a6dc35.167bc"
+                "6c6dbee5.bd866"
             ]
         ]
     },
     {
-        "id": "32a118e.8eb39e8",
+        "id": "e32d2f8.8429fd",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1983.5,
-        "y": 700.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2042.6761322021484,
+        "y": 687.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "f15af963.5b5418"
+                "22c2bd5a.04a492"
             ]
         ]
     },
     {
-        "id": "d0a6dc35.167bc",
+        "id": "6c6dbee5.bd866",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2152.5,
-        "y": 599.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2211.6761322021484,
+        "y": 586.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "905a5288.1d934",
-                "757c5587.8c047c"
+                "e23cf700.e51748",
+                "94cb4145.57c88"
             ]
         ]
     },
     {
-        "id": "905a5288.1d934",
+        "id": "e23cf700.e51748",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",
         "comments": "",
-        "x": 2295.5,
-        "y": 574.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2354.6761322021484,
+        "y": 561.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "f15af963.5b5418",
+        "id": "22c2bd5a.04a492",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Failed to call MSA DG' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 2152.5,
-        "y": 730.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2211.6761322021484,
+        "y": 717.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "e770f30c.f95fb",
+        "id": "ffbaf9e.fb0fb08",
         "type": "call",
         "name": "call TAPI DELETE DG",
         "xml": "<call module='optical-service' rpc='service-delete-tapi' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1298.5,
-        "y": 956.1166687011719,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            [
-                "279a4131.3c50fe",
-                "12daba39.e98ea6"
-            ]
-        ]
-    },
-    {
-        "id": "66eb021.82f40fc",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`\"/>\n<parameter name='domain-type' value='`$domain1[0]`' />\n<parameter name='controller-ip' value='`$domain1[1]`' />\n",
-        "comments": "",
-        "x": 1279.61669921875,
-        "y": 880.2334289550781,
-        "z": "fd6341d7.d80b3",
-        "wires": []
-    },
-    {
-        "id": "f4eb142b.f563f8",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$ppx`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 754.6167602539062,
-        "y": 788.2333679199219,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            [
-                "e9f6b436.fcdbc8",
-                "5bc45c8e.581fe4"
-            ]
-        ]
-    },
-    {
-        "id": "e9f6b436.fcdbc8",
-        "type": "outcome",
-        "name": "0",
-        "xml": "<outcome value='0'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 934.6167602539062,
-        "y": 788.2333679199219,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            [
-                "969523a9.6bb09"
-            ]
-        ]
-    },
-    {
-        "id": "5bc45c8e.581fe4",
-        "type": "outcome",
-        "name": "1",
-        "xml": "<outcome value='1'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 882.6167602539062,
-        "y": 1162.2333679199219,
-        "z": "fd6341d7.d80b3",
+        "x": 1357.6761322021484,
+        "y": 943.4999985694885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "293ec8e4.019748"
+                "d2fc4e32.19347"
             ]
         ]
     },
     {
-        "id": "8c2a8c7c.a451",
+        "id": "fca311a3.3788e",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service2`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`\"/>\n<parameter name='domain-type' value='`$domain2[0]`' />\n<parameter name='controller-ip' value='`$domain2[1]`' />\n\n\n",
+        "xml": "<set>\n<parameter name='optical-service-delete-input.request-id' value=\"`$param-prefix1[$ppx]`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`\"/>\n\n",
         "comments": "",
-        "x": 1277.61669921875,
-        "y": 1235.2333679199219,
-        "z": "fd6341d7.d80b3",
+        "x": 1338.7928314208984,
+        "y": 867.6167588233948,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "ce3eac33.d1ef7",
-        "type": "call",
-        "name": "call TAPI DELETE DG",
-        "xml": "<call module='optical-service' rpc='service-delete-tapi' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1284.61669921875,
-        "y": 1308.2333679199219,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            [
-                "c8833e1f.21b83",
-                "d3120001.a70e1"
-            ]
-        ]
-    },
-    {
-        "id": "969523a9.6bb09",
+        "id": "64b9ab4c.add954",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1074.61669921875,
-        "y": 789.2333679199219,
-        "z": "fd6341d7.d80b3",
+        "x": 1133.7928314208984,
+        "y": 776.6166977882385,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "66eb021.82f40fc",
-                "e770f30c.f95fb",
-                "54b2f238.cd48bc",
-                "71435f69.1d588"
+                "fca311a3.3788e",
+                "ffbaf9e.fb0fb08",
+                "7dcb69ce.f66178",
+                "ac94d58e.2025e8"
             ]
         ]
     },
     {
-        "id": "293ec8e4.019748",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1008.6167602539062,
-        "y": 1171.2333679199219,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            [
-                "8c2a8c7c.a451",
-                "ce3eac33.d1ef7",
-                "a41e1354.f17a4",
-                "402c6221.29fbfc"
-            ]
-        ]
-    },
-    {
-        "id": "279a4131.3c50fe",
+        "id": "d2fc4e32.19347",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1559.5,
-        "y": 909.1166687011719,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            [
-                "41399ce9.b1c0e4"
-            ]
-        ]
-    },
-    {
-        "id": "12daba39.e98ea6",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1543.5,
-        "y": 1038.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1557.009506225586,
+        "y": 939.8333444595337,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "1b2c47f4.41a498"
+                "b1d14962.f347a8"
             ]
         ]
     },
     {
-        "id": "41399ce9.b1c0e4",
+        "id": "b1d14962.f347a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1715.5,
-        "y": 916.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1733.0094604492188,
+        "y": 940.1666679382324,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "c73df929.f6ae38",
-                "91dcae30.1f35"
+                "37bfc4a8.eaaf0c",
+                "3ecbb172.0c334e"
             ]
         ]
     },
     {
-        "id": "c73df929.f6ae38",
+        "id": "37bfc4a8.eaaf0c",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",
+        "xml": "<set>\n<parameter name='service-status' value='`$final-response-code`' />\n",
         "comments": "",
-        "x": 1882.4998779296875,
-        "y": 829.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1861.6761283874512,
+        "y": 873.1666774749756,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "91dcae30.1f35",
+        "id": "3ecbb172.0c334e",
         "type": "switchNode",
         "name": "switch",
-        "xml": "<switch test='`$service1-status == 200`'>\n",
+        "xml": "<switch test='`$service-status == 200`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1871.4998779296875,
-        "y": 946.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1860.6760368347168,
+        "y": 1001.8333568572998,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "a76b03e3.6d946",
-                "35234e07.f4ce22"
+                "421f5497.942c9c",
+                "686fcc2a.0dbf94"
             ]
         ]
     },
     {
-        "id": "a76b03e3.6d946",
+        "id": "421f5497.942c9c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2013.4998779296875,
-        "y": 876.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2021.0092849731445,
+        "y": 913.499981880188,
+        "z": "23113e64.4c4872",
         "wires": [
-            [
-                "3e585958.e262c6"
-            ]
+            []
         ]
     },
     {
-        "id": "35234e07.f4ce22",
+        "id": "686fcc2a.0dbf94",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2014.5,
-        "y": 994.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2013.676040649414,
+        "y": 1063.1666793823242,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "dcda07af.655078"
+                "f3e4a24a.52e36"
             ]
         ]
     },
     {
-        "id": "3e585958.e262c6",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='service1' value='success' />\n",
-        "comments": "",
-        "x": 2168.5,
-        "y": 882.1166687011719,
-        "z": "fd6341d7.d80b3",
-        "wires": []
-    },
-    {
-        "id": "dcda07af.655078",
+        "id": "f3e4a24a.52e36",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='service1' value='failure' />\n",
+        "xml": "<set>\n<parameter name='access-status' value='failure' />\n",
         "comments": "",
-        "x": 2181.5,
-        "y": 992.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2197.3425827026367,
+        "y": 1064.4999742507935,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "1b2c47f4.41a498",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Main Delete Dg not available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
-        "comments": "",
-        "x": 1715.5,
-        "y": 1039.1166687011719,
-        "z": "fd6341d7.d80b3",
-        "wires": []
-    },
-    {
-        "id": "c8833e1f.21b83",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "94cb4145.57c88",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-delete-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$service1-status`\"/>\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1526.5,
-        "y": 1232.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 2349.5262298583984,
+        "y": 636.349974155426,
+        "z": "23113e64.4c4872",
         "wires": [
-            [
-                "48e846a7.aa0238"
-            ]
+            []
         ]
     },
     {
-        "id": "d3120001.a70e1",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "5666351c.3fed7c",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$ppx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1533.5,
-        "y": 1371.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 408.20947647094727,
+        "y": 1499.1498394012451,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "6f442ba4.a9bd94"
+                "178292af.b017ad",
+                "791b18b2.1028c8"
             ]
         ]
     },
     {
-        "id": "48e846a7.aa0238",
+        "id": "3314378c.27c9e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1681.5,
-        "y": 1240.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 783.0761566162109,
+        "y": 1405.8999619483948,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "e50cb4fe.0872a8",
-                "d3d1dcfc.971ef"
+                "155d72bc.d68edd"
             ]
         ]
     },
     {
-        "id": "e50cb4fe.0872a8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='service2-status' value='`$final-response-code`' />\n",
-        "comments": "",
-        "x": 1877.5,
-        "y": 1155.1166687011719,
-        "z": "fd6341d7.d80b3",
-        "wires": []
-    },
-    {
-        "id": "d3d1dcfc.971ef",
+        "id": "155d72bc.d68edd",
         "type": "switchNode",
         "name": "switch",
-        "xml": "<switch test='`$service2-status == 200`'>\n",
+        "xml": "<switch test='`$service1-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1858.5,
-        "y": 1280.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 925.4261322021484,
+        "y": 1411.0999131202698,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "c12b59f0.2b2a08",
-                "1e2be21a.84b09e"
+                "d2a2c499.44f5d8",
+                "7b86389e.6c7b68"
             ]
         ]
     },
     {
-        "id": "c12b59f0.2b2a08",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "b3c2e52b.63a388",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2020.5,
-        "y": 1205.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1260.4261322021484,
+        "y": 1353.2999863624573,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "8a03b0aa.7cc6"
+                "79f9a1bf.52d0f",
+                "e7d0e65b.efbea8"
             ]
         ]
     },
     {
-        "id": "1e2be21a.84b09e",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "79f9a1bf.52d0f",
+        "type": "delete",
+        "name": "delete",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id\"> ",
         "comments": "",
         "outputs": 1,
-        "x": 2026.5,
-        "y": 1327.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1426.092716217041,
+        "y": 1348.6333484649658,
+        "z": "23113e64.4c4872",
         "wires": [
-            [
-                "374b4547.8f703a"
-            ]
+            []
         ]
     },
     {
-        "id": "8a03b0aa.7cc6",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='service2' value='success' />\n",
-        "comments": "",
-        "x": 2175.5,
-        "y": 1208.1166687011719,
-        "z": "fd6341d7.d80b3",
-        "wires": []
-    },
-    {
-        "id": "374b4547.8f703a",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='service2' value='failure' />\n",
-        "comments": "",
-        "x": 2188.5,
-        "y": 1330.1166687011719,
-        "z": "fd6341d7.d80b3",
-        "wires": []
-    },
-    {
-        "id": "6f442ba4.a9bd94",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Main Delete Dg not available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "id": "e7d0e65b.efbea8",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"Service Deleted Successfully\" />\n<parameter name='ack-final-indicator' value='Y' />",
         "comments": "",
-        "x": 1734.5,
-        "y": 1371.1166687011719,
-        "z": "fd6341d7.d80b3",
+        "x": 1466.4261322021484,
+        "y": 1534.3001084327698,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "757c5587.8c047c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-delete-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$service1-status`\"/>\n\n\n\n\n\n",
+        "id": "d2a2c499.44f5d8",
+        "type": "outcome",
+        "name": "200",
+        "xml": "<outcome value='200'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2290.35009765625,
-        "y": 648.9666442871094,
-        "z": "fd6341d7.d80b3",
+        "x": 1098.8760833740234,
+        "y": 1360.7499375343323,
+        "z": "23113e64.4c4872",
         "wires": [
-            []
+            [
+                "b3c2e52b.63a388"
+            ]
         ]
     },
     {
-        "id": "2b88b50f.6d1f2a",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$ppx`'>\n",
+        "id": "7b86389e.6c7b68",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 345.70001220703125,
-        "y": 1511.7665710449219,
-        "z": "fd6341d7.d80b3",
+        "x": 1075.8760833740234,
+        "y": 1512.7499375343323,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "67345bfe.f921b4",
-                "e5284e9a.754bb"
+                "c68df7b5.0b81e8"
             ]
         ]
     },
     {
-        "id": "67345bfe.f921b4",
-        "type": "outcome",
-        "name": "0",
-        "xml": "<outcome value='0'>\n",
+        "id": "e0ffad7.48b955",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Access service request entry cannot be deleted' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
+        "comments": "",
+        "x": 1254.1761322021484,
+        "y": 1524.8998398780823,
+        "z": "23113e64.4c4872",
+        "wires": []
+    },
+    {
+        "id": "7dcb69ce.f66178",
+        "type": "get-resource",
+        "name": "get resources from DB -controller_id",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom REQUEST_DETAILS\nWHERE request_id = $param-prefix1[$ppx]'\npfx='detail-db11'>",
         "comments": "",
         "outputs": 1,
-        "x": 581.9000549316406,
-        "y": 1414.5166320800781,
-        "z": "fd6341d7.d80b3",
+        "x": 1420.342758178711,
+        "y": 733.166624546051,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "ae809859.8b1778"
+                "1aabb5e8.22157a"
             ]
         ]
     },
     {
-        "id": "e5284e9a.754bb",
-        "type": "outcome",
-        "name": "1",
-        "xml": "<outcome value='1'>\n",
+        "id": "1aabb5e8.22157a",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 572.9000549316406,
-        "y": 1587.5165710449219,
-        "z": "fd6341d7.d80b3",
+        "x": 1666.342758178711,
+        "y": 737.166624546051,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "7df23ffd.b4b17"
+                "70d90830.02f658"
             ]
         ]
     },
     {
-        "id": "ae809859.8b1778",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "70d90830.02f658",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='controller-id11' value='`$detail-db11.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",
+        "comments": "",
+        "x": 1834.342758178711,
+        "y": 739.166624546051,
+        "z": "23113e64.4c4872",
+        "wires": []
+    },
+    {
+        "id": "ac94d58e.2025e8",
+        "type": "execute",
+        "name": "split node-id a-end retrieved from DB",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller-id11`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"domain1\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 723.9000244140625,
-        "y": 1418.5166320800781,
-        "z": "fd6341d7.d80b3",
+        "x": 1441.342758178711,
+        "y": 809.166624546051,
+        "z": "23113e64.4c4872",
         "wires": [
-            [
-                "c1901914.b04438"
-            ]
+            []
         ]
     },
     {
-        "id": "c1901914.b04438",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$service1-status`'>\n",
+        "id": "8fd18db8.4cb08",
+        "type": "update",
+        "name": "update",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\nkey = 'pnf.pnf-name = $a-end-pnf-name\n      AND p-interface.interface-name = $optical-service-create-input.payload.service-aend.port-id'\n      local-only='false'>\n<parameter name='available-capacity' value='`$available-bandwidth-aend`' />\n\n\n\n<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'\nkey='logical-link.link-name = $tmp.link-id' >\n    <parameter name='link-name' value='`$tmp.link-id`' />\n    <parameter name='link-type' value='`$link.link-type`' />\n    <parameter name='in-maint' value='true' />\n    <parameter name='speed-value' value='100' />\n    <parameter name='speed-units' value='Gbps' />\n    <parameter name='operational-status' value='`$link.administrative-state`' />\n    <parameter name='available-capacity' value='100' />\n\n\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 866.25,
-        "y": 1423.7165832519531,
-        "z": "fd6341d7.d80b3",
+        "x": 1461.3428039550781,
+        "y": 1438.1666703224182,
+        "z": "23113e64.4c4872",
         "wires": [
-            [
-                "d5045cc6.1de7a",
-                "2beb7d55.e9c492"
-            ]
+            []
         ]
     },
     {
-        "id": "3b5e2ea9.61d282",
+        "id": "c68df7b5.0b81e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1201.25,
-        "y": 1365.9166564941406,
-        "z": "fd6341d7.d80b3",
+        "x": 1173.009506225586,
+        "y": 1465.8331894874573,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "e398c832.c96cf8",
-                "5465b919.f201f8"
+                "e0ffad7.48b955"
             ]
         ]
     },
     {
-        "id": "e398c832.c96cf8",
-        "type": "delete",
-        "name": "delete",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id\"> ",
-        "comments": "",
-        "outputs": 1,
-        "x": 1365.25,
-        "y": 1362.9167785644531,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5465b919.f201f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"Service Deleted Successfully\" />\n<parameter name='ack-final-indicator' value='Y' />",
+        "id": "e6431c0d.bb995",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='domain-req' value='`$detail-db.domain-requests`' />\n<parameter name='delete-acc-svc-id' value='`$detail-db.service-instance-id`' />\n<parameter name='access-id' value='`$optical-service-delete-input.request-id`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1407.25,
-        "y": 1546.9167785644531,
-        "z": "fd6341d7.d80b3",
+        "x": 1109.1761474609375,
+        "y": 119.88333177566528,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "d5045cc6.1de7a",
-        "type": "outcome",
-        "name": "200",
-        "xml": "<outcome value='200'>\n",
+        "id": "31b9f2de.b5872e",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1039.699951171875,
-        "y": 1373.3666076660156,
-        "z": "fd6341d7.d80b3",
+        "x": 906.6761627197266,
+        "y": 324.85795402526855,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "3b5e2ea9.61d282"
+                "caa8b5a3.b36418"
             ]
         ]
     },
     {
-        "id": "2beb7d55.e9c492",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "e0aaa8d0.545478",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1016.699951171875,
-        "y": 1525.3666076660156,
-        "z": "fd6341d7.d80b3",
+        "x": 853.3427200317383,
+        "y": 773.1913871765137,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "887f6ab3.6fe378"
+                "64b9ab4c.add954"
             ]
         ]
     },
     {
-        "id": "efea6422.1a8b28",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$service1-status == $service2-status == 200`'>\n",
+        "id": "178292af.b017ad",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 841.25,
-        "y": 1594.7165222167969,
-        "z": "fd6341d7.d80b3",
+        "x": 515.0094858805338,
+        "y": 1440.6155522664385,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "cad7c61d.e2a2d8",
-                "4a80a00e.4cc7a"
+                "3314378c.27c9e8"
             ]
         ]
     },
     {
-        "id": "cad7c61d.e2a2d8",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "791b18b2.1028c8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 999.25,
-        "y": 1603.7165222167969,
-        "z": "fd6341d7.d80b3",
+        "x": 521.6761341094971,
+        "y": 1642.2822799682617,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "bb726b3c.e444e8"
+                "ccbb9a05.8b09d8"
             ]
         ]
     },
     {
-        "id": "bb726b3c.e444e8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "ccbb9a05.8b09d8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$access-status == success`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1139.25,
-        "y": 1610.7165222167969,
-        "z": "fd6341d7.d80b3",
+        "x": 741.6760864257812,
+        "y": 1670.7669677734375,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "f739490d.428058",
-                "b63b3bcb.e95608",
-                "fe0c4836.3d8508",
-                "58672708.482528",
-                "64dca83a.79a788",
-                "d26a3044.53ce7"
+                "2c873361.6b8cec",
+                "29ad4b93.f97874"
             ]
         ]
     },
     {
-        "id": "f739490d.428058",
-        "type": "delete",
-        "name": "delete",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id\"> ",
+        "id": "2c873361.6b8cec",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1303.25,
-        "y": 1610.7165222167969,
-        "z": "fd6341d7.d80b3",
+        "x": 898.3426628112793,
+        "y": 1609.4031372070312,
+        "z": "23113e64.4c4872",
         "wires": [
-            []
+            [
+                "abeb4b39.e29ad8"
+            ]
         ]
     },
     {
-        "id": "4a80a00e.4cc7a",
+        "id": "29ad4b93.f97874",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 949.7500152587891,
-        "y": 1965.7165794372559,
-        "z": "fd6341d7.d80b3",
+        "x": 898.3426780700684,
+        "y": 1771.069803237915,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "fa9da88e.4da0d8"
+                "b59bb9d9.ea7ce8"
             ]
         ]
     },
     {
-        "id": "fa9da88e.4da0d8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "6ec4d0d8.6e90a",
+        "type": "delete",
+        "name": "delete",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id\"> ",
         "comments": "",
         "outputs": 1,
-        "x": 1098.750015258789,
-        "y": 1963.7165794372559,
-        "z": "fd6341d7.d80b3",
+        "x": 1174.5549240112305,
+        "y": 1607.4334983825684,
+        "z": "23113e64.4c4872",
         "wires": [
-            [
-                "a9697233.3edb9"
-            ]
+            []
         ]
     },
     {
-        "id": "a9697233.3edb9",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Access service request entry cannot be deleted' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
-        "comments": "",
-        "x": 1276.2500228881836,
-        "y": 1964.2165832519531,
-        "z": "fd6341d7.d80b3",
-        "wires": []
-    },
-    {
-        "id": "b63b3bcb.e95608",
+        "id": "61f3204d.d33e2",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"Service Deleted Successfully\" />\n<parameter name='ack-final-indicator' value='Y' />",
         "comments": "",
-        "x": 1271.2500228881836,
-        "y": 1889.2165803909302,
-        "z": "fd6341d7.d80b3",
-        "wires": []
-    },
-    {
-        "id": "35501454.cf543c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Access service request entry cannot be deleted' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
-        "comments": "",
-        "x": 1195,
-        "y": 1537.5165100097656,
-        "z": "fd6341d7.d80b3",
+        "x": 1704.2214965820312,
+        "y": 1844.2668190002441,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "7df23ffd.b4b17",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 719.9000244140625,
-        "y": 1588.5165710449219,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            [
-                "efea6422.1a8b28"
-            ]
-        ]
-    },
-    {
-        "id": "54b2f238.cd48bc",
+        "id": "a47c2756.f32468",
         "type": "get-resource",
-        "name": "get resources from DB -controller_id",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom REQUEST_DETAILS\nWHERE request_id = $domain-service1'\npfx='detail-db11'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1361.1666259765625,
-        "y": 745.7832946777344,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            [
-                "ba13f726.ec48a8"
-            ]
-        ]
-    },
-    {
-        "id": "ba13f726.ec48a8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "name": "Get service from AAI",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\n key='customer.global-customer-id = $output.global-customer-id AND\n     service-subscription.service-type = $output.service-type AND\n     service-instance.service-instance-id = $delete-acc-svc-id' \npfx='acc-serv-dl'      local-only='false'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1607.1666259765625,
-        "y": 749.7832946777344,
-        "z": "fd6341d7.d80b3",
+        "x": 1212.971118927002,
+        "y": 1682.550464630127,
+        "z": "23113e64.4c4872",
         "wires": [
-            [
-                "7f178723.eed2f8"
-            ]
+            []
         ]
     },
     {
-        "id": "7f178723.eed2f8",
+        "id": "9f2294b5.bcbfe8",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='controller-id11' value='`$detail-db11.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",
+        "xml": "<set>\n<parameter name='link-name' value='`$acc-serv-dl.relationship-list.relationship[$idl].relationship-data[0].relationship-value`' />\n",
         "comments": "",
-        "x": 1775.1666259765625,
-        "y": 751.7832946777344,
-        "z": "fd6341d7.d80b3",
+        "x": 1665.4713287353516,
+        "y": 1665.0501899719238,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "71435f69.1d588",
-        "type": "execute",
-        "name": "split node-id a-end retrieved from DB",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller-id11`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"domain1\"/>\n",
+        "id": "a80e8726.f84408",
+        "type": "update",
+        "name": "update logical-link-status AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\n     key='logical-link.link-name = $link-name '\n      local-only='false'>\n<parameter name='operational-status' value='up' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
         "comments": "",
         "outputs": 1,
-        "x": 1382.1666259765625,
-        "y": 821.7832946777344,
-        "z": "fd6341d7.d80b3",
+        "x": 1768.8047256469727,
+        "y": 1759.2170295715332,
+        "z": "23113e64.4c4872",
         "wires": [
             []
         ]
     },
     {
-        "id": "a41e1354.f17a4",
-        "type": "get-resource",
-        "name": "get resources from DB -controller_id",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom REQUEST_DETAILS\nWHERE request_id = $domain-service2'\npfx='detail-db22'>",
+        "id": "abeb4b39.e29ad8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1308.1666259765625,
-        "y": 1121.7834167480469,
-        "z": "fd6341d7.d80b3",
+        "x": 1022.8881912231445,
+        "y": 1610.7668838500977,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "20c8cbec.0b11d4"
+                "6ec4d0d8.6e90a",
+                "a47c2756.f32468",
+                "98787f37.a2ed6"
             ]
         ]
     },
     {
-        "id": "20c8cbec.0b11d4",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "98787f37.a2ed6",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idl' start='0' end='`$acc-serv-dl.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1553.1666259765625,
-        "y": 1125.7834167480469,
-        "z": "fd6341d7.d80b3",
+        "x": 1112.8882637023926,
+        "y": 1737.4336795806885,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "70d195e8.9d4ccc"
+                "e4e22bae.fd2a68"
             ]
         ]
     },
     {
-        "id": "70d195e8.9d4ccc",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='controller-id22' value='`$detail-db22.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",
-        "comments": "",
-        "x": 1702.1666259765625,
-        "y": 1129.7834167480469,
-        "z": "fd6341d7.d80b3",
-        "wires": []
-    },
-    {
-        "id": "402c6221.29fbfc",
-        "type": "execute",
-        "name": "split node-id a-end retrieved from DB",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller-id22`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"domain2\"/>\n",
+        "id": "e4e22bae.fd2a68",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$acc-serv-dl.relationship-list.relationship[$idl].related-to == 'logical-link'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1311.1666259765625,
-        "y": 1183.7834167480469,
-        "z": "fd6341d7.d80b3",
+        "x": 1256.221492767334,
+        "y": 1730.6154251098633,
+        "z": "23113e64.4c4872",
         "wires": [
-            []
+            [
+                "55e7e053.a52d9"
+            ]
         ]
     },
     {
-        "id": "912f5144.144e7",
-        "type": "update",
-        "name": "update",
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\nkey = 'pnf.pnf-name = $a-end-pnf-name\n      AND p-interface.interface-name = $optical-service-create-input.payload.service-aend.port-id'\n      local-only='false'>\n<parameter name='available-capacity' value='`$available-bandwidth-aend`' />\n\n\n\n<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'\nkey='logical-link.link-name = $tmp.link-id' >\n    <parameter name='link-name' value='`$tmp.link-id`' />\n    <parameter name='link-type' value='`$link.link-type`' />\n    <parameter name='in-maint' value='true' />\n    <parameter name='speed-value' value='100' />\n    <parameter name='speed-units' value='Gbps' />\n    <parameter name='operational-status' value='`$link.administrative-state`' />\n    <parameter name='available-capacity' value='100' />\n\n\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n\n",
+        "id": "55e7e053.a52d9",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1402.1666717529297,
-        "y": 1450.7833404541016,
-        "z": "fd6341d7.d80b3",
+        "x": 1396.2214965820312,
+        "y": 1738.94873046875,
+        "z": "23113e64.4c4872",
         "wires": [
-            []
+            [
+                "cac797c.4727a68"
+            ]
         ]
     },
     {
-        "id": "887f6ab3.6fe378",
+        "id": "cac797c.4727a68",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1113.8333740234375,
-        "y": 1478.4498596191406,
-        "z": "fd6341d7.d80b3",
+        "x": 1531.2214965820312,
+        "y": 1740.6153564453125,
+        "z": "23113e64.4c4872",
         "wires": [
             [
-                "35501454.cf543c"
+                "9f2294b5.bcbfe8",
+                "a80e8726.f84408",
+                "61f3204d.d33e2"
             ]
         ]
     },
     {
-        "id": "fe0c4836.3d8508",
-        "type": "get-resource",
-        "name": "Get service from AAI",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\n key='customer.global-customer-id = $output.global-customer-id AND\n     service-subscription.service-type = $output.service-type AND\n     service-instance.service-instance-id = $delete-acc-svc-id' \npfx='acc-serv-dl'      local-only='false'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1350.0000190734863,
-        "y": 1747.5000267028809,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b127a64f.fc83e8",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1074.9999999999995,
-        "y": 1872.4999999999993,
-        "z": "fd6341d7.d80b3",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d26a3044.53ce7",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='link-name' value='`$acc-serv-dl.relationship-list.relationship[0].relationship-data[0].relationship-value`' />\n",
+        "id": "b59bb9d9.ea7ce8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Access service request entry cannot be deleted' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 1297.5000190734863,
-        "y": 1805.0000267028809,
-        "z": "fd6341d7.d80b3",
+        "x": 1071.2214965820312,
+        "y": 1808.7972412109375,
+        "z": "23113e64.4c4872",
         "wires": []
     },
     {
-        "id": "58672708.482528",
-        "type": "update",
-        "name": "update logical-link-status AAI",
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\n     key='logical-link.link-name = $link-name '\n      local-only='false'>\n<parameter name='operational-status' value='available' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",
+        "id": "1d36fe9a.5fdc81",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/new.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$domain-req`\"/>\n<parameter name=\"field2\" value=\"`$domain-service1`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1337.5,
-        "y": 1852.5,
-        "z": "fd6341d7.d80b3",
+        "x": 705.1609497070312,
+        "y": 265.00946044921875,
+        "z": "23113e64.4c4872",
         "wires": [
             []
         ]
     },
     {
-        "id": "1b12f198.60face",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='domain-req' value='`$detail-db.domain-requests`' />\n<parameter name='delete-acc-svc-id' value='`$detail-db.service-instance-id`' />\n\n\n\n\n\n\n\n\n\n\n\n",
-        "comments": "",
-        "x": 1050.000015258789,
-        "y": 132.50000190734863,
-        "z": "fd6341d7.d80b3",
-        "wires": []
-    },
-    {
-        "id": "64dca83a.79a788",
+        "id": "55028f82.4ab0c",
         "type": "record",
         "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`'domain rquest_' + $domain-requests`\"/>\n<parameter name=\"field2\" value=\"`'Access rquest_' + $as-request-id`\"/>\n\n",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/new.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Domain Details\"/>\n<parameter name=\"field2\" value=\"`$controller-ip`\"/>\n<parameter name=\"field3\" value=\"`$optical-service-delete-input.request-id`\"/>\n<parameter name=\"field4\" value=\"`$optical-service-delete-input.payload.service-name`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1525.0000228881836,
-        "y": 1630.0000247955322,
-        "z": "fd6341d7.d80b3",
+        "x": 1251.070011138916,
+        "y": 486.6761064529419,
+        "z": "23113e64.4c4872",
         "wires": [
             []
         ]
diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json b/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json
index 22a17050..393c9e8a 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "f869c120.9a5e8",
+        "id": "96a5b969.30fca8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 121.5,
-        "y": 90,
-        "z": "3bd40398.0e17fc",
+        "x": 155.0094757080078,
+        "y": 95.00946807861328,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "8af1dc93.0e0da"
+                "1d5d884c.37fd58"
             ]
         ]
     },
     {
-        "id": "8af1dc93.0e0da",
+        "id": "1d5d884c.37fd58",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,692 +22,692 @@
         "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='optical-service' version='${project.version}'>",
         "outputs": 1,
-        "x": 134.5,
-        "y": 150,
-        "z": "3bd40398.0e17fc",
+        "x": 168.0094757080078,
+        "y": 155.00946807861328,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "b03df385.9b70c"
+                "5e65cfab.dd111"
             ]
         ]
     },
     {
-        "id": "b03df385.9b70c",
+        "id": "5e65cfab.dd111",
         "type": "method",
         "name": "method service-delete-tapi",
         "xml": "<method rpc='service-delete-tapi' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 154.5,
-        "y": 230,
-        "z": "3bd40398.0e17fc",
+        "x": 188.0094757080078,
+        "y": 235.00946807861328,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "dae9b3c0.70198"
+                "f4aad36f.30bf3"
             ]
         ]
     },
     {
-        "id": "dae9b3c0.70198",
+        "id": "f4aad36f.30bf3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 402,
-        "y": 230,
-        "z": "3bd40398.0e17fc",
+        "x": 435.5094757080078,
+        "y": 235.00946807861328,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "882993c6.73a42",
-                "9a7b4d91.dc0e5",
-                "fe5645b4.4896a8",
-                "361056c9.62d1aa",
-                "fcf7ae69.66bac",
-                "658b7b5f.7441e4",
-                "ca74a3e.de9376"
+                "baeb3a20.8dfc38",
+                "b7cdfff3.60956",
+                "26889205.8ed4ce",
+                "b25ded2.8528d1",
+                "1c70a864.9f7418",
+                "736dbac8.fe21e4",
+                "fac7a5ef.c80558"
             ]
         ]
     },
     {
-        "id": "882993c6.73a42",
+        "id": "baeb3a20.8dfc38",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside optical service delete tapi\"/>\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 498.5,
-        "y": 53,
-        "z": "3bd40398.0e17fc",
+        "x": 532.0094757080078,
+        "y": 58.00946807861328,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "9a7b4d91.dc0e5",
+        "id": "b7cdfff3.60956",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='request-id' value='`$optical-service-delete-input.request-id`' />\n",
         "comments": "",
-        "x": 689.5000076293945,
-        "y": 37.00000190734863,
-        "z": "3bd40398.0e17fc",
+        "x": 724.6760940551758,
+        "y": 43.67613506317139,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "ca74a3e.de9376",
+        "id": "fac7a5ef.c80558",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.get.services.url + $service-name`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"services-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 575.4999465942383,
-        "y": 328.3888740539551,
-        "z": "3bd40398.0e17fc",
+        "x": 609.0094223022461,
+        "y": 333.39834213256836,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "63d373a2.41054c",
-                "5229271d.664468"
+                "7d0dfa0.f280408",
+                "c2e935ef.e4a2e8"
             ]
         ]
     },
     {
-        "id": "bfa60c53.34db1",
+        "id": "32ea3700.8daa7a",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-nep' value=\"`$services-response.service[0].end-point[0].connection-end-point[0].node-edge-point-uuid`\" />\n<parameter name='zend-nep' value=\"`$services-response.service[0].end-point[1].connection-end-point[0].node-edge-point-uuid`\" />\n<parameter name='aend-cep' value=\"`$services-response.service[0].end-point[0].connection-end-point[0].connection-end-point-uuid`\" />\n<parameter name='zend-cep' value=\"`$services-response.service[0].end-point[1].connection-end-point[0].connection-end-point-uuid`\" />\n",
         "comments": "",
-        "x": 1332.7221870422363,
-        "y": 97.55551338195801,
-        "z": "3bd40398.0e17fc",
+        "x": 1366.2316627502441,
+        "y": 102.56498146057129,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "63d373a2.41054c",
+        "id": "7d0dfa0.f280408",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 793.8332633972168,
-        "y": 285.33330154418945,
-        "z": "3bd40398.0e17fc",
+        "x": 827.3427391052246,
+        "y": 290.34276962280273,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "5229271d.664468",
+        "id": "c2e935ef.e4a2e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 777.9998893737793,
-        "y": 377.55554580688477,
-        "z": "3bd40398.0e17fc",
+        "x": 811.5093650817871,
+        "y": 382.56501388549805,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "aa57e737.b0fed8"
+                "32f937f0.4e8528"
             ]
         ]
     },
     {
-        "id": "aa57e737.b0fed8",
+        "id": "32f937f0.4e8528",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 981.0554733276367,
-        "y": 303.6666831970215,
-        "z": "3bd40398.0e17fc",
+        "x": 1014.5649490356445,
+        "y": 308.67615127563477,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "bfa60c53.34db1",
-                "863b12fd.05227",
-                "b8f3f329.852df",
-                "dbf2f1d6.f28c4"
+                "32ea3700.8daa7a",
+                "885424f1.0069b8",
+                "54c031dd.863f3",
+                "de1cabdc.96bb48"
             ]
         ]
     },
     {
-        "id": "863b12fd.05227",
+        "id": "885424f1.0069b8",
         "type": "get-resource",
         "name": "get-resource",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $aend-nep'\npfx='db-aend'>",
         "comments": "",
         "outputs": 1,
-        "x": 1363.5556869506836,
-        "y": 152.27777290344238,
-        "z": "3bd40398.0e17fc",
+        "x": 1397.0651626586914,
+        "y": 157.28724098205566,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "b8f3f329.852df",
+        "id": "54c031dd.863f3",
         "type": "get-resource",
         "name": "get-resource",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $zend-nep'\npfx='db-zend'>",
         "comments": "",
         "outputs": 1,
-        "x": 1366.055564880371,
-        "y": 209.2222318649292,
-        "z": "3bd40398.0e17fc",
+        "x": 1399.565040588379,
+        "y": 214.23169994354248,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "a6a0d931.29ae78",
+        "id": "b2aec0dc.c2c89",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value='`$aend-cep`' />\n",
         "comments": "",
-        "x": 1776.721923828125,
-        "y": 504.22216796875,
-        "z": "3bd40398.0e17fc",
+        "x": 1810.2313995361328,
+        "y": 509.2316360473633,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "96350f11.361f",
+        "id": "828818ca.4aad88",
         "type": "get-resource",
         "name": "find if aend is uni or nni or enni",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $db-aend.pnf-name AND\n     p-interface.interface-name = $aend-nep\"\npfx='aend'      local-only='false'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1564.6107177734375,
-        "y": 419.88885498046875,
-        "z": "3bd40398.0e17fc",
+        "x": 1598.1201934814453,
+        "y": 424.89832305908203,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "dbf2f1d6.f28c4",
+        "id": "de1cabdc.96bb48",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.delete.service.url + $service-name`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"tapi-service-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 1128.8331146240234,
-        "y": 371.44440746307373,
-        "z": "3bd40398.0e17fc",
+        "x": 1162.3425903320312,
+        "y": 376.453875541687,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "f321d77d.d8fcf8",
-                "21838287.92c3fe"
+                "cf272327.98557",
+                "adcf3c26.2cf95"
             ]
         ]
     },
     {
-        "id": "f321d77d.d8fcf8",
+        "id": "cf272327.98557",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1097.8331146240234,
-        "y": 513.4444074630737,
-        "z": "3bd40398.0e17fc",
+        "x": 1131.3425903320312,
+        "y": 518.453875541687,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "91f84772.c4f2c8"
+                "700524c3.0d43fc"
             ]
         ]
     },
     {
-        "id": "91f84772.c4f2c8",
+        "id": "700524c3.0d43fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1252.0553512573242,
-        "y": 467.666627407074,
-        "z": "3bd40398.0e17fc",
+        "x": 1285.564826965332,
+        "y": 472.67609548568726,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "96350f11.361f",
-                "fd9b7231.073dc",
-                "438c73c3.1e914c",
-                "f0125016.faa34",
-                "40bc2de7.03f354",
-                "db818283.160ff",
-                "f97e22d2.872f8",
-                "9544eb2a.40e488",
-                "91c2f578.c64f58"
+                "828818ca.4aad88",
+                "85389b8c.88a8e8",
+                "67825a8e.147714",
+                "abca3112.cebd3",
+                "ade690c3.af541",
+                "2a3f3874.b27468",
+                "897491a8.a70ea",
+                "61b774be.b66afc",
+                "45655a72.080ca4"
             ]
         ]
     },
     {
-        "id": "21838287.92c3fe",
+        "id": "adcf3c26.2cf95",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1255.4998016357422,
-        "y": 355.88880443573,
-        "z": "3bd40398.0e17fc",
+        "x": 1289.00927734375,
+        "y": 360.89827251434326,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "77e1cb8f.bccac4"
+                "5bce5b0c.ac8be4"
             ]
         ]
     },
     {
-        "id": "77e1cb8f.bccac4",
+        "id": "5bce5b0c.ac8be4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1422.4998016357422,
-        "y": 354.88880443573,
-        "z": "3bd40398.0e17fc",
+        "x": 1456.00927734375,
+        "y": 359.89827251434326,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "92f8a789.a292a8"
+                "18f011de.c92bae"
             ]
         ]
     },
     {
-        "id": "92f8a789.a292a8",
+        "id": "18f011de.c92bae",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Service Deletion failed' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 1590.3886985778809,
-        "y": 353.66657543182373,
-        "z": "3bd40398.0e17fc",
+        "x": 1623.8981742858887,
+        "y": 358.676043510437,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "fd9b7231.073dc",
+        "id": "85389b8c.88a8e8",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$aend.network-interface-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1486.6108856201172,
-        "y": 522.5554914474487,
-        "z": "3bd40398.0e17fc",
+        "x": 1520.120361328125,
+        "y": 527.564959526062,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "1a5628eb.513f87",
-                "b8eb04be.936ff8"
+                "644a8ff3.a04c3",
+                "45753948.c945e8"
             ]
         ]
     },
     {
-        "id": "1a5628eb.513f87",
+        "id": "644a8ff3.a04c3",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='UNI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1651.388671875,
-        "y": 504.22216796875,
-        "z": "3bd40398.0e17fc",
+        "x": 1684.8981475830078,
+        "y": 509.2316360473633,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "a6a0d931.29ae78"
+                "b2aec0dc.c2c89"
             ]
         ]
     },
     {
-        "id": "b8eb04be.936ff8",
+        "id": "45753948.c945e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1653.6108779907227,
-        "y": 577.5555419921875,
-        "z": "3bd40398.0e17fc",
+        "x": 1687.1203536987305,
+        "y": 582.5650100708008,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "54b37131.ec50b"
+                "7e74bb5.db6fd44"
             ]
         ]
     },
     {
-        "id": "438c73c3.1e914c",
+        "id": "67825a8e.147714",
         "type": "save",
         "name": "update pinterface cep DB Aend",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $aend-new WHERE interface_name = $aend-nep'\nforce='true' pfx='save-result'>",
         "comments": "",
         "outputs": 1,
-        "x": 1516.6108856201172,
-        "y": 620.3332624435425,
-        "z": "3bd40398.0e17fc",
+        "x": 1550.120361328125,
+        "y": 625.3427305221558,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "f0125016.faa34",
+        "id": "abca3112.cebd3",
         "type": "get-resource",
         "name": "find if zend is uni or nni or enni",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $db-zend.pnf-name AND\n     p-interface.interface-name = $zend-nep\"\npfx='zend'      local-only='false'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1493.2772598266602,
-        "y": 703.6665992736816,
-        "z": "3bd40398.0e17fc",
+        "x": 1526.786735534668,
+        "y": 708.6760673522949,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "40bc2de7.03f354",
+        "id": "ade690c3.af541",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$zend.network-interface-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1395.4998149871826,
-        "y": 772.55544090271,
-        "z": "3bd40398.0e17fc",
+        "x": 1429.0092906951904,
+        "y": 777.5649089813232,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "c35140e8.3b796",
-                "59a847b5.312e98"
+                "8e0c1510.b363d8",
+                "9ddd7d7c.d1f57"
             ]
         ]
     },
     {
-        "id": "c35140e8.3b796",
+        "id": "8e0c1510.b363d8",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='UNI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1585.8330764770508,
-        "y": 760.2221584320068,
-        "z": "3bd40398.0e17fc",
+        "x": 1619.3425521850586,
+        "y": 765.2316265106201,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "5f2dae98.203c3"
+                "c517caee.e227b8"
             ]
         ]
     },
     {
-        "id": "59a847b5.312e98",
+        "id": "9ddd7d7c.d1f57",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1588.0553359985352,
-        "y": 827.5555419921875,
-        "z": "3bd40398.0e17fc",
+        "x": 1621.564811706543,
+        "y": 832.5650100708008,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "135bc522.303b8b"
+                "7ea6e466.0c8b7c"
             ]
         ]
     },
     {
-        "id": "db818283.160ff",
+        "id": "2a3f3874.b27468",
         "type": "save",
         "name": "update pinterface cep DB Zend",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'\nforce='true' pfx='save-result'>",
         "comments": "",
         "outputs": 1,
-        "x": 1416.6112060546875,
-        "y": 866.9999141693115,
-        "z": "3bd40398.0e17fc",
+        "x": 1450.1206817626953,
+        "y": 872.0093822479248,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf13929a.a5198",
+        "id": "987b345f.99da18",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-cep`\" />\n",
         "comments": "",
-        "x": 1985.499885559082,
-        "y": 829.2221412658691,
-        "z": "3bd40398.0e17fc",
+        "x": 2019.0093612670898,
+        "y": 834.2316093444824,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "5f2dae98.203c3",
+        "id": "c517caee.e227b8",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value='`$zend-cep`' />\n",
         "comments": "",
-        "x": 1712.1664352416992,
-        "y": 759.2221622467041,
-        "z": "3bd40398.0e17fc",
+        "x": 1745.675910949707,
+        "y": 764.2316303253174,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "f97e22d2.872f8",
+        "id": "897491a8.a70ea",
         "type": "delete",
         "name": "delete service instance AAI",
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\nkey='customer.global-customer-id = $output.global-customer-id AND\nservice-subscription.service-type = $output.service-type AND\nservice-instance.service-instance-id = $output.service-instance-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1312.1664199829102,
-        "y": 981.4443254470825,
-        "z": "3bd40398.0e17fc",
+        "x": 1345.675895690918,
+        "y": 986.4537935256958,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "135bc522.303b8b",
+        "id": "7ea6e466.0c8b7c",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$db-zend.connection-point`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1729.9444444444443,
-        "y": 830.3333333333333,
-        "z": "3bd40398.0e17fc",
+        "x": 1763.4539201524522,
+        "y": 835.3428014119465,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "dda38169.1a96b",
-                "943fd023.cc6d9"
+                "999904dc.fc7cb8",
+                "adbee89.147ee18"
             ]
         ]
     },
     {
-        "id": "dda38169.1a96b",
+        "id": "999904dc.fc7cb8",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1857.7222061157227,
-        "y": 831.4444217681885,
-        "z": "3bd40398.0e17fc",
+        "x": 1891.2316818237305,
+        "y": 836.4538898468018,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "cf13929a.a5198"
+                "987b345f.99da18"
             ]
         ]
     },
     {
-        "id": "582c452e.50a00c",
+        "id": "d74d6061.0e996",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$db-zend.connection-point + ',' + $zend-cep`\" />\n",
         "comments": "",
-        "x": 1987.721981048584,
-        "y": 895.8887939453125,
-        "z": "3bd40398.0e17fc",
+        "x": 2021.2314567565918,
+        "y": 900.8982620239258,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "943fd023.cc6d9",
+        "id": "adbee89.147ee18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1869.9444444444443,
-        "y": 894.7777777777778,
-        "z": "3bd40398.0e17fc",
+        "x": 1903.4539201524522,
+        "y": 899.7872458563911,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "582c452e.50a00c"
+                "d74d6061.0e996"
             ]
         ]
     },
     {
-        "id": "54b37131.ec50b",
+        "id": "7e74bb5.db6fd44",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$db-aend.connection-point`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1781.0554428100586,
-        "y": 580.3333148956299,
-        "z": "3bd40398.0e17fc",
+        "x": 1814.5649185180664,
+        "y": 585.3427829742432,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "d7cb5d1f.868ba",
-                "b8aa01ad.10807"
+                "a505e3a1.91e69",
+                "1c74a938.614077"
             ]
         ]
     },
     {
-        "id": "cd72b99.aafe848",
+        "id": "7279e4ff.1814cc",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-cep`\" />\n",
         "comments": "",
-        "x": 2055.5,
-        "y": 569.22216796875,
-        "z": "3bd40398.0e17fc",
+        "x": 2089.009475708008,
+        "y": 574.2316360473633,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "d7cb5d1f.868ba",
+        "id": "a505e3a1.91e69",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1927.7223205566406,
-        "y": 571.4444484710693,
-        "z": "3bd40398.0e17fc",
+        "x": 1961.2317962646484,
+        "y": 576.4539165496826,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "cd72b99.aafe848"
+                "7279e4ff.1814cc"
             ]
         ]
     },
     {
-        "id": "b905fec4.7ac5f",
+        "id": "22cfd3ec.44ae6c",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value=\"`$db-aend.connection-point + ',' + $aend-cep`\" />\n",
         "comments": "",
-        "x": 2057.722095489502,
-        "y": 635.8888206481934,
-        "z": "3bd40398.0e17fc",
+        "x": 2091.2315711975098,
+        "y": 640.8982887268066,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "b8aa01ad.10807",
+        "id": "1c74a938.614077",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1939.9445588853623,
-        "y": 634.7778044806587,
-        "z": "3bd40398.0e17fc",
+        "x": 1973.4540345933701,
+        "y": 639.787272559272,
+        "z": "ae52800f.42b85",
         "wires": [
             [
-                "b905fec4.7ac5f"
+                "22cfd3ec.44ae6c"
             ]
         ]
     },
     {
-        "id": "9544eb2a.40e488",
+        "id": "61b774be.b66afc",
         "type": "delete",
         "name": "delete from db",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id\">",
         "comments": "",
         "outputs": 1,
-        "x": 1223.2776336669922,
-        "y": 1042.5554809570312,
-        "z": "3bd40398.0e17fc",
+        "x": 1256.787109375,
+        "y": 1047.5649490356445,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "91c2f578.c64f58",
+        "id": "45655a72.080ca4",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",
         "comments": "",
-        "x": 1170.5,
-        "y": 1114,
-        "z": "3bd40398.0e17fc",
+        "x": 1204.0094757080078,
+        "y": 1119.0094680786133,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "fe5645b4.4896a8",
+        "id": "26889205.8ed4ce",
         "type": "get-resource",
         "name": "get-resource",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '\npfx='output'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n     \n \n",
         "comments": "",
         "outputs": 1,
-        "x": 710.0000114440918,
-        "y": 107.50000095367432,
-        "z": "3bd40398.0e17fc",
+        "x": 743.5094871520996,
+        "y": 112.5094690322876,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "361056c9.62d1aa",
+        "id": "b25ded2.8528d1",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='esr-id' value='`$output.controller-id`' />\n",
         "comments": "",
-        "x": 727.5,
-        "y": 152.5,
-        "z": "3bd40398.0e17fc",
+        "x": 759.3427124023438,
+        "y": 157.50946426391602,
+        "z": "ae52800f.42b85",
         "wires": []
     },
     {
-        "id": "fcf7ae69.66bac",
+        "id": "1c70a864.9f7418",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$esr-id`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"new-esr\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 707.5000152587891,
-        "y": 207.50000190734863,
-        "z": "3bd40398.0e17fc",
+        "x": 742.6761665344238,
+        "y": 207.50947380065918,
+        "z": "ae52800f.42b85",
         "wires": [
             []
         ]
     },
     {
-        "id": "658b7b5f.7441e4",
+        "id": "736dbac8.fe21e4",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='service-name' value=\"`$optical-service-delete-input.payload.service-name +  $new-esr[2]`\" />\n",
+        "xml": "<set>\n<parameter name='service-name' value=\"`$optical-service-delete-input.payload.service-name +  $new-esr[2]`\" />\n<parameter name='controller-ip' value=\"`$new-esr[1]`\" />\n\n",
         "comments": "",
-        "x": 675.0000114440918,
-        "y": 262.50000381469727,
-        "z": "3bd40398.0e17fc",
+        "x": 708.5094871520996,
+        "y": 267.50947189331055,
+        "z": "ae52800f.42b85",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/resources/graph.versions b/platform-logic/optical-service/src/main/resources/graph.versions
index 417792c1..bdea7bb5 100644
--- a/platform-logic/optical-service/src/main/resources/graph.versions
+++ b/platform-logic/optical-service/src/main/resources/graph.versions
@@ -24,3 +24,4 @@ optical-service optical-service_inter-domain-handling ${project.version} sync
 optical-service optical-service_create-service-relationship ${project.version} sync
 optical-service main-create ${project.version} sync
 optical-service service-delete-msa ${project.version} sync
+optical-service mdons-closed-loop ${project.version} sync
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml b/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
index c817cee6..b8df0f60 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
@@ -21,40 +21,44 @@ pfx='aai.service'      local-only='false'></get-resource>
                 <parameter name="field2" value="`$aai.service.orchestration-status`"/>
                 <parameter name="field3" value="`$aai.service.relationship-list.relationship_length`"/>
             </record>
-            <for index='idx' start='1' end='`$aai.service.relationship-list.relationship_length`' >
-                <block atomic='true'>
-                    <set>
-                        <parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />
-                        <parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Inside Revert PInterface details"/>
-                        <parameter name="field2" value="`$pnf-name`"/>
-                        <parameter name="field3" value="`$pinterface-name`"/>
-                    </record>
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+            <for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >
+                <switch test="`$aai.service.relationship-list.relationship[$idx].related-to == 'p-interface'`">
+                    <outcome value='true'>
+                        <block>
+                            <set>
+                                <parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />
+                                <parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Inside Revert PInterface details"/>
+                                <parameter name="field2" value="`$pnf-name`"/>
+                                <parameter name="field3" value="`$pinterface-name`"/>
+                            </record>
+                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 resource="p-interface"
      key='pnf.pnf-name = $pnf-name AND
      p-interface.interface-name = $pinterface-name ' 
 pfx='p.in.details'      local-only='false'></get-resource>
-                    <set>
-                        <parameter name='new-rate' value='`$p.in.details.speed-value`' />
-                    </set>
-                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+                            <set>
+                                <parameter name='new-rate' value='`$p.in.details.speed-value`' />
+                            </set>
+                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
 force='true'
 resource='p-interface'
      key='pnf.pnf-name = $pnf-name AND
      p-interface.interface-name = $pinterface-name '
       local-only='false'>
-                        <parameter name='available-capacity' value='`$new-rate`' />
-                    </update>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+                                <parameter name='available-capacity' value='`$new-rate`' />
+                            </update>
+                            <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
 resource='SQL' 
 key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $new-rate WHERE interface_name = $pinterface-name '
 force='true' pfx='save-result'></save>
-                </block>
+                        </block>
+                    </outcome>
+                </switch>
             </for>
             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 resource="service-instance"
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_create-service-async.xml b/platform-logic/optical-service/src/main/xml/optical-service_create-service-async.xml
index db55f387..cdb04afb 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_create-service-async.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_create-service-async.xml
@@ -26,11 +26,19 @@ resource='service-instance'
                         <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
 resource='SQL' 
 key='UPDATE REQUEST_DETAILS SET status = "CREATED" WHERE request_id = $request-id'
+force='true' pfx='save-result'></save>
+                        <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
+key="SELECT * from REQUEST_DETAILS WHERE domain_requests = $request-id "
+pfx='access'></get-resource>
+                        <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+resource='SQL' 
+key='UPDATE REQUEST_DETAILS SET status = "CREATED" WHERE request_id = $access.request-id'
 force='true' pfx='save-result'></save>
                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                             <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
                             <parameter name="level" value="info" />
                             <parameter name="field1" value="Finished updating service in AAI and DB to CREATED"/>
+                            <parameter name="field2" value="`$access.request-id`"/>
                         </record>
                     </block>
                 </outcome>
@@ -43,10 +51,26 @@ force='true' pfx='save-result'></save>
                     </block>
                 </outcome>
             </switch>
+            <set>
+                <parameter name='so.service-instance-id' value='`$access.service-instance-id`' />
+                <parameter name='so.service-type' value='`$access.service-type`' />
+                <parameter name='so.svc-request-id' value='`$access.request-id`' />
+                <parameter name='so.response-code' value='`$response-code`' />
+                <parameter name='so.response-message' value='`$response-message`' />
+                <parameter name='so.ack-final-indicator' value='Y' />
+            </set>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="SO Parameters"/>
+                <parameter name="field2" value="`$so.service-instance-id`"/>
+                <parameter name="field3" value="`$so.svc-request-id`"/>
+                <parameter name="field4" value="`$so.response-code`"/>
+            </record>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.template.so.response.filename`" />
-                <parameter name="restapiUrl" value="`$output.notification-url`"/>
-                <parameter name="restapiUser" value="`$prop.so.username`" />
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/async-response-so.json'`" />
+                <parameter name="restapiUrl" value="http://so-bpmn-infra.onap:8081/mso/async/services/updateStatus"/>
+                <parameter name="restapiUser" value="sdncaBpmn" />
                 <parameter name="restapiPassword" value="`$prop.so.password`"/>
                 <parameter name="httpMethod" value="POST"/>
                 <parameter name="responsePrefix" value="so-response"/>
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_create-service-relationship.xml b/platform-logic/optical-service/src/main/xml/optical-service_create-service-relationship.xml
index 669f3800..9e4a8759 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_create-service-relationship.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_create-service-relationship.xml
@@ -6,7 +6,7 @@
             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
 key='SELECT *
 from REQUEST_DETAILS
-WHERE request_id = $as-request-id'
+WHERE request_id = $access-request-id'
 pfx='access-service'></get-resource>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
                 <parameter name="original_string" value='`$access-service.domain-requests`'/>
@@ -33,17 +33,19 @@ pfx='ds-details'></get-resource>
                     </block>
                 </block>
             </for>
-            <switch test='`$domain-services_length`'>
-                <outcome value='2'>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  
+            <switch test='`$domain-services_length == 1`'>
+                <outcome value='false'>
+                    <for index='idml' start='0' end='`$oof-response.solutions.routeInfo.linkList_length`' >
+                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  
      key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
      service-subscription.service-type = $optical-service-create-input.service-type AND
      service-instance.service-instance-id = $access-service.service-instance-id' force="true" pfx="tmp.AnAI-data">
-                        <parameter name="relationship-list.relationship[0].related-to" value="service-instance" />
-                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $inter.logical-link[$ida].link-name`" />
-                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />
-                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$inter.logical-link[$ida].link-name`" />
-                    </save>
+                            <parameter name="relationship-list.relationship[0].related-to" value="service-instance" />
+                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $oof-response.solutions.routeInfo.linkList[$idml]`" />
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$oof-response.solutions.routeInfo.linkList[$idml]`" />
+                        </save>
+                    </for>
                 </outcome>
             </switch>
         </block>
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml b/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml
index 4e712ea0..7f67e5de 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml
@@ -3,195 +3,197 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>
     <method rpc='inter-domain-handling' mode='sync'>
         <block atomic="true">
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-resource="logical-links"
-key=" "
-pfx='inter' local-only='false' >
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='error-code' value='500' />
-                        <parameter name='error-message' value='No inter-domain-links available' />
-                        <parameter name='ack-final-indicator' value="Y" />
-                    </return>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT * from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE interface_name = $src-port-id'
+pfx='src'>
+                <outcome value='success'>
+                    <set>
+                        <parameter name='src-node-id' value='`$src.pnf-name`' />
+                        <parameter name='src-esr-id' value='`$src.controller-id`' />
+                    </set>
                 </outcome>
+            </get-resource>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$src-esr-id`'/>
+                <parameter name="regex" value="_"/>
+                <parameter name="ctx_memory_result_key" value="param-prefix"/>
+            </execute>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE interface_name = $dst-port-id'
+pfx='dst'>
+                <outcome value='success'>
+                    <set>
+                        <parameter name='dst-node-id' value='`$dst.pnf-name`' />
+                        <parameter name='dst-esr-id' value='`$dst.controller-id`' />
+                    </set>
+                </outcome>
+            </get-resource>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$dst-esr-id`'/>
+                <parameter name="regex" value="_"/>
+                <parameter name="ctx_memory_result_key" value="param-prefix1"/>
+            </execute>
+            <set>
+                <parameter name='src-controller-id' value='`$param-prefix[2]`' />
+                <parameter name='dst-controller-id' value='`$param-prefix1[2]`' />
+                <parameter name='flag' value='true' />
+                <parameter name='domain-requests' value='' />
+                <parameter name='access-status' value='success' />
+                <parameter name='domain-status' value='' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="oof-request-id"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="oof-transaction-id"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/oof-mdons.json'`" />
+                <parameter name="restapiUrl" value="` $prop.oof.mdons.url`" />
+                <parameter name="restapiUser" value="admin"/>
+                <parameter name="restapiPassword" value="admin"/>
+                <parameter name="httpMethod" value="POST"/>
+                <parameter name="responsePrefix" value="oof-response"/>
+                <parameter name='contentType' value='application/json' />
+                <parameter name='format' value='json' />
                 <outcome value='failure'>
                     <return status='failure'>
                         <parameter name='error-code' value='500' />
-                        <parameter name='error-message' value='Could not retrieve logical-links' />
+                        <parameter name='error-message' value='No service route found by OOF' />
                         <parameter name='ack-final-indicator' value="Y" />
                     </return>
                 </outcome>
                 <outcome value='success'>
-                    <block atomic="true">
-                        <for index='ida' start='0' end='`$inter.logical-link_length`' >
-                            <switch test='`$inter.logical-link[$ida].link-type`'>
-                                <outcome value='inter-domain'>
-                                    <switch test='`$inter.logical-link[$ida].operational-status == occupied`'>
-                                        <outcome value='true'></outcome>
-                                        <outcome value='false'>
-                                            <block atomic="true">
-                                                <set>
-                                                    <parameter name='access-bend' value='`$inter.logical-link[$ida].relationship-list.relationship[0].relationship-data[1].relationship-value`' />
-                                                    <parameter name='access-cend' value='`$inter.logical-link[$ida].relationship-list.relationship[1].relationship-data[1].relationship-value`' />
-                                                </set>
-                                                <break/>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </outcome>
-                            </switch>
+                    <block atomic='true'>
+                        <for index='idml' start='0' end='`$oof-response.solutions.routeInfo.linkList_length`' >
+                            <block atomic='true'>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="logical-link"
+key="logical-link.link-name = $oof-response.solutions.routeInfo.linkList[$idml]"
+pfx='inter' local-only='false' ></get-resource>
+                                <switch test="`$inter.operational-status == up`">
+                                    <outcome value='false'>
+                                        <block>
+                                            <set>
+                                                <parameter name='flag' value='false' />
+                                            </set>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </block>
                         </for>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                            <parameter name="file" value="/opt/opendaylight/current/data/log/inter-domain.log" />
-                            <parameter name="level" value="info" />
-                            <parameter name="field1" value="`'Aaccess bend---' + $access-bend`"/>
-                            <parameter name="field2" value="`'Aaccess cend---' + $access-cend`"/>
-                            <parameter name="field3" value="`'Service 1 req id---' + $service1-request-id`"/>
-                            <parameter name="field4" value="`'Service 2 req id---' + $service2-request-id`"/>
-                        </record>
-                        <switch test="`$access-bend == ''`">
-                            <outcome value='true'>
+                        <switch test="`$flag == 'true' `">
+                            <outcome value='false'>
                                 <return status='failure'>
                                     <parameter name='error-code' value='500' />
-                                    <parameter name='error-message' value='No inter-domain-links available' />
+                                    <parameter name='error-message' value='Inter domain links not available' />
                                     <parameter name='ack-final-indicator' value="Y" />
                                 </return>
                             </outcome>
-                            <outcome value='false'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name='access-service-name' value='`$optical-service-create-input.payload.service-name`' />
-                                    </set>
-                                    <for index='idb' start='0' end='2' >
-                                        <switch test='`$idb`'>
-                                            <outcome value='0'>
-                                                <block atomic="true">
+                            <outcome value='true'>
+                                <block atomic='true'>
+                                    <for index='idmk' start='0' end='`$oof-response.solutions.routeInfo.linkList_length`' >
+                                        <block>
+                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='logical-link'
+     key='logical-link.link-name = $oof-response.solutions.routeInfo.linkList[$idmk]'
+      local-only='false'>
+                                                <parameter name='operational-status' value='occupied' />
+                                            </update>
+                                        </block>
+                                    </for>
+                                </block>
+                            </outcome>
+                        </switch>
+                        <for index='idomainsvc' start='0' end='`$oof-response.solutions.routeInfo.serviceRoute_length`' >
+                            <block atomic='true'>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                    <parameter name="ctx-destination" value="domain-request-id"/>
+                                </execute>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                    <parameter name="ctx-destination" value="domain-instance-id"/>
+                                </execute>
+                                <switch test="`$idomainsvc == $oof-response.solutions.routeInfo.serviceRoute_length - 1`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='domain-requests' value="`$domain-requests + $domain-request-id`" />
+                                        </set>
+                                    </outcome>
+                                    <outcome value='false'>
+                                        <set>
+                                            <parameter name='domain-requests' value="`$domain-requests + $domain-request-id + ','`" />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <set>
+                                    <parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$oof-response.solutions.routeInfo.serviceRoute[$idomainsvc].srcInterfaceId`' />
+                                    <parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$oof-response.solutions.routeInfo.serviceRoute[$idomainsvc].dstInterfaceId`' />
+                                    <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name +  '_MDONS-OTN'`" />
+                                    <parameter name='domain-type' value="TAPI" />
+                                    <parameter name='optical-service-create-input.request-id' value="`$domain-request-id`" />
+                                    <parameter name='optical-service-create-input.service-id' value="`$domain-instance-id`" />
+                                </set>
+                                <call module='optical-service' rpc='main-create' mode='sync' >
+                                    <outcome value='success'>
+                                        <block atomic='true'>
+                                            <set>
+                                                <parameter name='service-status' value='`$final-response-code`' />
+                                            </set>
+                                            <switch test='`$service-status == 200`'>
+                                                <outcome value='true'>
                                                     <set>
-                                                        <parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-aend`' />
-                                                        <parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-bend`' />
-                                                        <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name +  '_MDONS-OTN'`" />
-                                                        <parameter name='domain-type' value="TAPI" />
-                                                        <parameter name='optical-service-create-input.request-id' value="`$service1-request-id`" />
-                                                        <parameter name='optical-service-create-input.service-id' value="`$service1-svc-instance-id`" />
+                                                        <parameter name='status' value='success' />
                                                     </set>
-                                                    <call module='optical-service' rpc='main-create' mode='sync' >
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='service1-status' value='`$final-response-code`' />
-                                                                </set>
-                                                                <switch test='`$service1-status == 200`'>
-                                                                    <outcome value='true'>
-                                                                        <set>
-                                                                            <parameter name='service1' value='success' />
-                                                                        </set>
-                                                                    </outcome>
-                                                                    <outcome value='false'>
-                                                                        <set>
-                                                                            <parameter name='service1' value='failure' />
-                                                                        </set>
-                                                                    </outcome>
-                                                                </switch>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='error-code' value='500' />
-                                                                <parameter name='error-message' value='Main Create Dg not available' />
-                                                                <parameter name='ack-final-indicator' value="Y" />
-                                                            </return>
-                                                        </outcome>
-                                                    </call>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='1'>
-                                                <block atomic="true">
+                                                </outcome>
+                                                <outcome value='false'>
                                                     <set>
-                                                        <parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-cend`' />
-                                                        <parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-zend`' />
-                                                        <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name + '_MDONS-OTN'`" />
-                                                        <parameter name='domain-type' value="TAPI" />
-                                                        <parameter name='optical-service-create-input.request-id' value="`$service2-request-id`" />
-                                                        <parameter name='optical-service-create-input.service-id' value="`$service2-svc-instance-id`" />
+                                                        <parameter name='status' value='failure' />
+                                                        <parameter name='access-status' value='failure' />
                                                     </set>
-                                                    <call module='optical-service' rpc='main-create' mode='sync' >
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='service2-status' value='`$final-response-code`' />
-                                                                </set>
-                                                                <switch test='`$service2-status == 200`'>
-                                                                    <outcome value='true'>
-                                                                        <set>
-                                                                            <parameter name='service2' value='success' />
-                                                                        </set>
-                                                                    </outcome>
-                                                                    <outcome value='false'>
-                                                                        <set>
-                                                                            <parameter name='service2' value='success' />
-                                                                        </set>
-                                                                    </outcome>
-                                                                </switch>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='failure'>
-                                                            <return status='failure'>
-                                                                <parameter name='error-code' value='500' />
-                                                                <parameter name='error-message' value='Main Create Dg not available' />
-                                                                <parameter name='ack-final-indicator' value="Y" />
-                                                            </return>
-                                                        </outcome>
-                                                    </call>
-                                                </block>
-                                            </outcome>
-                                        </switch>
-                                    </for>
-                                    <set>
-                                        <parameter name='inter' value='' />
-                                    </set>
-                                    <switch test='`$service1 == $service2 == success`'>
-                                        <outcome value='true'>
-                                            <block>
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+                                                </outcome>
+                                            </switch>
+                                            <set>
+                                                <parameter name='domain-status' value="`$domain-status + $domain-request-id + '_' + $status` " />
+                                            </set>
+                                        </block>
+                                    </outcome>
+                                </call>
+                            </block>
+                        </for>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/oof-mdons.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="Domain Status"/>
+                            <parameter name="field2" value="`$domain-status`"/>
+                            <parameter name="field3" value="`$flag`"/>
+                            <parameter name="field4" value="`$access-status`"/>
+                        </record>
+                        <switch test="`$access-status == 'success'`">
+                            <outcome value='true'>
+                                <block atomic='true'>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
 resource='SQL' 
-key='UPDATE REQUEST_DETAILS SET status = "CREATED" WHERE request_id = $as-request-id'
+key='UPDATE REQUEST_DETAILS SET status = "CREATED", domain_requests = $domain-requests WHERE request_id = $access-request-id'
 force='true' pfx='save-result'></save>
-                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
-force='true'
-resource='logical-link'
-     key='logical-link.link-name = $inter.logical-link[$ida].link-name '
-      local-only='false'>
-                                                    <parameter name='operational-status' value='occupied' />
-                                                </update>
-                                                <call module='optical-service' rpc='create-service-relationship' mode='sync' ></call>
-                                                <return status='success'>
-                                                    <parameter name='error-code' value='200' />
-                                                    <parameter name='error-message' value='Multi-domain-service successfully created' />
-                                                    <parameter name='ack-final-indicator' value="Y" />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                        <outcome value='false'>
-                                            <block>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/inter-domain.log" />
-                                                    <parameter name="level" value="info" />
-                                                    <parameter name="field1" value="Access service creation failed"/>
-                                                </record>
-                                                <return status='failure'>
-                                                    <parameter name='error-code' value='500' />
-                                                    <parameter name='error-message' value='Multi-domain-service creation failed' />
-                                                    <parameter name='ack-final-indicator' value="Y" />
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                    </switch>
+                                    <call module='optical-service' rpc='create-service-relationship' mode='sync' ></call>
+                                    <return status='success'>
+                                        <parameter name='error-code' value='200' />
+                                        <parameter name='error-message' value='Multi-domain-service successfully created' />
+                                        <parameter name='ack-final-indicator' value="Y" />
+                                    </return>
                                 </block>
                             </outcome>
                         </switch>
                     </block>
                 </outcome>
-            </get-resource>
+            </execute>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_mdons-closed-loop.xml b/platform-logic/optical-service/src/main/xml/optical-service_mdons-closed-loop.xml
new file mode 100644
index 00000000..13061e57
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_mdons-closed-loop.xml
@@ -0,0 +1,237 @@
+<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='optical-service' version='${project.version}'>
+    <method rpc='mdons-closed-loop' mode='sync'>
+        <block>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from REQUEST_DETAILS
+WHERE service_instance_id = $access-service-id'
+pfx='access'></get-resource>
+            <set>
+                <parameter name='original-name' value='`$service-name`' />
+            </set>
+            <set>
+                <parameter name='domain-services' value='`$access.domain-requests`' />
+                <parameter name='pinterface-list' value='`$access.pinterface-list`' />
+                <parameter name='optical-service-delete-input.request-id' value='`$access.request-id`' />
+                <parameter name='optical-service-delete-input.payload.param[0].name' value='service-name' />
+                <parameter name='optical-service-delete-input.payload.param[0].value' value='`$service-name`' />
+                <parameter name='service-instance-id' value='`$access.service-instance-id`' />
+                <parameter name='service-rate' value='`$access.service-rate`' />
+                <parameter name='service-type' value='`$access.service-type`' />
+                <parameter name='global-customer-id' value='`$access.global-customer-id`' />
+                <parameter name='notification-url' value='`$access.notification-url`' />
+            </set>
+            <call module='optical-service' rpc='optical-service-delete' mode='sync' ></call>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/mdons-closed-loop.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Delete successful"/>
+            </record>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$pinterface-list`'/>
+                <parameter name="regex" value=","/>
+                <parameter name="ctx_memory_result_key" value="param-prefix"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$param-prefix[0]`'/>
+                <parameter name="regex" value="--"/>
+                <parameter name="ctx_memory_result_key" value="new-aend"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$param-prefix[1]`'/>
+                <parameter name="regex" value="--"/>
+                <parameter name="ctx_memory_result_key" value="new-zend"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$new-aend[0]`'/>
+                <parameter name="regex" value="_"/>
+                <parameter name="ctx_memory_result_key" value="coding1"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$new-zend[0]`'/>
+                <parameter name="regex" value="_"/>
+                <parameter name="ctx_memory_result_key" value="coding2"/>
+            </execute>
+            <set>
+                <parameter name='optical-service-create-input.payload.param_length' value='7' />
+            </set>
+            <for index='ido' start='0' end='`$optical-service-create-input.payload.param_length`' >
+                <switch test='`$ido`'>
+                    <outcome value='0'>
+                        <block>
+                            <set>
+                                <parameter name='optical-service-create-input.payload.param[$ido].name' value='service-name' />
+                                <parameter name='optical-service-create-input.payload.param[$ido].value' value='`$original-name`' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/mdons-closed-loop.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Param details 0"/>
+                                <parameter name="field2" value="`$optical-service-create-input.payload.param[$ido].name`"/>
+                                <parameter name="field3" value="`$optical-service-create-input.payload.param[$ido].value`"/>
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='1'>
+                        <block>
+                            <set>
+                                <parameter name='optical-service-create-input.payload.param[$ido].name' value='`$new-aend[0]`' />
+                                <parameter name='optical-service-create-input.payload.param[$ido].value' value='`$new-aend[1]`' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/mdons-closed-loop.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Param details 1"/>
+                                <parameter name="field2" value="`$optical-service-create-input.payload.param[$ido].name`"/>
+                                <parameter name="field3" value="`$optical-service-create-input.payload.param[$ido].value`"/>
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='2'>
+                        <block>
+                            <set>
+                                <parameter name='optical-service-create-input.payload.param[$ido].name' value='`$new-zend[0]`' />
+                                <parameter name='optical-service-create-input.payload.param[$ido].value' value='`$new-zend[1]`' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/mdons-closed-loop.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Param details 2"/>
+                                <parameter name="field2" value="`$optical-service-create-input.payload.param[$ido].name`"/>
+                                <parameter name="field3" value="`$optical-service-create-input.payload.param[$ido].value`"/>
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='3'>
+                        <block>
+                            <set>
+                                <parameter name='optical-service-create-input.payload.param[$ido].name' value="`$coding1[0] + '_coding_func'`" />
+                                <parameter name='optical-service-create-input.payload.param[$ido].value' value='`$service-rate`' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/mdons-closed-loop.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Param details 3"/>
+                                <parameter name="field2" value="`$optical-service-create-input.payload.param[$ido].name`"/>
+                                <parameter name="field3" value="`$optical-service-create-input.payload.param[$ido].value`"/>
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='4'>
+                        <block>
+                            <set>
+                                <parameter name='optical-service-create-input.payload.param[$ido].name' value="`$coding2[0] + '_coding_func'`" />
+                                <parameter name='optical-service-create-input.payload.param[$ido].value' value='`$service-rate`' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/mdons-closed-loop.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Param details 4"/>
+                                <parameter name="field2" value="`$optical-service-create-input.payload.param[$ido].name`"/>
+                                <parameter name="field3" value="`$optical-service-create-input.payload.param[$ido].value`"/>
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='5'>
+                        <block>
+                            <set>
+                                <parameter name='optical-service-create-input.payload.param[$ido].name' value="`$coding1[0] + '_client_proto'`" />
+                                <parameter name='optical-service-create-input.payload.param[$ido].value' value='Ethernet' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/mdons-closed-loop.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Param details 5"/>
+                                <parameter name="field2" value="`$optical-service-create-input.payload.param[$ido].name`"/>
+                                <parameter name="field3" value="`$optical-service-create-input.payload.param[$ido].value`"/>
+                            </record>
+                        </block>
+                    </outcome>
+                    <outcome value='6'>
+                        <block>
+                            <set>
+                                <parameter name='optical-service-create-input.payload.param[$ido].name' value="`$coding2[0] + '_client_proto'`" />
+                                <parameter name='optical-service-create-input.payload.param[$ido].value' value='Ethernet' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/mdons-closed-loop.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Param details 6"/>
+                                <parameter name="field2" value="`$optical-service-create-input.payload.param[$ido].name`"/>
+                                <parameter name="field3" value="`$optical-service-create-input.payload.param[$ido].value`"/>
+                            </record>
+                        </block>
+                    </outcome>
+                </switch>
+            </for>
+            <set>
+                <parameter name='optical-service-create-input.request-id' value='`$access.request-id`' />
+                <parameter name='optical-service-create-input.global-customer-id' value='`$global-customer-id`' />
+                <parameter name='optical-service-create-input.service-type' value='`$service-type`' />
+                <parameter name='optical-service-create-input.notification-url' value='`$notification-url`' />
+                <parameter name='optical-service-create-input.service-id' value='`$service-instance-id`' />
+                <parameter name='optical-service-create-input.source' value='SO' />
+            </set>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/mdons-closed-loop.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Length"/>
+                <parameter name="field2" value="`$optical-service-create-input.payload.param_length`"/>
+                <parameter name="field" value="`$access.service-instance-id`"/>
+            </record>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="service-instance"
+ key='customer.global-customer-id = $global-customer-id AND
+     service-subscription.service-type = $service-type AND
+     service-instance.service-instance-id = $access.service-instance-id' 
+pfx='mdons-access'      local-only='false'></get-resource>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/mdons-closed-loop.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Service Details"/>
+                <parameter name="field3" value="`$access.service-instance-id`"/>
+                <parameter name="field4" value="`$mdons-access.model-invariant-id`"/>
+                <parameter name="field5" value="`$mdons-access.input-parameters`"/>
+            </record>
+            <for index='idl' start='0' end='`$mdons-access.relationship-list.relationship_length`' >
+                <switch test="`$mdons-access.relationship-list.relationship[$idl].related-to == 'logical-link'`">
+                    <outcome value='true'>
+                        <block>
+                            <set>
+                                <parameter name='link-name' value='`$mdons-access.relationship-list.relationship[$idl].relationship-data[0].relationship-value`' />
+                            </set>
+                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='logical-link'
+     key='logical-link.link-name = $link-name '
+      local-only='false'>
+                                <parameter name='operational-status' value='down' />
+                            </update>
+                        </block>
+                    </outcome>
+                </switch>
+            </for>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="service-instance"
+key='customer.global-customer-id = $global-customer-id AND
+service-subscription.service-type = $service-type AND
+service-instance.service-instance-id = $access.service-instance-id'></delete>
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  
+     key='customer.global-customer-id = $global-customer-id AND
+     service-subscription.service-type = $service-type AND
+     service-instance.service-instance-id = $access.service-instance-id' >
+                <parameter name='service-instance-id' value='`$mdons-access.service-instance-id`' />
+                <parameter name='service-instance-name' value='`$mdons-access.service-instance-name`' />
+                <parameter name='service-type' value='`$mdons-access.service-type`' />
+                <parameter name='orchestration-status' value='`$mdons-access.orchestration-status`' />
+                <parameter name='service-role' value='`$mdons-access.service-role`' />
+                <parameter name='model-invariant-id' value='`$mdons-access.model-invariant-id`' />
+                <parameter name='model-version-id' value='`$mdons-access.model-version-id`' />
+                <parameter name='input-parameters' value='`$mdons-access.input-parameters`' />
+            </save>
+            <call module='optical-service' rpc='optical-service-create' mode='sync' ></call>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create-sync-success.xml b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create-sync-success.xml
index 4eed4026..0eaf0d82 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create-sync-success.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create-sync-success.xml
@@ -38,7 +38,7 @@ key = 'pnf.pnf-name = $z-end-pnf-name
       local-only='false'>
                 <parameter name='available-capacity' value='`$available-bandwidth-zend`' />
             </update>
-            <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url) VALUES ( $optical-service-create-input.request-id , $controller-id , 'CREATED' , $optical-service-create-input.payload.service-rate ,  $optical-service-create-input.service-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url );"></save>
+            <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url) VALUES ( $optical-service-create-input.request-id , $controller-id , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $optical-service-create-input.service-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url );"></save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  
      key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
      service-subscription.service-type = $optical-service-create-input.service-type AND
@@ -46,7 +46,7 @@ key = 'pnf.pnf-name = $z-end-pnf-name
                 <parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />
                 <parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />
                 <parameter name='service-type' value='Domain-Service' />
-                <parameter name='orchestration-status' value='CREATED' />
+                <parameter name='orchestration-status' value='CREATING' />
                 <parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />
                 <parameter name='service-layer' value='`$optical-service-create-input.payload.service-layer`' />
             </save>
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
index 2341c607..9cc17364 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
@@ -3,6 +3,9 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>
     <method rpc='optical-service-create' mode='sync'>
         <block atomic='true'>
+            <set>
+                <parameter name='pinterface-list' value=""/>
+            </set>
             <for index='idx' start='0' end='`$optical-service-create-input.payload.param_length`' >
                 <set>
                     <parameter name='params' value='`$optical-service-create-input.payload.param[$idx]`' />
@@ -11,6 +14,7 @@
                     <outcome value='true'>
                         <set>
                             <parameter name='optical-service-create-input.payload.service-aend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                            <parameter name='pinterface-aend' value="`'uni1_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>
                         </set>
                     </outcome>
                 </switch>
@@ -23,6 +27,7 @@
                     <outcome value='true'>
                         <set>
                             <parameter name='optical-service-create-input.payload.service-zend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                            <parameter name='pinterface-zend' value="`',uni2_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>
                         </set>
                     </outcome>
                 </switch>
@@ -42,6 +47,7 @@
                     <outcome value='true'>
                         <set>
                             <parameter name='optical-service-create-input.payload.service-aend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                            <parameter name='pinterface-aend' value="`'uni_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>
                         </set>
                     </outcome>
                 </switch>
@@ -49,6 +55,7 @@
                     <outcome value='true'>
                         <set>
                             <parameter name='optical-service-create-input.payload.service-zend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                            <parameter name='pinterface-zend' value="`',enni_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>
                         </set>
                     </outcome>
                 </switch>
@@ -63,6 +70,7 @@
                     <outcome value='true'>
                         <set>
                             <parameter name='optical-service-create-input.payload.service-aend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                            <parameter name='pinterface-aend' value="`'enni1_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>
                         </set>
                     </outcome>
                 </switch>
@@ -70,6 +78,7 @@
                     <outcome value='true'>
                         <set>
                             <parameter name='optical-service-create-input.payload.service-zend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                            <parameter name='pinterface-zend' value="`',enni2_id--'+ $optical-service-create-input.payload.param[$idx].value`"/>
                         </set>
                     </outcome>
                 </switch>
@@ -145,11 +154,21 @@ pfx='db.source2'>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
                 <parameter name="ctx-destination" value="service2-request-id"/>
             </execute>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Controller Ids"/>
+                <parameter name="field2" value="`$controller1`"/>
+                <parameter name="field3" value="`$controller2`"/>
+            </record>
+            <set>
+                <parameter name='pinterface-list' value="`$pinterface-aend + $pinterface-zend`"/>
+            </set>
             <switch test='`$controller1==$controller2`'>
                 <outcome value='true'>
                     <block>
                         <set>
-                            <parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />
+                            <parameter name='access-request-id' value='`$optical-service-create-input.request-id`' />
                             <parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />
                         </set>
                         <set>
@@ -164,22 +183,29 @@ pfx='db.source2'>
                             <parameter name="field1" value="`'domain rquest_' + $domain-requests`"/>
                             <parameter name="field2" value="`'Access rquest_' + $as-request-id`"/>
                         </record>
-                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );"></save>
+                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests, pinterface_list ) VALUES ( $access-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests , $pinterface-list );"></save>
                         <call module='optical-service' rpc='main-create' mode='sync' >
                             <outcome value='success'>
                                 <switch test='`$final-response-code`'>
                                     <outcome value='200'>
                                         <block>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
-resource='SQL' 
-key='UPDATE REQUEST_DETAILS SET status = "CREATED" WHERE request_id = $as-request-id'
-force='true' pfx='save-result'></save>
                                             <call module='optical-service' rpc='create-service-relationship' mode='sync' ></call>
-                                            <return status='success'>
-                                                <parameter name='error-code' value='200' />
-                                                <parameter name='error-message' value='Service Created Successfully' />
-                                                <parameter name='ack-final-indicator' value='Y' />
-                                            </return>
+                                            <switch test="`$domain-type == 'MSA'`">
+                                                <outcome value='true'>
+                                                    <return status='success'>
+                                                        <parameter name='error-code' value='200' />
+                                                        <parameter name='error-message' value='Service Created Successfully' />
+                                                        <parameter name='ack-final-indicator' value='N' />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='false'>
+                                                    <return status='success'>
+                                                        <parameter name='error-code' value='200' />
+                                                        <parameter name='error-message' value='Service Created Successfully' />
+                                                        <parameter name='ack-final-indicator' value='Y' />
+                                                    </return>
+                                                </outcome>
+                                            </switch>
                                         </block>
                                     </outcome>
                                 </switch>
@@ -190,22 +216,23 @@ force='true' pfx='save-result'></save>
                 <outcome value='false'>
                     <block>
                         <set>
-                            <parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />
+                            <parameter name='access-request-id' value='`$optical-service-create-input.request-id`' />
                             <parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />
-                            <parameter name='domain-requests' value="`$service1-request-id + ',' + $service2-request-id`" />
+                            <parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />
+                        </set>
+                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests, pinterface_list ) VALUES ( $access-request-id , null , 'CREATING' , $service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests , $pinterface-list );"></save>
+                        <set>
+                            <parameter name='src-port-id' value="`$optical-service-create-input.payload.service-aend.port-id`"/>
+                            <parameter name='dst-port-id' value="`$optical-service-create-input.payload.service-zend.port-id`"/>
+                            <parameter name='access-service-name' value="`$optical-service-create-input.payload.service-name`"/>
                         </set>
                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                             <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />
                             <parameter name="level" value="info" />
-                            <parameter name="field1" value="`'domain rquest_' + $domain-requests`"/>
-                            <parameter name="field2" value="`'Service 1 req id---' + $service1-request-id`"/>
-                            <parameter name="field3" value="`'Service 2 req id---' + $service2-request-id`"/>
+                            <parameter name="field1" value="Access service details"/>
+                            <parameter name="field2" value="`$access-request-id`"/>
+                            <parameter name="field3" value="`$src-port-id`"/>
                         </record>
-                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );"></save>
-                        <set>
-                            <parameter name='access-aend' value="`$optical-service-create-input.payload.service-aend.port-id`"/>
-                            <parameter name='access-zend' value="`$optical-service-create-input.payload.service-zend.port-id`"/>
-                        </set>
                         <call module='optical-service' rpc='inter-domain-handling' mode='sync' ></call>
                     </block>
                 </outcome>
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml
index 2bbd79e3..33d17829 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml
@@ -16,6 +16,7 @@ pfx='detail-db'>
                     <set>
                         <parameter name='domain-req' value='`$detail-db.domain-requests`' />
                         <parameter name='delete-acc-svc-id' value='`$detail-db.service-instance-id`' />
+                        <parameter name='access-id' value='`$optical-service-delete-input.request-id`' />
                     </set>
                 </outcome>
             </get-resource>
@@ -25,18 +26,23 @@ pfx='detail-db'>
                 <parameter name="ctx_memory_result_key" value="param-prefix1"/>
             </execute>
             <set>
-                <parameter name='notification-url' value="http://167.254.204.152:31817/asyncNotification" />
-                <parameter name='domain-service1' value='`$param-prefix1[0]`' />
-                <parameter name='domain-service2' value='`$param-prefix1[1]`' />
+                <parameter name='notification-url' value="notificationUrl" />
+                <parameter name='access-status' value="success" />
             </set>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/new.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="`$domain-req`"/>
+                <parameter name="field2" value="`$domain-service1`"/>
+            </record>
             <for index='ppx' start='0' end='`$param-prefix1_length`' >
-                <switch test='`$param-prefix1_length`'>
-                    <outcome value='1'>
+                <switch test='`$param-prefix1_length == 1`'>
+                    <outcome value='true'>
                         <block atomic='true'>
                             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
 key='SELECT controller_id
 from REQUEST_DETAILS
-WHERE request_id = $domain-service1'
+WHERE request_id = $param-prefix1[$ppx]'
 pfx='detail-db1'>
                                 <outcome value='success'>
                                     <set>
@@ -52,8 +58,9 @@ pfx='detail-db1'>
                             <set>
                                 <parameter name='domain-type' value='`$param-prefix[0]`' />
                                 <parameter name='controller-ip' value='`$param-prefix[1]`' />
-                                <parameter name='optical-service-delete-input.request-id' value="`$domain-service1`" />
+                                <parameter name='optical-service-delete-input.request-id' value="`$param-prefix1[$ppx]`" />
                                 <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`"/>
+                                <parameter name='domain-service1' value="`$param-prefix1[$ppx]`" />
                             </set>
                             <switch test='`$domain-type`'>
                                 <outcome value='MSA'>
@@ -104,122 +111,51 @@ pfx='detail-db1'>
                             </switch>
                         </block>
                     </outcome>
-                    <outcome value='2'>
-                        <switch test='`$ppx`'>
-                            <outcome value='0'>
-                                <block>
-                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+                    <outcome value='false'>
+                        <block>
+                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
 key='SELECT controller_id
 from REQUEST_DETAILS
-WHERE request_id = $domain-service1'
+WHERE request_id = $param-prefix1[$ppx]'
 pfx='detail-db11'>
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='controller-id11' value='`$detail-db11.controller-id`' />
-                                            </set>
-                                        </outcome>
-                                    </get-resource>
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                        <parameter name="original_string" value='`$controller-id11`'/>
-                                        <parameter name="regex" value="_"/>
-                                        <parameter name="ctx_memory_result_key" value="domain1"/>
-                                    </execute>
-                                    <set>
-                                        <parameter name='optical-service-delete-input.request-id' value="`$domain-service1`" />
-                                        <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`"/>
-                                        <parameter name='domain-type' value='`$domain1[0]`' />
-                                        <parameter name='controller-ip' value='`$domain1[1]`' />
-                                    </set>
-                                    <call module='optical-service' rpc='service-delete-tapi' mode='sync' >
-                                        <outcome value='success'>
-                                            <block>
-                                                <set>
-                                                    <parameter name='service1-status' value='`$final-response-code`' />
-                                                </set>
-                                                <switch test='`$service1-status == 200`'>
-                                                    <outcome value='true'>
-                                                        <set>
-                                                            <parameter name='service1' value='success' />
-                                                        </set>
-                                                    </outcome>
-                                                    <outcome value='false'>
-                                                        <set>
-                                                            <parameter name='service1' value='failure' />
-                                                        </set>
-                                                    </outcome>
-                                                </switch>
-                                            </block>
-                                        </outcome>
-                                        <outcome value='failure'>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='500' />
-                                                <parameter name='error-message' value='Main Delete Dg not available' />
-                                                <parameter name='ack-final-indicator' value="Y" />
-                                            </return>
-                                        </outcome>
-                                    </call>
-                                </block>
-                            </outcome>
-                            <outcome value='1'>
-                                <block>
-                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-key='SELECT controller_id
-from REQUEST_DETAILS
-WHERE request_id = $domain-service2'
-pfx='detail-db22'>
-                                        <outcome value='success'>
-                                            <set>
-                                                <parameter name='controller-id22' value='`$detail-db22.controller-id`' />
-                                            </set>
-                                        </outcome>
-                                    </get-resource>
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                        <parameter name="original_string" value='`$controller-id22`'/>
-                                        <parameter name="regex" value="_"/>
-                                        <parameter name="ctx_memory_result_key" value="domain2"/>
-                                    </execute>
+                                <outcome value='success'>
                                     <set>
-                                        <parameter name='optical-service-delete-input.request-id' value="`$domain-service2`" />
-                                        <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`"/>
-                                        <parameter name='domain-type' value='`$domain2[0]`' />
-                                        <parameter name='controller-ip' value='`$domain2[1]`' />
+                                        <parameter name='controller-id11' value='`$detail-db11.controller-id`' />
                                     </set>
-                                    <call module='optical-service' rpc='service-delete-tapi' mode='sync' >
-                                        <outcome value='success'>
-                                            <block>
+                                </outcome>
+                            </get-resource>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                <parameter name="original_string" value='`$controller-id11`'/>
+                                <parameter name="regex" value="_"/>
+                                <parameter name="ctx_memory_result_key" value="domain1"/>
+                            </execute>
+                            <set>
+                                <parameter name='optical-service-delete-input.request-id' value="`$param-prefix1[$ppx]`" />
+                                <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`"/>
+                            </set>
+                            <call module='optical-service' rpc='service-delete-tapi' mode='sync' >
+                                <outcome value='success'>
+                                    <block>
+                                        <set>
+                                            <parameter name='service-status' value='`$final-response-code`' />
+                                        </set>
+                                        <switch test='`$service-status == 200`'>
+                                            <outcome value='true'></outcome>
+                                            <outcome value='false'>
                                                 <set>
-                                                    <parameter name='service2-status' value='`$final-response-code`' />
+                                                    <parameter name='access-status' value='failure' />
                                                 </set>
-                                                <switch test='`$service2-status == 200`'>
-                                                    <outcome value='true'>
-                                                        <set>
-                                                            <parameter name='service2' value='success' />
-                                                        </set>
-                                                    </outcome>
-                                                    <outcome value='false'>
-                                                        <set>
-                                                            <parameter name='service2' value='failure' />
-                                                        </set>
-                                                    </outcome>
-                                                </switch>
-                                            </block>
-                                        </outcome>
-                                        <outcome value='failure'>
-                                            <return status='failure'>
-                                                <parameter name='error-code' value='500' />
-                                                <parameter name='error-message' value='Main Delete Dg not available' />
-                                                <parameter name='ack-final-indicator' value="Y" />
-                                            </return>
-                                        </outcome>
-                                    </call>
-                                </block>
-                            </outcome>
-                        </switch>
+                                            </outcome>
+                                        </switch>
+                                    </block>
+                                </outcome>
+                            </call>
+                        </block>
                     </outcome>
                 </switch>
             </for>
-            <switch test='`$ppx`'>
-                <outcome value='0'>
+            <switch test='`$ppx == 0`'>
+                <outcome value='true'>
                     <block>
                         <switch test='`$service1-status`'>
                             <outcome value='200'>
@@ -246,54 +182,52 @@ pfx='detail-db22'>
                         </switch>
                     </block>
                 </outcome>
-                <outcome value='1'>
-                    <block>
-                        <switch test='`$service1-status == $service2-status == 200`'>
-                            <outcome value='true'>
-                                <block>
-                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+                <outcome value='false'>
+                    <switch test='`$access-status == success`'>
+                        <outcome value='true'>
+                            <block>
+                                <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
     resource="SQL"
     key="DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id"></delete>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                        <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />
-                                        <parameter name="level" value="info" />
-                                        <parameter name="field1" value="`'domain rquest_' + $domain-requests`"/>
-                                        <parameter name="field2" value="`'Access rquest_' + $as-request-id`"/>
-                                    </record>
-                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 resource="service-instance"
  key='customer.global-customer-id = $output.global-customer-id AND
      service-subscription.service-type = $output.service-type AND
      service-instance.service-instance-id = $delete-acc-svc-id' 
 pfx='acc-serv-dl'      local-only='false'></get-resource>
-                                    <set>
-                                        <parameter name='link-name' value='`$acc-serv-dl.relationship-list.relationship[0].relationship-data[0].relationship-value`' />
-                                    </set>
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+                                <for index='idl' start='0' end='`$acc-serv-dl.relationship-list.relationship_length`' >
+                                    <switch test="`$acc-serv-dl.relationship-list.relationship[$idl].related-to == 'logical-link'`">
+                                        <outcome value='true'>
+                                            <block>
+                                                <set>
+                                                    <parameter name='link-name' value='`$acc-serv-dl.relationship-list.relationship[$idl].relationship-data[0].relationship-value`' />
+                                                </set>
+                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
 force='true'
 resource='logical-link'
      key='logical-link.link-name = $link-name '
       local-only='false'>
-                                        <parameter name='operational-status' value='available' />
-                                    </update>
-                                    <return status='success'>
-                                        <parameter name="error-code" value="200" />
-                                        <parameter name="error-message" value="Service Deleted Successfully" />
-                                        <parameter name='ack-final-indicator' value='Y' />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='false'>
-                                <block>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='500' />
-                                        <parameter name='error-message' value='Access service request entry cannot be deleted' />
-                                        <parameter name='ack-final-indicator' value="Y" />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
+                                                    <parameter name='operational-status' value='up' />
+                                                </update>
+                                                <return status='success'>
+                                                    <parameter name="error-code" value="200" />
+                                                    <parameter name="error-message" value="Service Deleted Successfully" />
+                                                    <parameter name='ack-final-indicator' value='Y' />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </block>
+                        </outcome>
+                        <outcome value='false'>
+                            <return status='failure'>
+                                <parameter name='error-code' value='500' />
+                                <parameter name='error-message' value='Access service request entry cannot be deleted' />
+                                <parameter name='ack-final-indicator' value="Y" />
+                            </return>
+                        </outcome>
+                    </switch>
                 </outcome>
             </switch>
         </block>
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
index 0d17afd2..4901bf0f 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
@@ -24,6 +24,7 @@ pfx='output'></get-resource>
             </execute>
             <set>
                 <parameter name='service-name' value="`$optical-service-delete-input.payload.service-name +  $new-esr[2]`" />
+                <parameter name='controller-ip' value="`$new-esr[1]`" />
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.get.services.url + $service-name`" />
diff --git a/platform-logic/restapi-templates/src/main/json/async-response-so.json b/platform-logic/restapi-templates/src/main/json/async-response-so.json
new file mode 100644
index 00000000..05b14b3a
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/async-response-so.json
@@ -0,0 +1,8 @@
+{
+   "request-id":${so.svc-request-id},
+   "response-code":${so.response-code},
+   "response-message":${so.response-message},
+   "ack-final-indicator":"Y"
+}
+
+
diff --git a/platform-logic/restapi-templates/src/main/json/oof-mdons.json b/platform-logic/restapi-templates/src/main/json/oof-mdons.json
new file mode 100644
index 00000000..17a8ec75
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/oof-mdons.json
@@ -0,0 +1,30 @@
+{
+   "requestInfo":{
+      "transactionId": ${oof-transaction-id},
+      "requestId": ${oof-request-id},
+      "callbackUrl":"",
+      "sourceId":"SDNC",
+      "requestType":"create",
+      "numSolutions":1,
+      "optimizers":[
+         "route"
+      ],
+      "timeout":600
+   },
+   "routeInfo":{
+      "routeRequest":{
+         "srcDetails":{
+            "interfaceId": ${src-port-id},
+            "nodeId": ${src-node-id},
+            "controllerId": ${src-controller-id}
+         },
+         "dstDetails":{
+            "interfaceId": ${dst-port-id},
+            "nodeId": ${dst-node-id},
+            "controllerId":  ${dst-controller-id}
+         },
+         "serviceRate": ${service-rate}
+      }
+   }
+}
+
diff --git a/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json b/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json
index 8806f4b8..73cf1120 100644
--- a/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json
+++ b/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json
@@ -5,8 +5,8 @@
    "sdnc-request-header":{
       "request-id": ${optical-service-create-input.request-id},
       "rpc-action":"service-create",
-      "notification-url": "http://sdnc.onap:8090/receiver/services",
-      "request-system-id":"DCAE"
+      "notification-url": "http://sdnc-oam.onap:8282/asyncNotification",
+      "request-system-id":"SDN-ONAP"
    },
    "service-a-end":{
       "service-rate": ${optical-service-create-input.payload.service-rate},
diff --git a/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json b/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json
index 63f6b8aa..92d4f065 100644
--- a/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json
+++ b/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json
@@ -2,7 +2,7 @@
  "sdnc-request-header":{
    "request-id": ${optical-service-delete-input.request-id},
    "rpc-action": "service-delete",
-   "notification-url": "http://sdnc.onap:8090/receiver/services",
+   "notification-url": "http://sdnc-oam.onap:8282/asyncNotification",
    "request-system-id": "DCAE"
   },
   "service-delete-req-info":{
-- 
2.16.6