From: Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>
Date: Thu, 16 Apr 2020 15:23:14 +0000 (+0000)
Subject: Inter Domain DG'S modified
X-Git-Tag: 2.0.0~30^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=019903f16007d6f35117c45076d6b0c963db5cef

Inter Domain DG'S modified

Change-Id: I9f1653ae010fe9d0a06b32ee5818147af685c015
Issue-ID: SDNC-1144
Signed-off-by: Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>

Former-commit-id: 4ec43a3a9a249c104281dbfb4318848ca224185c
---

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 a4f65e72..86ae420f 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": "b2c9d122.8079d",
+        "id": "dc8e74bc.6b0e6",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 279.566650390625,
-        "y": 287,
-        "z": "4d560a72.e4927c",
+        "x": 201.5,
+        "y": 89.5,
+        "z": "78cee624.48d318",
         "wires": [
             [
-                "b624e48.81e8398"
+                "793fbbb8.688d0c"
             ]
         ]
     },
     {
-        "id": "b624e48.81e8398",
+        "id": "793fbbb8.688d0c",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,235 +22,235 @@
         "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": 466.566650390625,
-        "y": 236,
-        "z": "4d560a72.e4927c",
+        "x": 388.5,
+        "y": 38.5,
+        "z": "78cee624.48d318",
         "wires": [
             [
-                "e75c0d8a.68d908"
+                "fac8c114.6a11a"
             ]
         ]
     },
     {
-        "id": "e75c0d8a.68d908",
+        "id": "fac8c114.6a11a",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='aai-delete-service-handling' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 320.566650390625,
-        "y": 410,
-        "z": "4d560a72.e4927c",
+        "x": 242.5,
+        "y": 212.5,
+        "z": "78cee624.48d318",
         "wires": [
             [
-                "730df27.f0e4c0c"
+                "af5e3982.ec86d8"
             ]
         ]
     },
     {
-        "id": "730df27.f0e4c0c",
+        "id": "af5e3982.ec86d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 493.566650390625,
-        "y": 409,
-        "z": "4d560a72.e4927c",
+        "x": 415.5,
+        "y": 211.5,
+        "z": "78cee624.48d318",
         "wires": [
             [
-                "6723ac25.55f13c",
-                "eb2abe2d.21c0e8",
-                "914875aa.50ff98",
-                "7a255a1a.b26164",
-                "8dbb40fc.b81ee",
-                "c3a4108f.675268"
+                "47ce9b8c.699c64",
+                "532ef147.e30af8",
+                "d5300514.b84e18",
+                "e3be8795.085c9",
+                "31c5321a.c7540e",
+                "137b4c1c.0ee49c"
             ]
         ]
     },
     {
-        "id": "6723ac25.55f13c",
+        "id": "47ce9b8c.699c64",
         "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": 724.566650390625,
-        "y": 296,
-        "z": "4d560a72.e4927c",
+        "x": 646.5,
+        "y": 98.5,
+        "z": "78cee624.48d318",
         "wires": [
             []
         ]
     },
     {
-        "id": "eb2abe2d.21c0e8",
+        "id": "532ef147.e30af8",
         "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": 743.566650390625,
-        "y": 412,
-        "z": "4d560a72.e4927c",
+        "x": 665.5,
+        "y": 214.5,
+        "z": "78cee624.48d318",
         "wires": [
             []
         ]
     },
     {
-        "id": "914875aa.50ff98",
+        "id": "d5300514.b84e18",
         "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": 753.566650390625,
-        "y": 478,
-        "z": "4d560a72.e4927c",
+        "x": 675.5,
+        "y": 280.5,
+        "z": "78cee624.48d318",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a255a1a.b26164",
+        "id": "e3be8795.085c9",
         "type": "for",
         "name": "for",
-        "xml": "<for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >\n",
+        "xml": "<for index='idx' start='1' end='`$aai.service.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 726.566650390625,
-        "y": 541,
-        "z": "4d560a72.e4927c",
+        "x": 648.5,
+        "y": 343.5,
+        "z": "78cee624.48d318",
         "wires": [
             [
-                "d1115849.8412c"
+                "3755c730.096448"
             ]
         ]
     },
     {
-        "id": "9d29a06.61df4e",
+        "id": "9620ad1b.3b5ab",
         "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": 1136.566650390625,
-        "y": 228,
-        "z": "4d560a72.e4927c",
+        "x": 1058.5,
+        "y": 30.5,
+        "z": "78cee624.48d318",
         "wires": []
     },
     {
-        "id": "99771c42.d3d4f",
+        "id": "7afe7104.170b88",
         "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": 1159.566650390625,
-        "y": 297,
-        "z": "4d560a72.e4927c",
+        "x": 1081.5,
+        "y": 99.5,
+        "z": "78cee624.48d318",
         "wires": [
             []
         ]
     },
     {
-        "id": "8dbb40fc.b81ee",
+        "id": "31c5321a.c7540e",
         "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": 746.566650390625,
-        "y": 617,
-        "z": "4d560a72.e4927c",
+        "x": 668.5,
+        "y": 419.5,
+        "z": "78cee624.48d318",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1115849.8412c",
+        "id": "3755c730.096448",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 910.566650390625,
-        "y": 545,
-        "z": "4d560a72.e4927c",
+        "x": 832.5,
+        "y": 347.5,
+        "z": "78cee624.48d318",
         "wires": [
             [
-                "9d29a06.61df4e",
-                "99771c42.d3d4f",
-                "d7dc2f90.81174",
-                "1e0cbdbd.3ee7f2",
-                "d3321d96.966928",
-                "d37a6f28.98bec"
+                "9620ad1b.3b5ab",
+                "7afe7104.170b88",
+                "d6286179.01c048",
+                "651efb55.9daa24",
+                "24dec78d.b7fd48",
+                "3e61b022.837b4"
             ]
         ]
     },
     {
-        "id": "c3a4108f.675268",
+        "id": "137b4c1c.0ee49c",
         "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": 683.566650390625,
-        "y": 674,
-        "z": "4d560a72.e4927c",
+        "x": 605.5,
+        "y": 476.5,
+        "z": "78cee624.48d318",
         "wires": [
             []
         ]
     },
     {
-        "id": "d3321d96.966928",
+        "id": "24dec78d.b7fd48",
         "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": 1256.4554443359375,
-        "y": 353.1111145019531,
-        "z": "4d560a72.e4927c",
+        "x": 1178.3887939453125,
+        "y": 155.61111450195312,
+        "z": "78cee624.48d318",
         "wires": [
             []
         ]
     },
     {
-        "id": "d37a6f28.98bec",
+        "id": "3e61b022.837b4",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='new-rate' value='`$p.in.details.speed-value`' />\n",
         "comments": "",
-        "x": 1196.677734375,
-        "y": 443.3333435058594,
-        "z": "4d560a72.e4927c",
+        "x": 1118.611083984375,
+        "y": 245.83334350585938,
+        "z": "78cee624.48d318",
         "wires": []
     },
     {
-        "id": "d7dc2f90.81174",
+        "id": "d6286179.01c048",
         "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": 1163.566650390625,
-        "y": 549,
-        "z": "4d560a72.e4927c",
+        "x": 1085.5,
+        "y": 351.5,
+        "z": "78cee624.48d318",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e0cbdbd.3ee7f2",
+        "id": "651efb55.9daa24",
         "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": 1154.566650390625,
-        "y": 617,
-        "z": "4d560a72.e4927c",
+        "x": 1076.5,
+        "y": 419.5,
+        "z": "78cee624.48d318",
         "wires": [
             []
         ]
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 3c56d2a0..57ebd257 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": "f758e877.9aa428",
+        "id": "389b367f.fc91aa",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 170,
-        "y": 35,
-        "z": "5c4cb98c.063918",
+        "x": 157.5,
+        "y": 140,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "5c17b7ee.ab4f88"
+                "247d6de0.b063f2"
             ]
         ]
     },
     {
-        "id": "5c17b7ee.ab4f88",
+        "id": "247d6de0.b063f2",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,1010 +22,1010 @@
         "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": 183,
-        "y": 95,
-        "z": "5c4cb98c.063918",
+        "x": 170.5,
+        "y": 200,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "748bfbc0.155724"
+                "163fe816.9d3ba8"
             ]
         ]
     },
     {
-        "id": "748bfbc0.155724",
+        "id": "163fe816.9d3ba8",
         "type": "method",
         "name": "method service-create-tapi",
         "xml": "<method rpc='inter-domain-handling' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 203,
-        "y": 175,
-        "z": "5c4cb98c.063918",
+        "x": 190.5,
+        "y": 280,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "dbf465e6.f48758"
+                "af3a973b.40dd08"
             ]
         ]
     },
     {
-        "id": "dbf465e6.f48758",
+        "id": "af3a973b.40dd08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 413.5,
-        "y": 159.99998474121094,
-        "z": "5c4cb98c.063918",
+        "x": 401,
+        "y": 264.99998474121094,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "28583d0f.279172"
+                "c7bde6fd.a9cd08"
             ]
         ]
     },
     {
-        "id": "28583d0f.279172",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 580.3333435058594,
-        "y": 114.66667175292969,
-        "z": "5c4cb98c.063918",
+        "x": 567.8333435058594,
+        "y": 219.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "b70b6289.977c1",
-                "6ef8cbe3.e8bef4",
-                "6bf74a48.446dd4"
+                "33ac5ab7.2291a6",
+                "a16804ab.521db8",
+                "fcb475cb.a0be98"
             ]
         ]
     },
     {
-        "id": "b70b6289.977c1",
+        "id": "33ac5ab7.2291a6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 737.3333435058594,
-        "y": 55.66667175292969,
-        "z": "5c4cb98c.063918",
+        "x": 724.8333435058594,
+        "y": 160.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "85b966b9.0f8cf8"
+                "5eb01f99.89617"
             ]
         ]
     },
     {
-        "id": "6ef8cbe3.e8bef4",
+        "id": "a16804ab.521db8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 746.3333435058594,
-        "y": 106.66667175292969,
-        "z": "5c4cb98c.063918",
+        "x": 733.8333435058594,
+        "y": 211.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "cd963a4d.e22ee8"
+                "47cadf70.ddac9"
             ]
         ]
     },
     {
-        "id": "85b966b9.0f8cf8",
+        "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\" />",
         "comments": "",
-        "x": 901.3333435058594,
-        "y": 53.66667175292969,
-        "z": "5c4cb98c.063918",
+        "x": 888.8333435058594,
+        "y": 158.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "cd963a4d.e22ee8",
+        "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\" />",
         "comments": "",
-        "x": 908.3333435058594,
-        "y": 106.66667175292969,
-        "z": "5c4cb98c.063918",
+        "x": 895.8333435058594,
+        "y": 211.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "6bf74a48.446dd4",
+        "id": "fcb475cb.a0be98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 567.3333435058594,
-        "y": 256.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 554.8333435058594,
+        "y": 361.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "9c819276.24e11"
+                "1cd2f550.3b31eb"
             ]
         ]
     },
     {
-        "id": "9c819276.24e11",
+        "id": "1cd2f550.3b31eb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 571.3333435058594,
-        "y": 343.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 558.8333435058594,
+        "y": 448.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "d737ac6d.616bf",
-                "26ccb9a4.4d6756",
-                "220b1d2a.b6a942"
+                "61403202.67ffac",
+                "5cf9c1.73b5e64",
+                "b39431ae.10e55"
             ]
         ]
     },
     {
-        "id": "26ccb9a4.4d6756",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 735.3333435058594,
-        "y": 398.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 722.8333435058594,
+        "y": 503.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             []
         ]
     },
     {
-        "id": "c76734fa.8d1cc8",
+        "id": "61f864fb.8ad3fc",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$inter.logical-link[$ida].link-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 861.3333435058594,
-        "y": 349.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 848.8333435058594,
+        "y": 454.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "272d946f.d2dc2c"
+                "750846eb.eb1858"
             ]
         ]
     },
     {
-        "id": "d737ac6d.616bf",
+        "id": "61403202.67ffac",
         "type": "for",
         "name": "for",
         "xml": "<for index='ida' start='0' end='`$inter.logical-link_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 730.3333435058594,
-        "y": 349.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 717.8333435058594,
+        "y": 454.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "c76734fa.8d1cc8"
+                "61f864fb.8ad3fc"
             ]
         ]
     },
     {
-        "id": "272d946f.d2dc2c",
+        "id": "750846eb.eb1858",
         "type": "outcome",
         "name": "inter-domain",
         "xml": "<outcome value='inter-domain'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1003.3333435058594,
-        "y": 349.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 990.8333435058594,
+        "y": 454.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "9b0d1c2e.0faa7"
+                "4071f83b.54b008"
             ]
         ]
     },
     {
-        "id": "ca4ee674.defdf8",
+        "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": 1570.083396911621,
-        "y": 200.4166898727417,
-        "z": "5c4cb98c.063918",
+        "x": 1557.583396911621,
+        "y": 305.4166898727417,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "a5175c91.4398b",
+        "id": "e9fe864f.b1d708",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 1587.833396911621,
-        "y": 298.91669178009033,
-        "z": "5c4cb98c.063918",
+        "x": 1575.333396911621,
+        "y": 403.91669178009033,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "13f040fa.3faaef",
+        "id": "8c88b9bd.0e2f28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1431.083396911621,
-        "y": 292.416690826416,
-        "z": "5c4cb98c.063918",
+        "x": 1418.583396911621,
+        "y": 397.416690826416,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "ca4ee674.defdf8",
-                "a5175c91.4398b"
+                "bb3b4d5f.2b2bc",
+                "e9fe864f.b1d708"
             ]
         ]
     },
     {
-        "id": "220b1d2a.b6a942",
+        "id": "b39431ae.10e55",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$access-bend == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 693.3333435058594,
-        "y": 455.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 680.8333435058594,
+        "y": 560.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "130ab846.d0f008",
-                "50eacb5c.990954"
+                "1bff9a4a.aa1c56",
+                "c7a0ae8a.585af"
             ]
         ]
     },
     {
-        "id": "130ab846.d0f008",
+        "id": "1bff9a4a.aa1c56",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 837.3333435058594,
-        "y": 455.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 824.8333435058594,
+        "y": 560.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "ee14f7be.3c7fa8"
+                "99508862.dd9ed8"
             ]
         ]
     },
     {
-        "id": "ee14f7be.3c7fa8",
+        "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": 986.3333435058594,
-        "y": 456.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 973.8333435058594,
+        "y": 561.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "50eacb5c.990954",
+        "id": "c7a0ae8a.585af",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 572.3333435058594,
-        "y": 531.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 559.8333435058594,
+        "y": 636.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "347e2915.cc1706"
+                "64bdfe75.3731a"
             ]
         ]
     },
     {
-        "id": "347e2915.cc1706",
+        "id": "64bdfe75.3731a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 717.3333435058594,
-        "y": 532.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 704.8333435058594,
+        "y": 637.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "856ca7c4.6b82e8",
-                "8837a281.40c0b",
-                "de103600.3d65d8",
-                "c43967.77247698"
+                "d71ceee8.2cc21",
+                "5812464d.ff2318",
+                "d5d60b0e.6b7598",
+                "e899697c.47e108"
             ]
         ]
     },
     {
-        "id": "856ca7c4.6b82e8",
+        "id": "d71ceee8.2cc21",
         "type": "for",
         "name": "for",
         "xml": "<for index='idb' start='0' end='2' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 906.3333435058594,
-        "y": 530.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 893.8333435058594,
+        "y": 635.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "a72d7f41.fec8f"
+                "4df590dd.62851"
             ]
         ]
     },
     {
-        "id": "82932067.81591",
+        "id": "f4b1528e.2b869",
         "type": "call",
         "name": "call",
         "xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1457.3333435058594,
-        "y": 545.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1444.8333435058594,
+        "y": 650.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "e5f10270.f273a",
-                "7ab99a2a.02a9b4"
+                "b82ddceb.8c1de",
+                "11734593.7b34da"
             ]
         ]
     },
     {
-        "id": "a72d7f41.fec8f",
+        "id": "4df590dd.62851",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$idb`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1032.3333435058594,
-        "y": 530.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1019.8333435058594,
+        "y": 635.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "a10d9b09.c6a018",
-                "65f0439d.6850dc"
+                "e24cf2b6.2e8bb",
+                "fcc6fd38.e5cb2"
             ]
         ]
     },
     {
-        "id": "a10d9b09.c6a018",
+        "id": "e24cf2b6.2e8bb",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1160.3333435058594,
-        "y": 497.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1147.8333435058594,
+        "y": 602.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "e11165ce.81f408"
+                "14ca5977.d20f97"
             ]
         ]
     },
     {
-        "id": "e11165ce.81f408",
+        "id": "14ca5977.d20f97",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1304.3333435058594,
-        "y": 497.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1291.8333435058594,
+        "y": 602.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "82932067.81591",
-                "8944795b.be9238"
+                "f4b1528e.2b869",
+                "13ff6105.eaad1f"
             ]
         ]
     },
     {
-        "id": "7242da65.49c644",
+        "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-TAPI-2'`\" />\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",
+        "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": 1465.3333435058594,
-        "y": 751.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1452.8333435058594,
+        "y": 856.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "d9d5ec95.325f2",
+        "id": "c16d7ee9.39a1a",
         "type": "call",
         "name": "call",
         "xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1302.3333435058594,
-        "y": 1038.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1289.8333435058594,
+        "y": 1143.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "3bece07b.4143",
-                "308f7f65.579ea"
+                "eadb5b74.6cde68",
+                "2fe5acd9.03dff4"
             ]
         ]
     },
     {
-        "id": "65f0439d.6850dc",
+        "id": "fcc6fd38.e5cb2",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1144.3333435058594,
-        "y": 745.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1131.8333435058594,
+        "y": 850.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "4117c3fb.234e2c"
+                "6d4682a2.6cf8ac"
             ]
         ]
     },
     {
-        "id": "4117c3fb.234e2c",
+        "id": "6d4682a2.6cf8ac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1294.3333435058594,
-        "y": 768.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1281.8333435058594,
+        "y": 873.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "7242da65.49c644",
-                "d9d5ec95.325f2"
+                "a1dafaaf.167958",
+                "c16d7ee9.39a1a"
             ]
         ]
     },
     {
-        "id": "8944795b.be9238",
+        "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-TAPI-1'`\" />\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",
+        "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": 1457.3333435058594,
-        "y": 480.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1444.8333435058594,
+        "y": 585.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "8837a281.40c0b",
+        "id": "5812464d.ff2318",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$service1 == $service2 == success`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 467.8333511352539,
-        "y": 972.9166975021362,
-        "z": "5c4cb98c.063918",
+        "x": 455.3333511352539,
+        "y": 1077.9166975021362,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "b7e3ef8e.7574d",
-                "ebdeccd7.d965"
+                "5c9c5b68.cd5504",
+                "495561a5.fec34"
             ]
         ]
     },
     {
-        "id": "3ebe2880.5d2848",
+        "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\" />",
         "comments": "",
-        "x": 972.3333892822266,
-        "y": 970.4167022705078,
-        "z": "5c4cb98c.063918",
+        "x": 959.8333892822266,
+        "y": 1075.4167022705078,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "e32376ab.722ab8",
+        "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\" />",
         "comments": "",
-        "x": 886.5833892822266,
-        "y": 1182.9167022705078,
-        "z": "5c4cb98c.063918",
+        "x": 874.0833892822266,
+        "y": 1287.9167022705078,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "e5f10270.f273a",
+        "id": "b82ddceb.8c1de",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1602.3333435058594,
-        "y": 520.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1589.8333435058594,
+        "y": 625.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "ce267118.2a781"
+                "35cec1fe.7cd71e"
             ]
         ]
     },
     {
-        "id": "3bece07b.4143",
+        "id": "eadb5b74.6cde68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1444.3333435058594,
-        "y": 1034.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1431.8333435058594,
+        "y": 1139.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "5d7bb97e.9b9168"
+                "72d0218e.8f2fd"
             ]
         ]
     },
     {
-        "id": "de103600.3d65d8",
+        "id": "d5d60b0e.6b7598",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='access-service-name' value='`$optical-service-create-input.payload.service-name`' />\n",
         "comments": "",
-        "x": 853.3333435058594,
-        "y": 493.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 840.8333435058594,
+        "y": 598.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "d7bea264.ac4f",
+        "id": "caf045ec.2f23f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 777.0833892822266,
-        "y": 890.6666994094849,
-        "z": "5c4cb98c.063918",
+        "x": 764.5833892822266,
+        "y": 995.6666994094849,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "45335899.f65cd8",
-                "3ebe2880.5d2848",
-                "5ad6860e.7c4058",
-                "105084eb.36fa9b"
+                "9e317702.903b08",
+                "2552ecde.5a89f4",
+                "146e2604.39be4a",
+                "2c1dad44.b6ddc2"
             ]
         ]
     },
     {
-        "id": "45335899.f65cd8",
+        "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'>",
         "comments": "",
         "outputs": 1,
-        "x": 983.3333892822266,
-        "y": 790.6666984558105,
-        "z": "5c4cb98c.063918",
+        "x": 970.8333892822266,
+        "y": 895.6666984558105,
+        "z": "f30c4ed5.582ba",
         "wires": [
             []
         ]
     },
     {
-        "id": "ef433cfb.addb6",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 862.8333892822266,
-        "y": 1084.4167003631592,
-        "z": "5c4cb98c.063918",
+        "x": 850.3333892822266,
+        "y": 1189.4167003631592,
+        "z": "f30c4ed5.582ba",
         "wires": [
             []
         ]
     },
     {
-        "id": "5ffac9eb.b5f648",
+        "id": "eb99418.1ac6dc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 725.5833854675293,
-        "y": 1123.916766166687,
-        "z": "5c4cb98c.063918",
+        "x": 713.0833854675293,
+        "y": 1228.916766166687,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "ef433cfb.addb6",
-                "e32376ab.722ab8"
+                "9b1c21a0.1f564",
+                "e8dd732b.52f0b"
             ]
         ]
     },
     {
-        "id": "1a20d556.18cf3b",
+        "id": "c5ae62a0.518d9",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",
         "comments": "",
-        "x": 1850.3333435058594,
-        "y": 448.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1837.8333435058594,
+        "y": 553.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "ce267118.2a781",
+        "id": "35cec1fe.7cd71e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1700.3333435058594,
-        "y": 450.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1687.8333435058594,
+        "y": 555.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "1a20d556.18cf3b",
-                "1e9f2b96.152c94"
+                "c5ae62a0.518d9",
+                "cc685478.44b5d8"
             ]
         ]
     },
     {
-        "id": "1e9f2b96.152c94",
+        "id": "cc685478.44b5d8",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$service1-status == 200`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1728.3333435058594,
-        "y": 580.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1715.8333435058594,
+        "y": 685.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "69014b74.07f204",
-                "1a2962dc.544a6d"
+                "4120a771.cb7b78",
+                "304cf1d.95f070e"
             ]
         ]
     },
     {
-        "id": "69014b74.07f204",
+        "id": "4120a771.cb7b78",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1897.3333435058594,
-        "y": 535.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1884.8333435058594,
+        "y": 640.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "312af284.d49a7e"
+                "b8c2bbf6.152258"
             ]
         ]
     },
     {
-        "id": "1a2962dc.544a6d",
+        "id": "304cf1d.95f070e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1898.3333435058594,
-        "y": 602.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1885.8333435058594,
+        "y": 707.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "1d22b46d.2540bc"
+                "d123f6e.9b1a508"
             ]
         ]
     },
     {
-        "id": "312af284.d49a7e",
+        "id": "b8c2bbf6.152258",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service1' value='success' />\n",
         "comments": "",
-        "x": 2032.3333435058594,
-        "y": 524.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 2019.8333435058594,
+        "y": 629.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "1d22b46d.2540bc",
+        "id": "d123f6e.9b1a508",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service1' value='failure' />\n",
         "comments": "",
-        "x": 2034.3333435058594,
-        "y": 601.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 2021.8333435058594,
+        "y": 706.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "5d7bb97e.9b9168",
+        "id": "72d0218e.8f2fd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1617.3333435058594,
-        "y": 1015.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1604.8333435058594,
+        "y": 1120.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "6ec325e8.81817c",
-                "b7239a52.656e68"
+                "1b71dbd0.f488a4",
+                "f3c54b18.1b0eb8"
             ]
         ]
     },
     {
-        "id": "b7239a52.656e68",
+        "id": "f3c54b18.1b0eb8",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$service2-status == 200`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.3333435058594,
-        "y": 1114.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1736.8333435058594,
+        "y": 1219.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "53ffa173.fbef1",
-                "2ad5ca.ed0e4a36"
+                "d06b5ea3.2c7da",
+                "9a666773.f65fe8"
             ]
         ]
     },
     {
-        "id": "53ffa173.fbef1",
+        "id": "d06b5ea3.2c7da",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1905.3333435058594,
-        "y": 1039.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1892.8333435058594,
+        "y": 1144.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "4007f828.6542e8"
+                "be86fbe9.594738"
             ]
         ]
     },
     {
-        "id": "2ad5ca.ed0e4a36",
+        "id": "9a666773.f65fe8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1962.3333435058594,
-        "y": 1121.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1949.8333435058594,
+        "y": 1226.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "dd3cb13a.463cf"
+                "4df0a4d2.d2637c"
             ]
         ]
     },
     {
-        "id": "4007f828.6542e8",
+        "id": "be86fbe9.594738",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service2' value='success' />\n",
         "comments": "",
-        "x": 2106.3333435058594,
-        "y": 1029.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 2093.8333435058594,
+        "y": 1134.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "dd3cb13a.463cf",
+        "id": "4df0a4d2.d2637c",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service2' value='success' />\n",
         "comments": "",
-        "x": 2105.3333435058594,
-        "y": 1099.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 2092.8333435058594,
+        "y": 1204.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "6ec325e8.81817c",
+        "id": "1b71dbd0.f488a4",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service2-status' value='`$final-response-code`' />\n",
         "comments": "",
-        "x": 1787.3333435058594,
-        "y": 962.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1774.8333435058594,
+        "y": 1067.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "c43967.77247698",
+        "id": "e899697c.47e108",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='inter' value='' />\n",
         "comments": "",
-        "x": 901.8333854675293,
-        "y": 578.4166970252991,
-        "z": "5c4cb98c.063918",
+        "x": 889.3333854675293,
+        "y": 683.4166970252991,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "7ab99a2a.02a9b4",
+        "id": "11734593.7b34da",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1605.3333435058594,
-        "y": 615.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1592.8333435058594,
+        "y": 720.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "f872b304.25e82"
+                "528f2a75.c81264"
             ]
         ]
     },
     {
-        "id": "f872b304.25e82",
+        "id": "528f2a75.c81264",
         "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\" />",
         "comments": "",
-        "x": 1765.3333435058594,
-        "y": 636.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1752.8333435058594,
+        "y": 741.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "308f7f65.579ea",
+        "id": "2fe5acd9.03dff4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1403.3333435058594,
-        "y": 1116.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1390.8333435058594,
+        "y": 1221.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "472ab920.66f758"
+                "c76d7b74.481948"
             ]
         ]
     },
     {
-        "id": "472ab920.66f758",
+        "id": "c76d7b74.481948",
         "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\" />",
         "comments": "",
-        "x": 1563.3333435058594,
-        "y": 1137.6666717529297,
-        "z": "5c4cb98c.063918",
+        "x": 1550.8333435058594,
+        "y": 1242.6666717529297,
+        "z": "f30c4ed5.582ba",
         "wires": []
     },
     {
-        "id": "b7e3ef8e.7574d",
+        "id": "5c9c5b68.cd5504",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 636.333381652832,
-        "y": 896.1666984558105,
-        "z": "5c4cb98c.063918",
+        "x": 623.833381652832,
+        "y": 1001.1666984558105,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "d7bea264.ac4f"
+                "caf045ec.2f23f8"
             ]
         ]
     },
     {
-        "id": "ebdeccd7.d965",
+        "id": "495561a5.fec34",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 600.583381652832,
-        "y": 1125.166699886322,
-        "z": "5c4cb98c.063918",
+        "x": 588.083381652832,
+        "y": 1230.166699886322,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "5ffac9eb.b5f648"
+                "eb99418.1ac6dc"
             ]
         ]
     },
     {
-        "id": "5ad6860e.7c4058",
+        "id": "146e2604.39be4a",
         "type": "call",
         "name": "create-service-relationship",
         "xml": "<call module='optical-service' rpc='create-service-relationship' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 983.3333892822266,
-        "y": 889.4166984558105,
-        "z": "5c4cb98c.063918",
+        "x": 970.8333892822266,
+        "y": 994.4166984558105,
+        "z": "f30c4ed5.582ba",
         "wires": [
             []
         ]
     },
     {
-        "id": "9b0d1c2e.0faa7",
+        "id": "4071f83b.54b008",
         "type": "switchNode",
         "name": "switch",
-        "xml": "<switch test='`$inter.logical-link[$ida].available-capacity == 0`'>\n",
+        "xml": "<switch test='`$inter.logical-link[$ida].operational-status == occupied`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1145,
-        "y": 241.25,
-        "z": "5c4cb98c.063918",
+        "x": 1132.5,
+        "y": 346.25,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "39e8a51e.7cdb9a",
-                "73566e12.b8034"
+                "9d6b0593.4c7858",
+                "1087939c.29799c"
             ]
         ]
     },
     {
-        "id": "39e8a51e.7cdb9a",
+        "id": "9d6b0593.4c7858",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1262.5000190734863,
-        "y": 190.00000190734863,
-        "z": "5c4cb98c.063918",
+        "x": 1250.0000190734863,
+        "y": 295.00000190734863,
+        "z": "f30c4ed5.582ba",
         "wires": [
             []
         ]
     },
     {
-        "id": "73566e12.b8034",
+        "id": "1087939c.29799c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1268.7500190734863,
-        "y": 296.2500057220459,
-        "z": "5c4cb98c.063918",
+        "x": 1256.2500190734863,
+        "y": 401.2500057220459,
+        "z": "f30c4ed5.582ba",
         "wires": [
             [
-                "13f040fa.3faaef"
+                "8c88b9bd.0e2f28"
             ]
         ]
     },
     {
-        "id": "105084eb.36fa9b",
+        "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='available-capacity' value='0' />\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",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 1027.5,
-        "y": 841.25,
-        "z": "5c4cb98c.063918",
+        "x": 1015,
+        "y": 946.25,
+        "z": "f30c4ed5.582ba",
         "wires": [
             []
         ]
diff --git a/platform-logic/optical-service/src/main/json/optical-service_main-create.json b/platform-logic/optical-service/src/main/json/optical-service_main-create.json
index a4a40e3a..5f81d00d 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_main-create.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_main-create.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "65bbf2ea.e8f944",
+        "id": "fa16ded3.d901b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 286.8833312988281,
-        "y": 269,
-        "z": "30ae7182.add8b6",
+        "x": 115.56666564941406,
+        "y": 208,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "1593715.ae96a8f"
+                "90403a74.09bb68"
             ]
         ]
     },
     {
-        "id": "f336edeb.74ce6",
+        "id": "f00eb096.4df5f8",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='main-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 285.8833312988281,
-        "y": 344,
-        "z": "30ae7182.add8b6",
+        "x": 114.56666564941406,
+        "y": 283,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "14882330.8313b5"
+                "f2783a8d.204c9"
             ]
         ]
     },
     {
-        "id": "1593715.ae96a8f",
+        "id": "90403a74.09bb68",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -38,330 +38,342 @@
         "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": 504.3833312988281,
-        "y": 252,
-        "z": "30ae7182.add8b6",
+        "x": 333.06666564941406,
+        "y": 191,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "f336edeb.74ce6"
+                "f00eb096.4df5f8"
             ]
         ]
     },
     {
-        "id": "14882330.8313b5",
+        "id": "f2783a8d.204c9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 461.8833312988281,
-        "y": 357,
-        "z": "30ae7182.add8b6",
+        "x": 290.56666564941406,
+        "y": 296,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "994bfa4.9799188",
-                "c4d3d388.dc35a",
-                "204f0598.3ac182",
-                "2d636d44.e5a0fa",
-                "2c72a67.f372ada",
-                "79455985.47e29",
-                "887cbe59.b1784",
-                "4f44de12.e7fb18"
+                "ee7be5b0.aa7dc8",
+                "1dad9f12.1a3e61",
+                "aaac41a5.27aa68",
+                "f2b644f.38afa38",
+                "8c0272ce.5073f8",
+                "c0d24976.f4106",
+                "f7e9652a.8ce238",
+                "6f7933ca.5a605c"
             ]
         ]
     },
     {
-        "id": "c4d3d388.dc35a",
+        "id": "1dad9f12.1a3e61",
         "type": "switchNode",
         "name": "switch : domain-type",
         "xml": "<switch test='`$domain-type`'>\n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 339.3833312988281,
-        "y": 670,
-        "z": "30ae7182.add8b6",
+        "x": 168.06666564941406,
+        "y": 609,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "77b74d5.6495a34",
-                "7bd5cfea.c1ac2"
+                "e31c6328.82295",
+                "4cf89a4b.d30f7c"
             ]
         ]
     },
     {
-        "id": "77b74d5.6495a34",
+        "id": "e31c6328.82295",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 641.8833312988281,
-        "y": 640,
-        "z": "30ae7182.add8b6",
+        "x": 470.56666564941406,
+        "y": 579,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "70f7a20a.befe0c"
+                "b7bf1438.6f1708"
             ]
         ]
     },
     {
-        "id": "7bd5cfea.c1ac2",
+        "id": "4cf89a4b.d30f7c",
         "type": "outcome",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 637.8833312988281,
-        "y": 749,
-        "z": "30ae7182.add8b6",
+        "x": 466.56666564941406,
+        "y": 688,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "9b03001b.004b98"
+                "8393cee1.c83828"
             ]
         ]
     },
     {
-        "id": "994bfa4.9799188",
+        "id": "ee7be5b0.aa7dc8",
         "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": 854.88330078125,
-        "y": 181,
-        "z": "30ae7182.add8b6",
+        "x": 683.5666351318359,
+        "y": 120,
+        "z": "85a5350a.773aa",
         "wires": [
             []
         ]
     },
     {
-        "id": "70f7a20a.befe0c",
+        "id": "b7bf1438.6f1708",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 829.8833312988281,
-        "y": 641,
-        "z": "30ae7182.add8b6",
+        "x": 658.5666656494141,
+        "y": 580,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "5fc1c8dc.a583e8"
+                "e32158b8.9895f",
+                "2158346f.f6bbfc"
             ]
         ]
     },
     {
-        "id": "9b03001b.004b98",
+        "id": "8393cee1.c83828",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 822.8833312988281,
-        "y": 754,
-        "z": "30ae7182.add8b6",
+        "x": 651.5666656494141,
+        "y": 693,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "b46560fc.9378b8"
+                "a02ebdd4.76b6e"
             ]
         ]
     },
     {
-        "id": "204f0598.3ac182",
+        "id": "aaac41a5.27aa68",
         "type": "call",
         "name": "call validate-input-parameters",
         "xml": "<call module='optical-service' rpc='optical-validate-input-params' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 911.88330078125,
-        "y": 136,
-        "z": "30ae7182.add8b6",
+        "x": 740.5666351318359,
+        "y": 75,
+        "z": "85a5350a.773aa",
         "wires": [
             []
         ]
     },
     {
-        "id": "b46560fc.9378b8",
+        "id": "a02ebdd4.76b6e",
         "type": "call",
         "name": "call TAPI DG",
         "xml": "<call module='optical-service' rpc='service-create-tapi' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1018.8833618164062,
-        "y": 760,
-        "z": "30ae7182.add8b6",
+        "x": 847.5666961669922,
+        "y": 699,
+        "z": "85a5350a.773aa",
         "wires": [
             []
         ]
     },
     {
-        "id": "5fc1c8dc.a583e8",
+        "id": "e32158b8.9895f",
         "type": "call",
         "name": "call MSA DG",
         "xml": "<call module='optical-service' rpc='service-create-msa' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1048.88330078125,
-        "y": 641,
-        "z": "30ae7182.add8b6",
+        "x": 877.5666351318359,
+        "y": 580,
+        "z": "85a5350a.773aa",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d636d44.e5a0fa",
+        "id": "f2b644f.38afa38",
         "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 TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $optical-service-create-input.payload.service-aend.port-id'\npfx='controllerid'>\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": 871.88330078125,
-        "y": 257,
-        "z": "30ae7182.add8b6",
+        "x": 700.5666351318359,
+        "y": 196,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "33031f70.c9e2f"
+                "b77153b2.c2f938"
             ]
         ]
     },
     {
-        "id": "2c72a67.f372ada",
+        "id": "8c0272ce.5073f8",
         "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-id`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 871.88330078125,
-        "y": 308,
-        "z": "30ae7182.add8b6",
+        "x": 700.5666351318359,
+        "y": 247,
+        "z": "85a5350a.773aa",
         "wires": [
             []
         ]
     },
     {
-        "id": "33031f70.c9e2f",
+        "id": "b77153b2.c2f938",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1107.88330078125,
-        "y": 255,
-        "z": "30ae7182.add8b6",
+        "x": 936.5666351318359,
+        "y": 194,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "6316e11e.6a8a8"
+                "8f62ab7a.db0b3"
             ]
         ]
     },
     {
-        "id": "6316e11e.6a8a8",
+        "id": "8f62ab7a.db0b3",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='controller-id' value='`$controllerid.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1250.88330078125,
-        "y": 257,
-        "z": "30ae7182.add8b6",
+        "x": 1079.566635131836,
+        "y": 196,
+        "z": "85a5350a.773aa",
         "wires": []
     },
     {
-        "id": "79455985.47e29",
+        "id": "c0d24976.f4106",
         "type": "set",
         "name": "set controller-ip",
-        "xml": "<set>\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n \n",
+        "xml": "<set>\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n\n \n",
         "comments": "",
-        "x": 815.88330078125,
-        "y": 370,
-        "z": "30ae7182.add8b6",
+        "x": 644.5666351318359,
+        "y": 309,
+        "z": "85a5350a.773aa",
         "wires": []
     },
     {
-        "id": "887cbe59.b1784",
+        "id": "f7e9652a.8ce238",
         "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 = $optical-service-create-input.payload.service-aend.port-id'\npfx='db-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    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 693.88330078125,
-        "y": 424,
-        "z": "30ae7182.add8b6",
+        "x": 522.5666351318359,
+        "y": 363,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "1d791c96.d1da33"
+                "a1f4b6c7.113a2"
             ]
         ]
     },
     {
-        "id": "4f44de12.e7fb18",
+        "id": "6f7933ca.5a605c",
         "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 = $optical-service-create-input.payload.service-zend.port-id'\npfx='db-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    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 679.88330078125,
-        "y": 487,
-        "z": "30ae7182.add8b6",
+        "x": 508.56663513183594,
+        "y": 426,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "ef8516e4.6c5f7"
+                "2ea9e371.7eafec"
             ]
         ]
     },
     {
-        "id": "1d791c96.d1da33",
+        "id": "a1f4b6c7.113a2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 877.88330078125,
-        "y": 426,
-        "z": "30ae7182.add8b6",
+        "x": 706.5666351318359,
+        "y": 365,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "c56f5bdc.a7e378"
+                "46b0b834.385158"
             ]
         ]
     },
     {
-        "id": "c56f5bdc.a7e378",
+        "id": "46b0b834.385158",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-nodeid' value='`$db-aend.pnf-id`' />\n<parameter name='a-end-pnf-name' value='`$db-aend.pnf-name`' />\n<parameter name='aend-clli' value='`$db-aend.clli`' />\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1044.88330078125,
-        "y": 425,
-        "z": "30ae7182.add8b6",
+        "x": 873.5666351318359,
+        "y": 364,
+        "z": "85a5350a.773aa",
         "wires": []
     },
     {
-        "id": "ef8516e4.6c5f7",
+        "id": "2ea9e371.7eafec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 876.88330078125,
-        "y": 491,
-        "z": "30ae7182.add8b6",
+        "x": 705.5666351318359,
+        "y": 430,
+        "z": "85a5350a.773aa",
         "wires": [
             [
-                "3ea4fdfa.d7bd4a"
+                "89fb9148.b2f3a8"
             ]
         ]
     },
     {
-        "id": "3ea4fdfa.d7bd4a",
+        "id": "89fb9148.b2f3a8",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-nodeid' value='`$db-zend.pnf-id`' />\n<parameter name='z-end-pnf-name' value='`$db-zend.pnf-name`' />\n<parameter name='zend-clli' value='`$db-zend.clli`' />\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 1044.88330078125,
-        "y": 492,
-        "z": "30ae7182.add8b6",
+        "x": 873.5666351318359,
+        "y": 431,
+        "z": "85a5350a.773aa",
+        "wires": []
+    },
+    {
+        "id": "2158346f.f6bbfc",
+        "type": "set",
+        "name": "set service-name",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$optical-service-create-input.payload.service-name + '_' + $param-prefix[2]`\"/>\n \n",
+        "comments": "",
+        "x": 840.5,
+        "y": 507.5,
+        "z": "85a5350a.773aa",
         "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 fbb368bf..8c2cfb86 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": "b65cdeae.8f7b08",
+        "id": "c17df4ee.ad8458",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 129,
-        "y": 129.88333129882812,
-        "z": "e2f7091c.1492b8",
+        "x": 112.5,
+        "y": 195,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "644f31e7.7234b8"
+                "2f8ae227.f9075e"
             ]
         ]
     },
     {
-        "id": "644f31e7.7234b8",
+        "id": "2f8ae227.f9075e",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,1454 +22,1513 @@
         "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": 237.5,
-        "y": 207.88333129882812,
-        "z": "e2f7091c.1492b8",
+        "x": 221,
+        "y": 273,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "168fe70c.0f8c41"
+                "34dadbb5.269934"
             ]
         ]
     },
     {
-        "id": "168fe70c.0f8c41",
+        "id": "34dadbb5.269934",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='optical-service-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 106,
-        "y": 298.8833312988281,
-        "z": "e2f7091c.1492b8",
+        "x": 89.5,
+        "y": 364,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "cfd0169c.a3cee"
+                "e6b811fb.e9938"
             ]
         ]
     },
     {
-        "id": "cfd0169c.a3cee",
+        "id": "e6b811fb.e9938",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 292,
-        "y": 294.8833312988281,
-        "z": "e2f7091c.1492b8",
+        "x": 275.5,
+        "y": 360,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "30cb33e3.b12a94",
-                "2e82bc92.4b93a4",
-                "5e98d3f6.94968c",
-                "cf17dc19.012ac",
-                "d4ebf687.1cccd8",
-                "cbe18d30.3b4198",
-                "840d7865.dda6b"
+                "60962f66.88821",
+                "616349b4.624558",
+                "4ec77896.6688b8",
+                "f1e1cc05.18be2",
+                "e639fab2.57e918",
+                "2b88b50f.6d1f2a"
             ]
         ]
     },
     {
-        "id": "30cb33e3.b12a94",
+        "id": "60962f66.88821",
         "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": 574.9999694824219,
-        "y": 20,
-        "z": "e2f7091c.1492b8",
+        "x": 545.9999771118164,
+        "y": 32.61667013168335,
+        "z": "fd6341d7.d80b3",
         "wires": [
             []
         ]
     },
     {
-        "id": "2e82bc92.4b93a4",
+        "id": "616349b4.624558",
         "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": 640.9999389648438,
-        "y": 71.8833236694336,
-        "z": "e2f7091c.1492b8",
+        "x": 659.4999542236328,
+        "y": 126.9999942779541,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "78b1b9eb.f0f1a8"
+                "b9be5065.25db9"
             ]
         ]
     },
     {
-        "id": "78b1b9eb.f0f1a8",
+        "id": "b9be5065.25db9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 881,
-        "y": 68.8833236694336,
-        "z": "e2f7091c.1492b8",
+        "x": 887.0000114440918,
+        "y": 118.9999942779541,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "b1511a3a.314df"
+                "1b12f198.60face"
             ]
         ]
     },
     {
-        "id": "b1511a3a.314df",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='domain-req' value='`$detail-db.domain-requests`' />\n\n\n\n\n\n\n\n\n\n\n",
-        "comments": "",
-        "x": 1046,
-        "y": 67.8833236694336,
-        "z": "e2f7091c.1492b8",
-        "wires": []
-    },
-    {
-        "id": "5e98d3f6.94968c",
+        "id": "4ec77896.6688b8",
         "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]`' />",
         "comments": "",
-        "x": 589.9999389648438,
-        "y": 165.88333129882812,
-        "z": "e2f7091c.1492b8",
+        "x": 668.4999465942383,
+        "y": 236.00000381469727,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "cf17dc19.012ac",
+        "id": "f1e1cc05.18be2",
         "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": 651.1166381835938,
-        "y": 115.99999237060547,
-        "z": "e2f7091c.1492b8",
+        "x": 704.6166534423828,
+        "y": 188.61665606498718,
+        "z": "fd6341d7.d80b3",
         "wires": [
             []
         ]
     },
     {
-        "id": "d4ebf687.1cccd8",
+        "id": "e639fab2.57e918",
         "type": "for",
         "name": "for",
         "xml": "<for index='ppx' start='0' end='`$param-prefix1_length`' >\n    \n    \n    \n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 544,
-        "y": 289,
-        "z": "e2f7091c.1492b8",
+        "x": 527.5,
+        "y": 354.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "91896047.66eb7"
+                "623884ec.5f3a8c"
             ]
         ]
     },
     {
-        "id": "91896047.66eb7",
+        "id": "623884ec.5f3a8c",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$param-prefix1_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 698,
-        "y": 287,
-        "z": "e2f7091c.1492b8",
+        "x": 681.5,
+        "y": 352.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "2c37340b.4002cc",
-                "7784419a.212fa"
+                "d5d414a3.d47da8",
+                "b4f97507.a007b8"
             ]
         ]
     },
     {
-        "id": "2c37340b.4002cc",
+        "id": "d5d414a3.d47da8",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 881,
-        "y": 281,
-        "z": "e2f7091c.1492b8",
+        "x": 864.5,
+        "y": 346.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "be5c1afb.f2037"
+                "e287faaa.f3da48"
             ]
         ]
     },
     {
-        "id": "be5c1afb.f2037",
+        "id": "e287faaa.f3da48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1050,
-        "y": 281,
-        "z": "e2f7091c.1492b8",
+        "x": 1033.5,
+        "y": 346.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "7f6fcc65.18cb7c",
-                "3a1a70c6.408b8",
-                "795303c1.2dac44",
-                "3ab986c7.09e812"
+                "ee746443.f75118",
+                "7b7f945a.86e22c",
+                "97c1a1ae.42a57",
+                "f357d481.8e4f58"
             ]
         ]
     },
     {
-        "id": "7784419a.212fa",
+        "id": "b4f97507.a007b8",
         "type": "outcome",
         "name": "2",
         "xml": "<outcome value='2'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 631,
-        "y": 718,
-        "z": "e2f7091c.1492b8",
+        "x": 614.5,
+        "y": 783.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "e41aac03.bbaa5"
+                "f4eb142b.f563f8"
             ]
         ]
     },
     {
-        "id": "3a1a70c6.408b8",
+        "id": "7b7f945a.86e22c",
         "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": 1322,
-        "y": 286,
-        "z": "e2f7091c.1492b8",
+        "x": 1305.5,
+        "y": 351.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             []
         ]
     },
     {
-        "id": "7f6fcc65.18cb7c",
+        "id": "ee746443.f75118",
         "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'>",
         "comments": "",
         "outputs": 1,
-        "x": 1326.11669921875,
-        "y": 246.11666870117188,
-        "z": "e2f7091c.1492b8",
+        "x": 1309.61669921875,
+        "y": 311.23333740234375,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "e2726a7c.0cf32"
+                "657a4de1.7e7434"
             ]
         ]
     },
     {
-        "id": "e2726a7c.0cf32",
+        "id": "657a4de1.7e7434",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1571.11669921875,
-        "y": 245.11666870117188,
-        "z": "e2f7091c.1492b8",
+        "x": 1554.61669921875,
+        "y": 310.23333740234375,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "70e7b1a6.2a20f"
+                "2456ff5f.8ccfc"
             ]
         ]
     },
     {
-        "id": "70e7b1a6.2a20f",
+        "id": "2456ff5f.8ccfc",
         "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": 1719.11669921875,
-        "y": 247.11666870117188,
-        "z": "e2f7091c.1492b8",
+        "x": 1702.61669921875,
+        "y": 312.23333740234375,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "795303c1.2dac44",
+        "id": "97c1a1ae.42a57",
         "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=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`\"/>",
         "comments": "",
-        "x": 1274.11669921875,
-        "y": 358.1166687011719,
-        "z": "e2f7091c.1492b8",
+        "x": 1257.61669921875,
+        "y": 423.23333740234375,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "3ab986c7.09e812",
+        "id": "f357d481.8e4f58",
         "type": "switchNode",
         "name": "switch domain-type",
         "xml": "<switch test='`$domain-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1263,
-        "y": 493,
-        "z": "e2f7091c.1492b8",
+        "x": 1246.5,
+        "y": 558.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "e04cd56f.45dfc8",
-                "2fc7713.599bf0e"
+                "fccd0b30.b9cbc8",
+                "bef3609.dfed5a"
             ]
         ]
     },
     {
-        "id": "e04cd56f.45dfc8",
+        "id": "fccd0b30.b9cbc8",
         "type": "outcome",
         "name": "MSA",
         "xml": "<outcome value='MSA'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1466,
-        "y": 404,
-        "z": "e2f7091c.1492b8",
+        "x": 1449.5,
+        "y": 469.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "5962de98.7a93e8"
+                "a299e8ab.d4c218"
             ]
         ]
     },
     {
-        "id": "2fc7713.599bf0e",
+        "id": "bef3609.dfed5a",
         "type": "outcome",
         "name": "TAPI",
         "xml": "<outcome value='TAPI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1469,
-        "y": 584,
-        "z": "e2f7091c.1492b8",
+        "x": 1452.5,
+        "y": 649.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "c51e88be.9e544"
+                "6037d29.154702c"
             ]
         ]
     },
     {
-        "id": "5962de98.7a93e8",
+        "id": "a299e8ab.d4c218",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1606,
-        "y": 401,
-        "z": "e2f7091c.1492b8",
+        "x": 1589.5,
+        "y": 466.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "314acdb7.afb7da"
+                "11bafb72.872785"
             ]
         ]
     },
     {
-        "id": "314acdb7.afb7da",
+        "id": "11bafb72.872785",
         "type": "call",
         "name": "call MSA DELETE DG",
         "xml": "<call module='optical-service' rpc='service-delete-msa' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1794,
-        "y": 402,
-        "z": "e2f7091c.1492b8",
+        "x": 1777.5,
+        "y": 467.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "af9224a8.a9533",
-                "3e7bdf94.045928"
+                "67a6d9a9.a380e8",
+                "b6015380.84934"
             ]
         ]
     },
     {
-        "id": "af9224a8.a9533",
+        "id": "67a6d9a9.a380e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1979,
-        "y": 358,
-        "z": "e2f7091c.1492b8",
+        "x": 1962.5,
+        "y": 423.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "bbe67c9b.ae8e2"
+                "bea424de.48e7e8"
             ]
         ]
     },
     {
-        "id": "3e7bdf94.045928",
+        "id": "b6015380.84934",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1981,
-        "y": 450,
-        "z": "e2f7091c.1492b8",
+        "x": 1964.5,
+        "y": 515.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "449903c8.0a6724"
+                "68e25a.54defda8"
             ]
         ]
     },
     {
-        "id": "bbe67c9b.ae8e2",
+        "id": "bea424de.48e7e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2150,
-        "y": 349,
-        "z": "e2f7091c.1492b8",
+        "x": 2133.5,
+        "y": 414.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "3a0958a9.5973c8"
+                "92667335.f399b"
             ]
         ]
     },
     {
-        "id": "3a0958a9.5973c8",
+        "id": "92667335.f399b",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",
         "comments": "",
-        "x": 2293,
-        "y": 324,
-        "z": "e2f7091c.1492b8",
+        "x": 2276.5,
+        "y": 389.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "449903c8.0a6724",
+        "id": "68e25a.54defda8",
         "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": 2150,
-        "y": 480,
-        "z": "e2f7091c.1492b8",
+        "x": 2133.5,
+        "y": 545.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "c51e88be.9e544",
+        "id": "6037d29.154702c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1625,
-        "y": 586,
-        "z": "e2f7091c.1492b8",
+        "x": 1608.5,
+        "y": 651.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "a271ced2.6952d8"
+                "c1da415.e052fc"
             ]
         ]
     },
     {
-        "id": "a271ced2.6952d8",
+        "id": "c1da415.e052fc",
         "type": "call",
         "name": "call TAPI DELETE DG",
         "xml": "<call module='optical-service' rpc='service-delete-tapi' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1813,
-        "y": 587,
-        "z": "e2f7091c.1492b8",
+        "x": 1796.5,
+        "y": 652.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "3ea9b0c9.5ce928",
-                "3153866d.fe9922"
+                "c9ff3987.f9cc28",
+                "32a118e.8eb39e8"
             ]
         ]
     },
     {
-        "id": "3ea9b0c9.5ce928",
+        "id": "c9ff3987.f9cc28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1998,
-        "y": 543,
-        "z": "e2f7091c.1492b8",
+        "x": 1981.5,
+        "y": 608.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "4e515097.338e48"
+                "d0a6dc35.167bc"
             ]
         ]
     },
     {
-        "id": "3153866d.fe9922",
+        "id": "32a118e.8eb39e8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2000,
-        "y": 635,
-        "z": "e2f7091c.1492b8",
+        "x": 1983.5,
+        "y": 700.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "e7c2b606.d88798"
+                "f15af963.5b5418"
             ]
         ]
     },
     {
-        "id": "4e515097.338e48",
+        "id": "d0a6dc35.167bc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2169,
-        "y": 534,
-        "z": "e2f7091c.1492b8",
+        "x": 2152.5,
+        "y": 599.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "128c0365.4d99ed",
-                "99a0a090.74b4e8"
+                "905a5288.1d934",
+                "757c5587.8c047c"
             ]
         ]
     },
     {
-        "id": "128c0365.4d99ed",
+        "id": "905a5288.1d934",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",
         "comments": "",
-        "x": 2312,
-        "y": 509,
-        "z": "e2f7091c.1492b8",
+        "x": 2295.5,
+        "y": 574.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "e7c2b606.d88798",
+        "id": "f15af963.5b5418",
         "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": 2169,
-        "y": 665,
-        "z": "e2f7091c.1492b8",
+        "x": 2152.5,
+        "y": 730.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "71b9114.072a4f",
+        "id": "e770f30c.f95fb",
         "type": "call",
         "name": "call TAPI DELETE DG",
         "xml": "<call module='optical-service' rpc='service-delete-tapi' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1315,
-        "y": 891,
-        "z": "e2f7091c.1492b8",
+        "x": 1298.5,
+        "y": 956.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "1978613e.4073f7",
-                "2736e495.752c04"
+                "279a4131.3c50fe",
+                "12daba39.e98ea6"
             ]
         ]
     },
     {
-        "id": "63600e7b.0d9eb8",
+        "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-TAPI-1'`\"/>\n<parameter name='domain-type' value='`$domain1[0]`' />\n<parameter name='controller-ip' value='`$domain1[1]`' />\n",
+        "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": 1296.11669921875,
-        "y": 815.1167602539062,
-        "z": "e2f7091c.1492b8",
+        "x": 1279.61669921875,
+        "y": 880.2334289550781,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "e41aac03.bbaa5",
+        "id": "f4eb142b.f563f8",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$ppx`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 771.1167602539062,
-        "y": 723.11669921875,
-        "z": "e2f7091c.1492b8",
+        "x": 754.6167602539062,
+        "y": 788.2333679199219,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "bc61c8e0.999178",
-                "d5fffe4f.796c18"
+                "e9f6b436.fcdbc8",
+                "5bc45c8e.581fe4"
             ]
         ]
     },
     {
-        "id": "bc61c8e0.999178",
+        "id": "e9f6b436.fcdbc8",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 951.1167602539062,
-        "y": 723.11669921875,
-        "z": "e2f7091c.1492b8",
+        "x": 934.6167602539062,
+        "y": 788.2333679199219,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "b7c6609b.2477c8"
+                "969523a9.6bb09"
             ]
         ]
     },
     {
-        "id": "d5fffe4f.796c18",
+        "id": "5bc45c8e.581fe4",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 899.1167602539062,
-        "y": 1097.11669921875,
-        "z": "e2f7091c.1492b8",
+        "x": 882.6167602539062,
+        "y": 1162.2333679199219,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "a2b3475f.c55ff"
+                "293ec8e4.019748"
             ]
         ]
     },
     {
-        "id": "ab6f8311.54637",
+        "id": "8c2a8c7c.a451",
         "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-TAPI-2'`\"/>\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=\"`$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",
         "comments": "",
-        "x": 1294.11669921875,
-        "y": 1170.11669921875,
-        "z": "e2f7091c.1492b8",
+        "x": 1277.61669921875,
+        "y": 1235.2333679199219,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "fc3b2634.80fb1",
+        "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": 1301.11669921875,
-        "y": 1243.11669921875,
-        "z": "e2f7091c.1492b8",
+        "x": 1284.61669921875,
+        "y": 1308.2333679199219,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "d0a61851.774d7",
-                "67e5500f.2b88c8"
+                "c8833e1f.21b83",
+                "d3120001.a70e1"
             ]
         ]
     },
     {
-        "id": "b7c6609b.2477c8",
+        "id": "969523a9.6bb09",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1091.11669921875,
-        "y": 724.11669921875,
-        "z": "e2f7091c.1492b8",
+        "x": 1074.61669921875,
+        "y": 789.2333679199219,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "63600e7b.0d9eb8",
-                "71b9114.072a4f",
-                "fb442d76.8c0b1",
-                "e8836a64.f81ae"
+                "66eb021.82f40fc",
+                "e770f30c.f95fb",
+                "54b2f238.cd48bc",
+                "71435f69.1d588"
             ]
         ]
     },
     {
-        "id": "a2b3475f.c55ff",
+        "id": "293ec8e4.019748",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1025.1167602539062,
-        "y": 1106.11669921875,
-        "z": "e2f7091c.1492b8",
+        "x": 1008.6167602539062,
+        "y": 1171.2333679199219,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "ab6f8311.54637",
-                "fc3b2634.80fb1",
-                "4d169812.58b88",
-                "8f4e881d.558318"
+                "8c2a8c7c.a451",
+                "ce3eac33.d1ef7",
+                "a41e1354.f17a4",
+                "402c6221.29fbfc"
             ]
         ]
     },
     {
-        "id": "1978613e.4073f7",
+        "id": "279a4131.3c50fe",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1576,
-        "y": 844,
-        "z": "e2f7091c.1492b8",
+        "x": 1559.5,
+        "y": 909.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "b4b3ae50.b80768"
+                "41399ce9.b1c0e4"
             ]
         ]
     },
     {
-        "id": "2736e495.752c04",
+        "id": "12daba39.e98ea6",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1560,
-        "y": 973,
-        "z": "e2f7091c.1492b8",
+        "x": 1543.5,
+        "y": 1038.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "ecbd8135.fa342"
+                "1b2c47f4.41a498"
             ]
         ]
     },
     {
-        "id": "b4b3ae50.b80768",
+        "id": "41399ce9.b1c0e4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1732,
-        "y": 851,
-        "z": "e2f7091c.1492b8",
+        "x": 1715.5,
+        "y": 916.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "e387ae63.768b78",
-                "6a4932f.f7508cc"
+                "c73df929.f6ae38",
+                "91dcae30.1f35"
             ]
         ]
     },
     {
-        "id": "e387ae63.768b78",
+        "id": "c73df929.f6ae38",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",
         "comments": "",
-        "x": 1898.9998779296875,
-        "y": 764,
-        "z": "e2f7091c.1492b8",
+        "x": 1882.4998779296875,
+        "y": 829.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "6a4932f.f7508cc",
+        "id": "91dcae30.1f35",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$service1-status == 200`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1887.9998779296875,
-        "y": 881,
-        "z": "e2f7091c.1492b8",
+        "x": 1871.4998779296875,
+        "y": 946.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "f2ab530d.5d599",
-                "7ea5454b.c5d99c"
+                "a76b03e3.6d946",
+                "35234e07.f4ce22"
             ]
         ]
     },
     {
-        "id": "f2ab530d.5d599",
+        "id": "a76b03e3.6d946",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2029.9998779296875,
-        "y": 811,
-        "z": "e2f7091c.1492b8",
+        "x": 2013.4998779296875,
+        "y": 876.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "896e220.db3996"
+                "3e585958.e262c6"
             ]
         ]
     },
     {
-        "id": "7ea5454b.c5d99c",
+        "id": "35234e07.f4ce22",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2031,
-        "y": 929,
-        "z": "e2f7091c.1492b8",
+        "x": 2014.5,
+        "y": 994.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "251983ac.1c994c"
+                "dcda07af.655078"
             ]
         ]
     },
     {
-        "id": "896e220.db3996",
+        "id": "3e585958.e262c6",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service1' value='success' />\n",
         "comments": "",
-        "x": 2185,
-        "y": 817,
-        "z": "e2f7091c.1492b8",
+        "x": 2168.5,
+        "y": 882.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "251983ac.1c994c",
+        "id": "dcda07af.655078",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service1' value='failure' />\n",
         "comments": "",
-        "x": 2198,
-        "y": 927,
-        "z": "e2f7091c.1492b8",
+        "x": 2181.5,
+        "y": 992.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "ecbd8135.fa342",
+        "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": 1732,
-        "y": 974,
-        "z": "e2f7091c.1492b8",
+        "x": 1715.5,
+        "y": 1039.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "d0a61851.774d7",
+        "id": "c8833e1f.21b83",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1543,
-        "y": 1167,
-        "z": "e2f7091c.1492b8",
+        "x": 1526.5,
+        "y": 1232.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "7ee5420a.dabadc"
+                "48e846a7.aa0238"
             ]
         ]
     },
     {
-        "id": "67e5500f.2b88c8",
+        "id": "d3120001.a70e1",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1550,
-        "y": 1306,
-        "z": "e2f7091c.1492b8",
+        "x": 1533.5,
+        "y": 1371.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "dec65b83.66c9b"
+                "6f442ba4.a9bd94"
             ]
         ]
     },
     {
-        "id": "7ee5420a.dabadc",
+        "id": "48e846a7.aa0238",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1698,
-        "y": 1175,
-        "z": "e2f7091c.1492b8",
+        "x": 1681.5,
+        "y": 1240.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "11571d88.b80ba2",
-                "8e369286.a24f1"
+                "e50cb4fe.0872a8",
+                "d3d1dcfc.971ef"
             ]
         ]
     },
     {
-        "id": "11571d88.b80ba2",
+        "id": "e50cb4fe.0872a8",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service2-status' value='`$final-response-code`' />\n",
         "comments": "",
-        "x": 1894,
-        "y": 1090,
-        "z": "e2f7091c.1492b8",
+        "x": 1877.5,
+        "y": 1155.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "8e369286.a24f1",
+        "id": "d3d1dcfc.971ef",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$service2-status == 200`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1875,
-        "y": 1215,
-        "z": "e2f7091c.1492b8",
+        "x": 1858.5,
+        "y": 1280.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "bc9b1c9e.2d7528",
-                "6e8a106a.b8a098"
+                "c12b59f0.2b2a08",
+                "1e2be21a.84b09e"
             ]
         ]
     },
     {
-        "id": "bc9b1c9e.2d7528",
+        "id": "c12b59f0.2b2a08",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2037,
-        "y": 1140,
-        "z": "e2f7091c.1492b8",
+        "x": 2020.5,
+        "y": 1205.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "88261b09.8da33"
+                "8a03b0aa.7cc6"
             ]
         ]
     },
     {
-        "id": "6e8a106a.b8a098",
+        "id": "1e2be21a.84b09e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2043,
-        "y": 1262,
-        "z": "e2f7091c.1492b8",
+        "x": 2026.5,
+        "y": 1327.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "e617e321.5b485"
+                "374b4547.8f703a"
             ]
         ]
     },
     {
-        "id": "88261b09.8da33",
+        "id": "8a03b0aa.7cc6",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service2' value='success' />\n",
         "comments": "",
-        "x": 2192,
-        "y": 1143,
-        "z": "e2f7091c.1492b8",
+        "x": 2175.5,
+        "y": 1208.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "e617e321.5b485",
+        "id": "374b4547.8f703a",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='service2' value='failure' />\n",
         "comments": "",
-        "x": 2205,
-        "y": 1265,
-        "z": "e2f7091c.1492b8",
+        "x": 2188.5,
+        "y": 1330.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "dec65b83.66c9b",
+        "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\" />",
         "comments": "",
-        "x": 1751,
-        "y": 1306,
-        "z": "e2f7091c.1492b8",
+        "x": 1734.5,
+        "y": 1371.1166687011719,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "cbe18d30.3b4198",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='access-id' value=\"`$optical-service-delete-input.request-id`\" />\n\n",
-        "comments": "",
-        "x": 548.8999938964844,
-        "y": 211.85000610351562,
-        "z": "e2f7091c.1492b8",
-        "wires": []
-    },
-    {
-        "id": "99a0a090.74b4e8",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 2306.85009765625,
-        "y": 583.8499755859375,
-        "z": "e2f7091c.1492b8",
+        "x": 2290.35009765625,
+        "y": 648.9666442871094,
+        "z": "fd6341d7.d80b3",
         "wires": [
             []
         ]
     },
     {
-        "id": "840d7865.dda6b",
+        "id": "2b88b50f.6d1f2a",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$ppx`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 362.20001220703125,
-        "y": 1446.64990234375,
-        "z": "e2f7091c.1492b8",
+        "x": 345.70001220703125,
+        "y": 1511.7665710449219,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "35bc7c0e.531f0c",
-                "647592de.7dc3ec"
+                "67345bfe.f921b4",
+                "e5284e9a.754bb"
             ]
         ]
     },
     {
-        "id": "35bc7c0e.531f0c",
+        "id": "67345bfe.f921b4",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 598.4000549316406,
-        "y": 1349.3999633789062,
-        "z": "e2f7091c.1492b8",
+        "x": 581.9000549316406,
+        "y": 1414.5166320800781,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "362cac69.39ad1c"
+                "ae809859.8b1778"
             ]
         ]
     },
     {
-        "id": "647592de.7dc3ec",
+        "id": "e5284e9a.754bb",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 589.4000549316406,
-        "y": 1522.39990234375,
-        "z": "e2f7091c.1492b8",
+        "x": 572.9000549316406,
+        "y": 1587.5165710449219,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "96d3d87a.161f98"
+                "7df23ffd.b4b17"
             ]
         ]
     },
     {
-        "id": "362cac69.39ad1c",
+        "id": "ae809859.8b1778",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 740.4000244140625,
-        "y": 1353.3999633789062,
-        "z": "e2f7091c.1492b8",
+        "x": 723.9000244140625,
+        "y": 1418.5166320800781,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "827658b9.c24fd"
+                "c1901914.b04438"
             ]
         ]
     },
     {
-        "id": "827658b9.c24fd",
+        "id": "c1901914.b04438",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$service1-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 882.75,
-        "y": 1358.5999145507812,
-        "z": "e2f7091c.1492b8",
+        "x": 866.25,
+        "y": 1423.7165832519531,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "30018cf9.344a24",
-                "7de52130.2c5fc"
+                "d5045cc6.1de7a",
+                "2beb7d55.e9c492"
             ]
         ]
     },
     {
-        "id": "f7b9ef6.7932f9",
+        "id": "3b5e2ea9.61d282",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1217.75,
-        "y": 1300.7999877929688,
-        "z": "e2f7091c.1492b8",
+        "x": 1201.25,
+        "y": 1365.9166564941406,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "2fd5efbb.db2cd8",
-                "a5309500.d76bc"
+                "e398c832.c96cf8",
+                "5465b919.f201f8"
             ]
         ]
     },
     {
-        "id": "2fd5efbb.db2cd8",
+        "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": 1381.75,
-        "y": 1297.8001098632812,
-        "z": "e2f7091c.1492b8",
+        "x": 1365.25,
+        "y": 1362.9167785644531,
+        "z": "fd6341d7.d80b3",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5309500.d76bc",
+        "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' />",
         "comments": "",
-        "x": 1423.75,
-        "y": 1481.8001098632812,
-        "z": "e2f7091c.1492b8",
+        "x": 1407.25,
+        "y": 1546.9167785644531,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "30018cf9.344a24",
+        "id": "d5045cc6.1de7a",
         "type": "outcome",
         "name": "200",
         "xml": "<outcome value='200'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1056.199951171875,
-        "y": 1308.2499389648438,
-        "z": "e2f7091c.1492b8",
+        "x": 1039.699951171875,
+        "y": 1373.3666076660156,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "f7b9ef6.7932f9"
+                "3b5e2ea9.61d282"
             ]
         ]
     },
     {
-        "id": "7de52130.2c5fc",
+        "id": "2beb7d55.e9c492",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1033.199951171875,
-        "y": 1460.2499389648438,
-        "z": "e2f7091c.1492b8",
+        "x": 1016.699951171875,
+        "y": 1525.3666076660156,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "6461eb1d.8fedb4"
+                "887f6ab3.6fe378"
             ]
         ]
     },
     {
-        "id": "d7f1c2ce.8da74",
+        "id": "efea6422.1a8b28",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$service1-status == $service2-status == 200`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 857.75,
-        "y": 1529.599853515625,
-        "z": "e2f7091c.1492b8",
+        "x": 841.25,
+        "y": 1594.7165222167969,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "d0c11e44.eff1b8",
-                "ebfe8068.c9971"
+                "cad7c61d.e2a2d8",
+                "4a80a00e.4cc7a"
             ]
         ]
     },
     {
-        "id": "d0c11e44.eff1b8",
+        "id": "cad7c61d.e2a2d8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1015.75,
-        "y": 1538.599853515625,
-        "z": "e2f7091c.1492b8",
+        "x": 999.25,
+        "y": 1603.7165222167969,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "505e7a53.be6c6c"
+                "bb726b3c.e444e8"
             ]
         ]
     },
     {
-        "id": "505e7a53.be6c6c",
+        "id": "bb726b3c.e444e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1155.75,
-        "y": 1545.599853515625,
-        "z": "e2f7091c.1492b8",
+        "x": 1139.25,
+        "y": 1610.7165222167969,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "2406e71c.d43e8",
-                "37282d8f.acde4a"
+                "f739490d.428058",
+                "b63b3bcb.e95608",
+                "fe0c4836.3d8508",
+                "58672708.482528",
+                "64dca83a.79a788",
+                "d26a3044.53ce7"
             ]
         ]
     },
     {
-        "id": "2406e71c.d43e8",
+        "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\"> ",
         "comments": "",
         "outputs": 1,
-        "x": 1319.75,
-        "y": 1545.599853515625,
-        "z": "e2f7091c.1492b8",
+        "x": 1303.25,
+        "y": 1610.7165222167969,
+        "z": "fd6341d7.d80b3",
         "wires": [
             []
         ]
     },
     {
-        "id": "ebfe8068.c9971",
+        "id": "4a80a00e.4cc7a",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1003.75,
-        "y": 1670.599853515625,
-        "z": "e2f7091c.1492b8",
+        "x": 949.7500152587891,
+        "y": 1965.7165794372559,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "383c08d1.28a08"
+                "fa9da88e.4da0d8"
             ]
         ]
     },
     {
-        "id": "383c08d1.28a08",
+        "id": "fa9da88e.4da0d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1147.75,
-        "y": 1683.599853515625,
-        "z": "e2f7091c.1492b8",
+        "x": 1098.750015258789,
+        "y": 1963.7165794372559,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "495cad00.8d5f24"
+                "a9697233.3edb9"
             ]
         ]
     },
     {
-        "id": "495cad00.8d5f24",
+        "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": 1322.75,
-        "y": 1676.599853515625,
-        "z": "e2f7091c.1492b8",
+        "x": 1276.2500228881836,
+        "y": 1964.2165832519531,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "37282d8f.acde4a",
+        "id": "b63b3bcb.e95608",
         "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": 1337.75,
-        "y": 1626.599853515625,
-        "z": "e2f7091c.1492b8",
+        "x": 1271.2500228881836,
+        "y": 1889.2165803909302,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "70ec6ec4.5ccf08",
+        "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": 1211.5,
-        "y": 1472.3998413085938,
-        "z": "e2f7091c.1492b8",
+        "x": 1195,
+        "y": 1537.5165100097656,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "96d3d87a.161f98",
+        "id": "7df23ffd.b4b17",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 736.4000244140625,
-        "y": 1523.39990234375,
-        "z": "e2f7091c.1492b8",
+        "x": 719.9000244140625,
+        "y": 1588.5165710449219,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "d7f1c2ce.8da74"
+                "efea6422.1a8b28"
             ]
         ]
     },
     {
-        "id": "fb442d76.8c0b1",
+        "id": "54b2f238.cd48bc",
         "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": 1377.6666259765625,
-        "y": 680.6666259765625,
-        "z": "e2f7091c.1492b8",
+        "x": 1361.1666259765625,
+        "y": 745.7832946777344,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "84c6499.61865b8"
+                "ba13f726.ec48a8"
             ]
         ]
     },
     {
-        "id": "84c6499.61865b8",
+        "id": "ba13f726.ec48a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1623.6666259765625,
-        "y": 684.6666259765625,
-        "z": "e2f7091c.1492b8",
+        "x": 1607.1666259765625,
+        "y": 749.7832946777344,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "4427d502.6c96cc"
+                "7f178723.eed2f8"
             ]
         ]
     },
     {
-        "id": "4427d502.6c96cc",
+        "id": "7f178723.eed2f8",
         "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": 1791.6666259765625,
-        "y": 686.6666259765625,
-        "z": "e2f7091c.1492b8",
+        "x": 1775.1666259765625,
+        "y": 751.7832946777344,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "e8836a64.f81ae",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 1398.6666259765625,
-        "y": 756.6666259765625,
-        "z": "e2f7091c.1492b8",
+        "x": 1382.1666259765625,
+        "y": 821.7832946777344,
+        "z": "fd6341d7.d80b3",
         "wires": [
             []
         ]
     },
     {
-        "id": "4d169812.58b88",
+        "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'>",
         "comments": "",
         "outputs": 1,
-        "x": 1324.6666259765625,
-        "y": 1056.666748046875,
-        "z": "e2f7091c.1492b8",
+        "x": 1308.1666259765625,
+        "y": 1121.7834167480469,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "e0ea4817.5936a"
+                "20c8cbec.0b11d4"
             ]
         ]
     },
     {
-        "id": "e0ea4817.5936a",
+        "id": "20c8cbec.0b11d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1569.6666259765625,
-        "y": 1060.666748046875,
-        "z": "e2f7091c.1492b8",
+        "x": 1553.1666259765625,
+        "y": 1125.7834167480469,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "9748df16.f21cf8"
+                "70d195e8.9d4ccc"
             ]
         ]
     },
     {
-        "id": "9748df16.f21cf8",
+        "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": 1718.6666259765625,
-        "y": 1064.666748046875,
-        "z": "e2f7091c.1492b8",
+        "x": 1702.1666259765625,
+        "y": 1129.7834167480469,
+        "z": "fd6341d7.d80b3",
         "wires": []
     },
     {
-        "id": "8f4e881d.558318",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 1327.6666259765625,
-        "y": 1118.666748046875,
-        "z": "e2f7091c.1492b8",
+        "x": 1311.1666259765625,
+        "y": 1183.7834167480469,
+        "z": "fd6341d7.d80b3",
         "wires": [
             []
         ]
     },
     {
-        "id": "9e23ba6e.b8b718",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 1418.6666717529297,
-        "y": 1385.6666717529297,
-        "z": "e2f7091c.1492b8",
+        "x": 1402.1666717529297,
+        "y": 1450.7833404541016,
+        "z": "fd6341d7.d80b3",
         "wires": [
             []
         ]
     },
     {
-        "id": "6461eb1d.8fedb4",
+        "id": "887f6ab3.6fe378",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1130.3333740234375,
-        "y": 1413.3331909179688,
-        "z": "e2f7091c.1492b8",
+        "x": 1113.8333740234375,
+        "y": 1478.4498596191406,
+        "z": "fd6341d7.d80b3",
         "wires": [
             [
-                "70ec6ec4.5ccf08"
+                "35501454.cf543c"
             ]
         ]
+    },
+    {
+        "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",
+        "comments": "",
+        "x": 1297.5000190734863,
+        "y": 1805.0000267028809,
+        "z": "fd6341d7.d80b3",
+        "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",
+        "comments": "",
+        "outputs": 1,
+        "x": 1337.5,
+        "y": 1852.5,
+        "z": "fd6341d7.d80b3",
+        "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",
+        "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": 1525.0000228881836,
+        "y": 1630.0000247955322,
+        "z": "fd6341d7.d80b3",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json b/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json
index 15b2e9cc..1432b74a 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "cb10d6c4.981698",
+        "id": "e3b61acf.d53178",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 170,
-        "y": 107,
-        "z": "477ddea1.f7699",
+        "x": 185,
+        "y": 832.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "63ae4640.f4c188"
+                "4e2007b8.e16458"
             ]
         ]
     },
     {
-        "id": "63ae4640.f4c188",
+        "id": "4e2007b8.e16458",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,1681 +22,1696 @@
         "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": 183,
-        "y": 167,
-        "z": "477ddea1.f7699",
+        "x": 198,
+        "y": 892.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "ccc0be9.d18f84"
+                "19b71169.28fe6f"
             ]
         ]
     },
     {
-        "id": "ccc0be9.d18f84",
+        "id": "19b71169.28fe6f",
         "type": "method",
         "name": "method service-create-tapi",
         "xml": "<method rpc='service-create-tapi' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 203,
-        "y": 247,
-        "z": "477ddea1.f7699",
+        "x": 218,
+        "y": 972.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "9e51a7e2.c96a48"
+                "67e00a4.cbfd6f4"
             ]
         ]
     },
     {
-        "id": "9e51a7e2.c96a48",
+        "id": "67e00a4.cbfd6f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 412.5,
-        "y": 252,
-        "z": "477ddea1.f7699",
+        "x": 427.5,
+        "y": 977.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "3ceef95d.a94976",
-                "e43daa8d.210d18",
-                "30c153d0.f4174c",
-                "a085d0a9.db099",
-                "7cbb8085.aa09",
-                "b68ee0d5.ab2f1",
-                "ce711353.77418",
-                "86957885.24ae98",
-                "52992436.be902c",
-                "ff60ecd.026f51",
-                "ceb8b8b2.ae8198"
+                "6e2532e4.6a345c",
+                "4e62cda.756f234",
+                "7a87fe21.0f22f",
+                "e26a9e37.3f00f",
+                "7ff1b0d3.ad7b6",
+                "e17358f9.eefe38",
+                "cc062ea3.b0027",
+                "3f3fa66c.f6173a",
+                "b3c6d371.40d14",
+                "a68ab8ee.a8c128",
+                "583afef0.9e3f1",
+                "53f4928e.efb2dc"
             ]
         ]
     },
     {
-        "id": "3ceef95d.a94976",
+        "id": "6e2532e4.6a345c",
         "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 create tapi\"/>\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 412,
-        "y": 50,
-        "z": "477ddea1.f7699",
+        "x": 427,
+        "y": 775.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "e43daa8d.210d18",
+        "id": "4e62cda.756f234",
         "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 = $optical-service-create-input.payload.service-aend.port-id'\npfx='db-aend'>",
         "comments": "",
         "outputs": 1,
-        "x": 610.9999389648438,
-        "y": 101.99998474121094,
-        "z": "477ddea1.f7699",
+        "x": 625.9999389648438,
+        "y": 827.4999847412109,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "c6f3bb2.1ae1f48"
+                "69d89830.091358"
             ]
         ]
     },
     {
-        "id": "30c153d0.f4174c",
+        "id": "7a87fe21.0f22f",
         "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 = $optical-service-create-input.payload.service-zend.port-id'\npfx='db-zend'>",
         "comments": "",
         "outputs": 1,
-        "x": 631.9999389648438,
-        "y": 166.99996948242188,
-        "z": "477ddea1.f7699",
+        "x": 646.9999389648438,
+        "y": 892.4999694824219,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "5ed218c5.9a0bc8"
+                "4acab2b3.e0ef5c"
             ]
         ]
     },
     {
-        "id": "c6f3bb2.1ae1f48",
+        "id": "69d89830.091358",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 770.9999389648438,
-        "y": 103.99998474121094,
-        "z": "477ddea1.f7699",
+        "x": 785.9999389648438,
+        "y": 829.4999847412109,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "6a954070.e5ff5"
+                "df7c45e.be06eb8"
             ]
         ]
     },
     {
-        "id": "5ed218c5.9a0bc8",
+        "id": "4acab2b3.e0ef5c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 780.9999389648438,
-        "y": 164.99996948242188,
-        "z": "477ddea1.f7699",
+        "x": 795.9999389648438,
+        "y": 890.4999694824219,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "9ead2d56.36328"
+                "f40d9366.6d7e9"
             ]
         ]
     },
     {
-        "id": "6a954070.e5ff5",
+        "id": "df7c45e.be06eb8",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='aend-node-uuid' value='`$db-aend.pnf-name`' />\n<parameter name='aend-pnf-name' value='`$db-aend.pnf-id`' />\n<parameter name='aend-cep-list' value='`$db-aend.connection-point`' />\n<parameter name='aend-nep' value='`$db-aend.interface-name`' />\n<parameter name='aend-rate' value='`$db-aend.rate`' />\n",
+        "xml": "<set>\n<parameter name='aend-node-uuid' value='`$db-aend.pnf-name`' />\n<parameter name='aend-pnf-name' value='`$db-aend.pnf-id`' />\n<parameter name='aend-cep-list' value='`$db-aend.connection-point`' />\n<parameter name='aend-nep' value='`$db-aend.interface-name`' />\n<parameter name='aend-rate' value='`$db-aend.rate`' />\n<parameter name='esr-id' value='`$db-aend.controller-id`' />\n",
         "comments": "",
-        "x": 936.9999389648438,
-        "y": 104.99996948242188,
-        "z": "477ddea1.f7699",
+        "x": 951.9999389648438,
+        "y": 830.4999694824219,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "9ead2d56.36328",
+        "id": "f40d9366.6d7e9",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-node-uuid' value='`$db-zend.pnf-name`' />\n<parameter name='zend-pnf-name' value='`$db-zend.pnf-id`' />\n<parameter name='zend-cep-list' value='`$db-zend.connection-point`' />\n<parameter name='zend-nep' value='`$db-zend.interface-name`' />\n<parameter name='zend-rate' value='`$db-zend.rate`' />\n",
         "comments": "",
-        "x": 930,
-        "y": 164,
-        "z": "477ddea1.f7699",
+        "x": 945,
+        "y": 889.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "a085d0a9.db099",
+        "id": "e26a9e37.3f00f",
         "type": "execute",
         "name": "execute: read properties",
         "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": 600,
-        "y": 56,
-        "z": "477ddea1.f7699",
+        "x": 615,
+        "y": 781.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "7cbb8085.aa09",
+        "id": "7ff1b0d3.ad7b6",
         "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 = $aend-node-uuid AND\n     p-interface.interface-name = $aend-nep\"\npfx='aend'      local-only='false'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 696,
-        "y": 248,
-        "z": "477ddea1.f7699",
+        "x": 711,
+        "y": 973.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "b68ee0d5.ab2f1",
+        "id": "e17358f9.eefe38",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$aend.network-interface-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 611,
-        "y": 344,
-        "z": "477ddea1.f7699",
+        "x": 626,
+        "y": 1069.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "c6743c18.bbfeb",
-                "d6efe253.7e8f"
+                "e5d8d6f6.cf0a68",
+                "79710b28.d915f4"
             ]
         ]
     },
     {
-        "id": "c6743c18.bbfeb",
+        "id": "e5d8d6f6.cf0a68",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='UNI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 736,
-        "y": 293,
-        "z": "477ddea1.f7699",
+        "x": 751,
+        "y": 1018.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "cdb5c5b5.9048e8"
+                "cc49f496.ddb3f8"
             ]
         ]
     },
     {
-        "id": "131024c8.c2705b",
+        "id": "95d30723.5b4378",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-cep' value='`$aend-cep-list`' />\n<parameter name='aend-new' value='' />\n<parameter name='aend-new-rate' value='0' />\n",
         "comments": "",
-        "x": 1111,
-        "y": 142,
-        "z": "477ddea1.f7699",
+        "x": 1126,
+        "y": 867.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "40b15a3.dac47a4",
+        "id": "12ce4ec6.788011",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$aend-cep-list`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 1143,
-        "y": 384,
-        "z": "477ddea1.f7699",
+        "x": 1158,
+        "y": 1109.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "cdb5c5b5.9048e8",
+        "id": "cc49f496.ddb3f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 874,
-        "y": 292,
-        "z": "477ddea1.f7699",
+        "x": 889,
+        "y": 1017.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "131024c8.c2705b",
-                "b290b92c.1e7b58",
-                "b86f369c.e3ed78"
+                "95d30723.5b4378",
+                "d4d34a7e.414498",
+                "76ba49d4.9adfb8"
             ]
         ]
     },
     {
-        "id": "d2686a37.db5528",
+        "id": "981e7a8d.9b40d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 894,
-        "y": 407,
-        "z": "477ddea1.f7699",
+        "x": 909,
+        "y": 1132.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "40b15a3.dac47a4",
-                "7a067107.2ec2",
-                "ab1ab8d.88c2948",
-                "75a9a4ed.ec8d2c"
+                "12ce4ec6.788011",
+                "db706c7f.f5413",
+                "c523271d.c23728",
+                "57dafe06.e772c"
             ]
         ]
     },
     {
-        "id": "4fdc9aa0.b29954",
+        "id": "94c3ff81.93f32",
         "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.cep.details.url + $param-prefix[$idx]`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"aend-cep-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": 1229.111083984375,
-        "y": 460.22222900390625,
-        "z": "477ddea1.f7699",
+        "x": 1244.111083984375,
+        "y": 1185.7222290039062,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "c21f9ebf.94222",
-                "c3ad189d.190788"
+                "b6ab9975.3588c8",
+                "1b8ebe74.b20472"
             ]
         ]
     },
     {
-        "id": "c21f9ebf.94222",
+        "id": "b6ab9975.3588c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1342.77779006958,
-        "y": 422.0000057220459,
-        "z": "477ddea1.f7699",
+        "x": 1357.77779006958,
+        "y": 1147.500005722046,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "f0cb2de3.028b2"
+                "3ab3912f.f30dde"
             ]
         ]
     },
     {
-        "id": "c3ad189d.190788",
+        "id": "1b8ebe74.b20472",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1352.2221794128418,
-        "y": 491.7777805328369,
-        "z": "477ddea1.f7699",
+        "x": 1367.2221794128418,
+        "y": 1217.277780532837,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "27f9e6a9.a5da2a"
+                "63b9c2ce.613ddc"
             ]
         ]
     },
     {
-        "id": "f0cb2de3.028b2",
+        "id": "3ab3912f.f30dde",
         "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=\"Failed to get Aend cep details\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1500,
-        "y": 422,
-        "z": "477ddea1.f7699",
+        "x": 1515,
+        "y": 1147.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "9994476.f537bb8",
+        "id": "de2bd7fe.4fa488",
         "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=\"Sucessfully retrieved aend cep\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1639,
-        "y": 444,
-        "z": "477ddea1.f7699",
+        "x": 1654,
+        "y": 1169.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a067107.2ec2",
+        "id": "db706c7f.f5413",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end='`$param-prefix_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1086,
-        "y": 433,
-        "z": "477ddea1.f7699",
+        "x": 1101,
+        "y": 1158.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "6d62527a.1e40bc"
+                "589b4306.69c66c"
             ]
         ]
     },
     {
-        "id": "27f9e6a9.a5da2a",
+        "id": "63b9c2ce.613ddc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1490,
-        "y": 494,
-        "z": "477ddea1.f7699",
+        "x": 1505,
+        "y": 1219.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "9994476.f537bb8",
-                "5de58fdb.3dc18"
+                "de2bd7fe.4fa488",
+                "b9f0b7ab.7d0788"
             ]
         ]
     },
     {
-        "id": "8b835dad.6e468",
+        "id": "b2429a15.648f18",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2096.5552864074707,
-        "y": 543.1110572814941,
-        "z": "477ddea1.f7699",
+        "x": 2111.5552864074707,
+        "y": 1268.6110572814941,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "f03d8eb8.9e89b",
+        "id": "c901f232.2c828",
         "type": "set",
         "name": "set aend-local-id",
         "xml": "<set>\n<parameter name='aend-local-id' value=\"`$aend-local-id + '/OTN/' + $aend-pnf-name + '/' + $aend-cep-response.sip[0].name[2].value + ':' + $aend-cep-response.sip[0].name[1].value`\" />\n<parameter name='aend-cep' value='`$param-prefix[$idx]`'/>\n\n\n",
         "comments": "",
-        "x": 2124.3332290649414,
-        "y": 472.1111087799072,
-        "z": "477ddea1.f7699",
+        "x": 2139.3332290649414,
+        "y": 1197.6111087799072,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "a19a25b4.a7fc58",
+        "id": "137becd1.5df6d3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1918,
-        "y": 509,
-        "z": "477ddea1.f7699",
+        "x": 1933,
+        "y": 1234.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "f03d8eb8.9e89b",
-                "8b835dad.6e468"
+                "c901f232.2c828",
+                "b2429a15.648f18"
             ]
         ]
     },
     {
-        "id": "6d62527a.1e40bc",
+        "id": "589b4306.69c66c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1095,
-        "y": 494,
-        "z": "477ddea1.f7699",
+        "x": 1110,
+        "y": 1219.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "4fdc9aa0.b29954"
+                "94c3ff81.93f32"
             ]
         ]
     },
     {
-        "id": "ab1ab8d.88c2948",
+        "id": "c523271d.c23728",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value='' />\n<parameter name='aend-local-id' value='' />\n\n",
         "comments": "",
-        "x": 1062,
-        "y": 337,
-        "z": "477ddea1.f7699",
+        "x": 1077,
+        "y": 1062.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "ce711353.77418",
+        "id": "cc062ea3.b0027",
         "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 = $zend-node-uuid AND\n     p-interface.interface-name = $zend-nep\"\npfx='zend'      local-only='false'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 715,
-        "y": 790,
-        "z": "477ddea1.f7699",
+        "x": 730,
+        "y": 1515.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "86957885.24ae98",
+        "id": "3f3fa66c.f6173a",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$zend.network-interface-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 484,
-        "y": 1139,
-        "z": "477ddea1.f7699",
+        "x": 499,
+        "y": 1864.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "2dd9facb.4d9096",
-                "9f7e7624.f487d8"
+                "26907dac.2c8962",
+                "6b2ab5da.9e65dc"
             ]
         ]
     },
     {
-        "id": "2dd9facb.4d9096",
+        "id": "26907dac.2c8962",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='UNI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 610,
-        "y": 1059,
-        "z": "477ddea1.f7699",
+        "x": 625,
+        "y": 1784.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "70ab075.7054cf8"
+                "b896134c.4d7c6"
             ]
         ]
     },
     {
-        "id": "2cf44710.442d88",
+        "id": "a887b962.a85538",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-cep' value='`$zend-cep-list`' />\n<parameter name='zend-new' value='' />\n<parameter name='zend-new-rate' value='0' />\n",
         "comments": "",
-        "x": 1031,
-        "y": 780,
-        "z": "477ddea1.f7699",
+        "x": 1046,
+        "y": 1505.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "11c54622.c031aa",
+        "id": "b612ac70.544c8",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$zend-cep-list`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/> ",
         "comments": "",
         "outputs": 1,
-        "x": 982,
-        "y": 1199,
-        "z": "477ddea1.f7699",
+        "x": 997,
+        "y": 1924.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "70ab075.7054cf8",
+        "id": "b896134c.4d7c6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 890,
-        "y": 838,
-        "z": "477ddea1.f7699",
+        "x": 905,
+        "y": 1563.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "2cf44710.442d88",
-                "cee2aa19.600e38",
-                "7c2ba1f9.81021"
+                "a887b962.a85538",
+                "3d1b5ef9.72faf2",
+                "ae0f4e41.69868"
             ]
         ]
     },
     {
-        "id": "a49ef364.fd7db",
+        "id": "4c1c4885.e5c558",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 772,
-        "y": 1256,
-        "z": "477ddea1.f7699",
+        "x": 787,
+        "y": 1981.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "11c54622.c031aa",
-                "5bdbd1f1.43aa3",
-                "72f7503a.affea",
-                "54bcccf0.aad274"
+                "b612ac70.544c8",
+                "a14476ab.fb69e8",
+                "e1a333de.1775c",
+                "2e50f406.0834dc"
             ]
         ]
     },
     {
-        "id": "5bdbd1f1.43aa3",
+        "id": "a14476ab.fb69e8",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value='' />\n<parameter name='zend-local-id' value='' />\n",
         "comments": "",
-        "x": 983,
-        "y": 1147,
-        "z": "477ddea1.f7699",
+        "x": 998,
+        "y": 1872.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "d6efe253.7e8f",
+        "id": "79710b28.d915f4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 748,
-        "y": 409,
-        "z": "477ddea1.f7699",
+        "x": 763,
+        "y": 1134.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "d2686a37.db5528"
+                "981e7a8d.9b40d8"
             ]
         ]
     },
     {
-        "id": "9f7e7624.f487d8",
+        "id": "6b2ab5da.9e65dc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 606,
-        "y": 1254,
-        "z": "477ddea1.f7699",
+        "x": 621,
+        "y": 1979.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "a49ef364.fd7db"
+                "4c1c4885.e5c558"
             ]
         ]
     },
     {
-        "id": "52992436.be902c",
+        "id": "b3c6d371.40d14",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/optical-service-create-tapi.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$controller-ip + '/cxf/tapi/v2/connectivities/tapi-services'`\"/>\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"POST\"/>\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": 223.00006103515625,
-        "y": 1580,
-        "z": "477ddea1.f7699",
+        "x": 238.00006103515625,
+        "y": 2305.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "807d3a9b.b39f98",
-                "4ca35ad.57ba6a4"
+                "b68268dd.2641e8",
+                "704b92ea.ae0bfc"
             ]
         ]
     },
     {
-        "id": "807d3a9b.b39f98",
+        "id": "b68268dd.2641e8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 364.00006103515625,
-        "y": 1528,
-        "z": "477ddea1.f7699",
+        "x": 379.00006103515625,
+        "y": 2253.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "c9f09c9a.c5b34"
+                "7e73b171.f5dcc"
             ]
         ]
     },
     {
-        "id": "4ca35ad.57ba6a4",
+        "id": "704b92ea.ae0bfc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 378.00006103515625,
-        "y": 1642,
-        "z": "477ddea1.f7699",
+        "x": 393.00006103515625,
+        "y": 2367.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "2378e9dd.60d396"
+                "b298b779.8e8f08"
             ]
         ]
     },
     {
-        "id": "c9f09c9a.c5b34",
+        "id": "7e73b171.f5dcc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 529.0000610351562,
-        "y": 1527,
-        "z": "477ddea1.f7699",
+        "x": 544.0000610351562,
+        "y": 2252.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "f18f6836.1d4108"
+                "58e61928.c20cd8"
             ]
         ]
     },
     {
-        "id": "2378e9dd.60d396",
+        "id": "b298b779.8e8f08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 554.0000610351562,
-        "y": 1642,
-        "z": "477ddea1.f7699",
+        "x": 569.0000610351562,
+        "y": 2367.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "70e50a50.c3ff54",
-                "579d26d3.591e88",
-                "750b8813.7e3ec8",
-                "438684f8.c804ec",
-                "b5a7e704.c626d8",
-                "59ec667.1ec9998"
+                "95903f39.6729d",
+                "7e480b79.0c9e94",
+                "e447101b.3a99d",
+                "ead868a6.12c838",
+                "766aa235.2a8e3c",
+                "a3841f37.73a11"
             ]
         ]
     },
     {
-        "id": "f18f6836.1d4108",
+        "id": "58e61928.c20cd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Service creation failed for'+ ':' + $optical-service-create-input.payload.service-name`\" />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 721.0000610351562,
-        "y": 1528,
-        "z": "477ddea1.f7699",
+        "x": 736.0000610351562,
+        "y": 2253.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "98706095.76a01",
+        "id": "894b6cc6.e224",
         "type": "call",
         "name": "call",
         "xml": "<call module='optical-service' rpc='success-aai-update-tapi' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1267,
-        "y": 2013,
-        "z": "477ddea1.f7699",
+        "x": 1282,
+        "y": 2738.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ff60ecd.026f51",
+        "id": "a68ab8ee.a8c128",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='service-name' value=\"`$optical-service-create-input.payload.service-name`\" />\n<parameter name='svc-action' value=\"CREATE\" />\n",
+        "xml": "<set>\n<parameter name='service-name' value=\"`$optical-service-create-input.payload.service-name +'_' + $new-esr[2]`\"/>\n<parameter name='svc-action' value=\"CREATE\" />\n",
         "comments": "",
-        "x": 323,
-        "y": 1382,
-        "z": "477ddea1.f7699",
+        "x": 338,
+        "y": 2107.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "ceb8b8b2.ae8198",
+        "id": "583afef0.9e3f1",
         "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=\"A end local-id\"/>\n<parameter name=\"field2\" value=\"`$aend-local-id`\"/>\n<parameter name=\"field3\" value=\"Z end local-id\"/>\n<parameter name=\"field4\" value=\"`$zend-local-id`\"/>\n<parameter name=\"field5\" value=\"Service name\"/>\n<parameter name=\"field6\" value=\"`$service-name`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 287,
-        "y": 1465,
-        "z": "477ddea1.f7699",
+        "x": 302,
+        "y": 2190.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4f3d4cb.d51068",
+        "id": "3fc62d83.ac6362",
         "type": "for",
         "name": "for",
         "xml": "<for index='idl' start='0' end='`$param-prefix1_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1254,
-        "y": 1501,
-        "z": "477ddea1.f7699",
+        "x": 1269,
+        "y": 2226.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "29ec1f.599403e2"
+                "b7378018.3878b"
             ]
         ]
     },
     {
-        "id": "abf6e183.cf7b",
+        "id": "83062bca.729078",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new + $param-prefix1[$idl]`\" />\n",
         "comments": "",
-        "x": 1706,
-        "y": 1432,
-        "z": "477ddea1.f7699",
+        "x": 1721,
+        "y": 2157.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "29ec1f.599403e2",
+        "id": "b7378018.3878b",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$idl`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1389,
-        "y": 1502,
-        "z": "477ddea1.f7699",
+        "x": 1404,
+        "y": 2227.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "7815f59.b48cf0c",
-                "3a3a667b.eb736a",
-                "31a716b1.aadeaa"
+                "5946864.461ea78",
+                "ef8534ba.5d85f8",
+                "b5ab7497.df0258"
             ]
         ]
     },
     {
-        "id": "7815f59.b48cf0c",
+        "id": "5946864.461ea78",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='`$param-prefix1_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1569,
-        "y": 1434,
-        "z": "477ddea1.f7699",
+        "x": 1584,
+        "y": 2159.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "abf6e183.cf7b"
+                "83062bca.729078"
             ]
         ]
     },
     {
-        "id": "3a3a667b.eb736a",
+        "id": "ef8534ba.5d85f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1576,
-        "y": 1509,
-        "z": "477ddea1.f7699",
+        "x": 1591,
+        "y": 2234.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "53f306dd.3c4f48"
+                "11e469f8.d89bc6"
             ]
         ]
     },
     {
-        "id": "53f306dd.3c4f48",
+        "id": "11e469f8.d89bc6",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new + $param-prefix1[$idl] + ','`\" />\n",
         "comments": "",
-        "x": 1732,
-        "y": 1511,
-        "z": "477ddea1.f7699",
+        "x": 1747,
+        "y": 2236.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "31a716b1.aadeaa",
+        "id": "b5ab7497.df0258",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='`$idk`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1560,
-        "y": 1569,
-        "z": "477ddea1.f7699",
+        "x": 1575,
+        "y": 2294.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "f6272db.5d44ad"
+                "77a66da8.5a9f24"
             ]
         ]
     },
     {
-        "id": "f6272db.5d44ad",
+        "id": "77a66da8.5a9f24",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value='`$zend-new`' />\n",
         "comments": "",
-        "x": 1737,
-        "y": 1567,
-        "z": "477ddea1.f7699",
+        "x": 1752,
+        "y": 2292.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "579d26d3.591e88",
+        "id": "7e480b79.0c9e94",
         "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": 853.2222900390625,
-        "y": 1708.666748046875,
-        "z": "477ddea1.f7699",
+        "x": 868.2222900390625,
+        "y": 2434.166748046875,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "70e50a50.c3ff54",
+        "id": "95903f39.6729d",
         "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": 871,
-        "y": 1642,
-        "z": "477ddea1.f7699",
+        "x": 886,
+        "y": 2367.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "b290b92c.1e7b58",
+        "id": "d4d34a7e.414498",
         "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=\"Aend uni\"/>\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1114,
-        "y": 206,
-        "z": "477ddea1.f7699",
+        "x": 1129,
+        "y": 931.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "cee2aa19.600e38",
+        "id": "3d1b5ef9.72faf2",
         "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=\"Zend uni\"/>\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1050,
-        "y": 827,
-        "z": "477ddea1.f7699",
+        "x": 1065,
+        "y": 1552.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "750b8813.7e3ec8",
+        "id": "e447101b.3a99d",
         "type": "save",
         "name": "save 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) 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 , null );\"> ",
         "comments": "",
         "outputs": 1,
-        "x": 873,
-        "y": 1584,
-        "z": "477ddea1.f7699",
+        "x": 888,
+        "y": 2309.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "20d16b37.4f5834",
+        "id": "d97ea600.6b8a38",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1789,
-        "y": 477,
-        "z": "477ddea1.f7699",
+        "x": 1804,
+        "y": 1202.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "a19a25b4.a7fc58"
+                "137becd1.5df6d3"
             ]
         ]
     },
     {
-        "id": "c356252d.5683a8",
+        "id": "3ec46408.bcd4fc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1818.222116470337,
-        "y": 604.3333568572998,
-        "z": "477ddea1.f7699",
+        "x": 1833.222116470337,
+        "y": 1329.8333568572998,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "741c9f44.5e3af"
+                "86e280c3.297fa"
             ]
         ]
     },
     {
-        "id": "741c9f44.5e3af",
+        "id": "86e280c3.297fa",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='No service interface points could be found for A end ' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 1962.6666259765625,
-        "y": 604.3333129882812,
-        "z": "477ddea1.f7699",
+        "x": 1977.6666259765625,
+        "y": 1329.8333129882812,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "438684f8.c804ec",
+        "id": "ead868a6.12c838",
         "type": "save",
         "name": "save service aai",
         "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/' + $aend-node-uuid + '/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=\"`$aend-node-uuid`\" /> \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/' + $zend-node-uuid + '/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=\"`$zend-node-uuid`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 761.9999389648438,
-        "y": 1829.111083984375,
-        "z": "477ddea1.f7699",
+        "x": 776.9999389648438,
+        "y": 2554.611083984375,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5a7e704.c626d8",
+        "id": "766aa235.2a8e3c",
         "type": "save",
         "name": "save",
         "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='ODU' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 754.9999389648438,
-        "y": 1769,
-        "z": "477ddea1.f7699",
+        "x": 769.9999389648438,
+        "y": 2494.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "b86f369c.e3ed78",
+        "id": "76ba49d4.9adfb8",
         "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.cep.details.url + $aend-cep`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"aend-cep-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": 1112,
-        "y": 267,
-        "z": "477ddea1.f7699",
+        "x": 1127,
+        "y": 992.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "112c1c.b3e563e4",
-                "aec0582d.cd7cc8"
+                "40b3b681.860668",
+                "75209286.ddccec"
             ]
         ]
     },
     {
-        "id": "112c1c.b3e563e4",
+        "id": "40b3b681.860668",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1270,
-        "y": 227,
-        "z": "477ddea1.f7699",
+        "x": 1285,
+        "y": 952.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "c51550d7.c3d1f"
+                "d54f33c1.e2caf"
             ]
         ]
     },
     {
-        "id": "aec0582d.cd7cc8",
+        "id": "75209286.ddccec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1279.4443893432617,
-        "y": 296.777774810791,
-        "z": "477ddea1.f7699",
+        "x": 1294.4443893432617,
+        "y": 1022.277774810791,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "4850f247.c34dcc"
+                "7c37bdb9.346234"
             ]
         ]
     },
     {
-        "id": "c51550d7.c3d1f",
+        "id": "d54f33c1.e2caf",
         "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=\"Failed to get Aend cep details\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1427.22220993042,
-        "y": 226.9999942779541,
-        "z": "477ddea1.f7699",
+        "x": 1442.22220993042,
+        "y": 952.4999942779541,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "4850f247.c34dcc",
+        "id": "7c37bdb9.346234",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1445.22216796875,
-        "y": 295,
-        "z": "477ddea1.f7699",
+        "x": 1460.22216796875,
+        "y": 1020.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "d78c4eb5.bbc8d"
+                "a5c2da19.ce3ea8"
             ]
         ]
     },
     {
-        "id": "d78c4eb5.bbc8d",
+        "id": "a5c2da19.ce3ea8",
         "type": "set",
         "name": "set aend-local-id",
         "xml": "<set>\n<parameter name='aend-local-id' value=\"`'/OTN/' + $aend-pnf-name + '/' + $aend-cep-response.sip[0].name[2].value + ':' + $aend-cep-response.sip[0].name[1].value`\" />\n\n\n",
         "comments": "",
-        "x": 1639,
-        "y": 295,
-        "z": "477ddea1.f7699",
+        "x": 1654,
+        "y": 1020.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "39a4154d.b828aa",
+        "id": "983ec083.ff592",
         "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.cep.details.url + $param-prefix1[$idk]`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"zend-cep-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": 1337,
-        "y": 1253,
-        "z": "477ddea1.f7699",
+        "x": 1352,
+        "y": 1978.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "d0d69a7e.2c9698",
-                "659dd71a.78bb68"
+                "d02f87db.d6d7a8",
+                "22c182d6.7f01de"
             ]
         ]
     },
     {
-        "id": "d0d69a7e.2c9698",
+        "id": "d02f87db.d6d7a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1458,
-        "y": 1214,
-        "z": "477ddea1.f7699",
+        "x": 1473,
+        "y": 1939.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "2cf98134.38344e"
+                "c252b261.b7497"
             ]
         ]
     },
     {
-        "id": "659dd71a.78bb68",
+        "id": "22c182d6.7f01de",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1476,
-        "y": 1308,
-        "z": "477ddea1.f7699",
+        "x": 1491,
+        "y": 2033.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "ad8cdb39.1a9318"
+                "a4023511.b433b8"
             ]
         ]
     },
     {
-        "id": "2cf98134.38344e",
+        "id": "c252b261.b7497",
         "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=\"Failed to get zend cep details\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1606,
-        "y": 1211,
-        "z": "477ddea1.f7699",
+        "x": 1621,
+        "y": 1936.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "431f9c15.b4bd64",
+        "id": "cd0d0a5b.6f8818",
         "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=\"Sucessfully retrieved zend cep\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1775,
-        "y": 1261,
-        "z": "477ddea1.f7699",
+        "x": 1790,
+        "y": 1986.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "72f7503a.affea",
+        "id": "e1a333de.1775c",
         "type": "for",
         "name": "for",
         "xml": "<for index='idk' start='0' end='`$param-prefix1_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 983,
-        "y": 1254,
-        "z": "477ddea1.f7699",
+        "x": 998,
+        "y": 1979.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "b262046c.5382f8"
+                "b7f1e1f4.d9a4d"
             ]
         ]
     },
     {
-        "id": "ad8cdb39.1a9318",
+        "id": "a4023511.b433b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1631,
-        "y": 1311,
-        "z": "477ddea1.f7699",
+        "x": 1646,
+        "y": 2036.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "431f9c15.b4bd64",
-                "29ec6fee.052a8"
+                "cd0d0a5b.6f8818",
+                "e9bb3958.4a7f98"
             ]
         ]
     },
     {
-        "id": "29ec6fee.052a8",
+        "id": "e9bb3958.4a7f98",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$zend-cep-response.sip[0].name[2].value == $optical-service-create-input.payload.service-rate`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1785,
-        "y": 1325,
-        "z": "477ddea1.f7699",
+        "x": 1800,
+        "y": 2050.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "a5051a40.75b1d8",
-                "3532c7e2.141ac8"
+                "e42e31a4.60821",
+                "97ee1d35.6e5eb"
             ]
         ]
     },
     {
-        "id": "b262046c.5382f8",
+        "id": "b7f1e1f4.d9a4d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1135,
-        "y": 1256,
-        "z": "477ddea1.f7699",
+        "x": 1150,
+        "y": 1981.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "39a4154d.b828aa"
+                "983ec083.ff592"
             ]
         ]
     },
     {
-        "id": "416d05b6.84daac",
+        "id": "c52f4a5.23b30b8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2173,
-        "y": 1336,
-        "z": "477ddea1.f7699",
+        "x": 2188,
+        "y": 2061.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "e59b1a2d.4329a8",
+        "id": "df4f7ec9.f91d1",
         "type": "set",
         "name": "set zend-local-id",
         "xml": "<set>\n<parameter name='zend-local-id' value=\"`$zend-local-id + '/OTN/' + $zend-pnf-name + '/' + $zend-cep-response.sip[0].name[2].value + ':' + $zend-cep-response.sip[0].name[1].value`\" />\n<parameter name='zend-cep' value='`$param-prefix1[$idk]`'/>\n\n\n\n",
         "comments": "",
-        "x": 2206,
-        "y": 1226,
-        "z": "477ddea1.f7699",
+        "x": 2221,
+        "y": 1951.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "60931989.6a1588",
+        "id": "e9430c74.d49c3",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2055,
-        "y": 1282,
-        "z": "477ddea1.f7699",
+        "x": 2070,
+        "y": 2007.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "e59b1a2d.4329a8",
-                "416d05b6.84daac"
+                "df4f7ec9.f91d1",
+                "c52f4a5.23b30b8"
             ]
         ]
     },
     {
-        "id": "a5051a40.75b1d8",
+        "id": "e42e31a4.60821",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1923.9998779296875,
-        "y": 1286.6666259765625,
-        "z": "477ddea1.f7699",
+        "x": 1938.9998779296875,
+        "y": 2012.1666259765625,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "60931989.6a1588"
+                "e9430c74.d49c3"
             ]
         ]
     },
     {
-        "id": "3532c7e2.141ac8",
+        "id": "97ee1d35.6e5eb",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1923.8887939453125,
-        "y": 1391.1109619140625,
-        "z": "477ddea1.f7699",
+        "x": 1938.8887939453125,
+        "y": 2116.6109619140625,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "1671dd0d.761f93"
+                "bb25bd92.102bc"
             ]
         ]
     },
     {
-        "id": "1671dd0d.761f93",
+        "id": "bb25bd92.102bc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='No service interface points could be found for Z end ' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
         "comments": "",
-        "x": 2103.22216796875,
-        "y": 1394.111083984375,
-        "z": "477ddea1.f7699",
+        "x": 2118.22216796875,
+        "y": 2119.611083984375,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "54bcccf0.aad274",
+        "id": "2e50f406.0834dc",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$param-prefix1_length == 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 937,
-        "y": 1406,
-        "z": "477ddea1.f7699",
+        "x": 952,
+        "y": 2131.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "52610222.06045c",
-                "5efd31c6.33b2f"
+                "ed15bef0.d465e",
+                "ed35c503.0fb518"
             ]
         ]
     },
     {
-        "id": "52610222.06045c",
+        "id": "ed15bef0.d465e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1077,
-        "y": 1360,
-        "z": "477ddea1.f7699",
+        "x": 1092,
+        "y": 2085.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "ee5535d1.239b88"
+                "815e3884.b4c998"
             ]
         ]
     },
     {
-        "id": "ee5535d1.239b88",
+        "id": "815e3884.b4c998",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new`\" />\n",
         "comments": "",
-        "x": 1212,
-        "y": 1360,
-        "z": "477ddea1.f7699",
+        "x": 1227,
+        "y": 2085.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "5efd31c6.33b2f",
+        "id": "ed35c503.0fb518",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1079,
-        "y": 1500,
-        "z": "477ddea1.f7699",
+        "x": 1094,
+        "y": 2225.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "a4f3d4cb.d51068"
+                "3fc62d83.ac6362"
             ]
         ]
     },
     {
-        "id": "5de58fdb.3dc18",
+        "id": "b9f0b7ab.7d0788",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$aend-cep-response.sip[0].name[2].value == $optical-service-create-input.payload.service-rate`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648,
-        "y": 512,
-        "z": "477ddea1.f7699",
+        "x": 1663,
+        "y": 1237.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "20d16b37.4f5834",
-                "c356252d.5683a8"
+                "d97ea600.6b8a38",
+                "3ec46408.bcd4fc"
             ]
         ]
     },
     {
-        "id": "75a9a4ed.ec8d2c",
+        "id": "57dafe06.e772c",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$param-prefix_length == 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1067,
-        "y": 561,
-        "z": "477ddea1.f7699",
+        "x": 1082,
+        "y": 1286.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "331c057.f8ccefa",
-                "4b64ca6e.49b0f4"
+                "848a90d5.bcd26",
+                "40c58163.4afec"
             ]
         ]
     },
     {
-        "id": "331c057.f8ccefa",
+        "id": "848a90d5.bcd26",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1221,
-        "y": 562,
-        "z": "477ddea1.f7699",
+        "x": 1236,
+        "y": 1287.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "7e9fbe10.9124"
+                "750a8b4d.400d94"
             ]
         ]
     },
     {
-        "id": "7e9fbe10.9124",
+        "id": "750a8b4d.400d94",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new`\" />\n",
         "comments": "",
-        "x": 1383,
-        "y": 562,
-        "z": "477ddea1.f7699",
+        "x": 1398,
+        "y": 1287.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "4b64ca6e.49b0f4",
+        "id": "40c58163.4afec",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1225,
-        "y": 613,
-        "z": "477ddea1.f7699",
+        "x": 1240,
+        "y": 1338.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "6847867.f7a9678"
+                "67ad38a5.5ca3b8"
             ]
         ]
     },
     {
-        "id": "6847867.f7a9678",
+        "id": "67ad38a5.5ca3b8",
         "type": "for",
         "name": "for",
         "xml": "<for index='idy' start='0' end='`$param-prefix_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1349,
-        "y": 637,
-        "z": "477ddea1.f7699",
+        "x": 1364,
+        "y": 1362.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "5a0e3964.160d08"
+                "71c769ba.e6ed98"
             ]
         ]
     },
     {
-        "id": "ed323941.b82938",
+        "id": "cb465dd8.92a9",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-new + $param-prefix[$idy]`\" />\n",
         "comments": "",
-        "x": 1799,
-        "y": 653,
-        "z": "477ddea1.f7699",
+        "x": 1814,
+        "y": 1378.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "5a0e3964.160d08",
+        "id": "71c769ba.e6ed98",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$idy`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1514,
-        "y": 702,
-        "z": "477ddea1.f7699",
+        "x": 1529,
+        "y": 1427.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "b4f9d607.d62178",
-                "d260ee79.5c8ba",
-                "df466256.46eeb"
+                "ff55a68b.aa49b8",
+                "b3e4787b.39fbf8",
+                "1fc97483.5bad7b"
             ]
         ]
     },
     {
-        "id": "b4f9d607.d62178",
+        "id": "ff55a68b.aa49b8",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='`$param-prefix_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1656,
-        "y": 653,
-        "z": "477ddea1.f7699",
+        "x": 1671,
+        "y": 1378.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "ed323941.b82938"
+                "cb465dd8.92a9"
             ]
         ]
     },
     {
-        "id": "d260ee79.5c8ba",
+        "id": "b3e4787b.39fbf8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1686,
-        "y": 727,
-        "z": "477ddea1.f7699",
+        "x": 1701,
+        "y": 1452.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "2635ec82.339914"
+                "e5e9e952.ca39b8"
             ]
         ]
     },
     {
-        "id": "2635ec82.339914",
+        "id": "e5e9e952.ca39b8",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-new + $param-prefix[$idy] + ','`\" />\n",
         "comments": "",
-        "x": 1803,
-        "y": 737,
-        "z": "477ddea1.f7699",
+        "x": 1818,
+        "y": 1462.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "df466256.46eeb",
+        "id": "1fc97483.5bad7b",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='`$idx`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1665,
-        "y": 808,
-        "z": "477ddea1.f7699",
+        "x": 1680,
+        "y": 1533.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "5f13154d.62bb0c"
+                "914db74a.878c08"
             ]
         ]
     },
     {
-        "id": "5f13154d.62bb0c",
+        "id": "914db74a.878c08",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value='`$aend-new`' />\n",
         "comments": "",
-        "x": 1803,
-        "y": 804,
-        "z": "477ddea1.f7699",
+        "x": 1818,
+        "y": 1529.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "7c2ba1f9.81021",
+        "id": "ae0f4e41.69868",
         "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.cep.details.url + $zend-cep`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"zend-cep-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": 1032,
-        "y": 913,
-        "z": "477ddea1.f7699",
+        "x": 1047,
+        "y": 1638.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "aefead1b.dd11a",
-                "e40dc66d.cd39c8"
+                "a3174939.084828",
+                "74087af2.acedd4"
             ]
         ]
     },
     {
-        "id": "aefead1b.dd11a",
+        "id": "a3174939.084828",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1192,
-        "y": 872,
-        "z": "477ddea1.f7699",
+        "x": 1207,
+        "y": 1597.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "15d190bf.2feb7f"
+                "1b9a1599.ef016a"
             ]
         ]
     },
     {
-        "id": "e40dc66d.cd39c8",
+        "id": "74087af2.acedd4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1201.4443893432617,
-        "y": 941.777774810791,
-        "z": "477ddea1.f7699",
+        "x": 1216.4443893432617,
+        "y": 1667.277774810791,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "570b2f4e.56f7b"
+                "8f5ec5c2.09dbf8"
             ]
         ]
     },
     {
-        "id": "15d190bf.2feb7f",
+        "id": "1b9a1599.ef016a",
         "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=\"Failed to get Aend cep details\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1349.22220993042,
-        "y": 871.9999942779541,
-        "z": "477ddea1.f7699",
+        "x": 1364.22220993042,
+        "y": 1597.499994277954,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             []
         ]
     },
     {
-        "id": "570b2f4e.56f7b",
+        "id": "8f5ec5c2.09dbf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1364.22216796875,
-        "y": 941,
-        "z": "477ddea1.f7699",
+        "x": 1379.22216796875,
+        "y": 1666.5,
+        "z": "eeae8fa4.7aafe",
         "wires": [
             [
-                "6187c647.5929c8"
+                "b7515447.744b58"
             ]
         ]
     },
     {
-        "id": "6187c647.5929c8",
+        "id": "b7515447.744b58",
         "type": "set",
         "name": "set zend-local-id",
         "xml": "<set>\n<parameter name='zend-local-id' value=\"`'/OTN/' + $zend-pnf-name + '/' + $zend-cep-response.sip[0].name[2].value + ':' + $zend-cep-response.sip[0].name[1].value`\" />\n\n\n",
         "comments": "",
-        "x": 1542,
-        "y": 939,
-        "z": "477ddea1.f7699",
+        "x": 1557,
+        "y": 1664.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
     },
     {
-        "id": "59ec667.1ec9998",
+        "id": "a3841f37.73a11",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",
         "comments": "",
-        "x": 697,
-        "y": 1886,
-        "z": "477ddea1.f7699",
+        "x": 712,
+        "y": 2611.5,
+        "z": "eeae8fa4.7aafe",
         "wires": []
+    },
+    {
+        "id": "53f4928e.efb2dc",
+        "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": 370.00000762939453,
+        "y": 1995.0000295639038,
+        "z": "eeae8fa4.7aafe",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
index 039d9ee2..eb7a20c6 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
@@ -60,7 +60,10 @@
         "z": "27c6cdb6.f4809a",
         "wires": [
             [
-                "4dd86cf3.942054"
+                "4dd86cf3.942054",
+                "1a3fcf2c.299b01",
+                "18e76f04.abb6f9",
+                "4f7b81dc.d4d6f"
             ]
         ]
     },
@@ -104,8 +107,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 873.5666656494141,
-        "y": 276,
+        "x": 882.566650390625,
+        "y": 305,
         "z": "27c6cdb6.f4809a",
         "wires": [
             [
@@ -121,8 +124,8 @@
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1035.566665649414,
-        "y": 271,
+        "x": 1019.566650390625,
+        "y": 303,
         "z": "27c6cdb6.f4809a",
         "wires": [
             [
@@ -154,8 +157,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Error deleting the Service' />\n",
         "comments": "",
-        "x": 1203.566665649414,
-        "y": 268,
+        "x": 1266.566650390625,
+        "y": 276,
         "z": "27c6cdb6.f4809a",
         "wires": []
     },
@@ -317,5 +320,73 @@
         "y": 627.566650390625,
         "z": "27c6cdb6.f4809a",
         "wires": []
+    },
+    {
+        "id": "18e76f04.abb6f9",
+        "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": 812.5,
+        "y": 162.5,
+        "z": "27c6cdb6.f4809a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1a3fcf2c.299b01",
+        "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'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 765.61669921875,
+        "y": 90.61666870117188,
+        "z": "27c6cdb6.f4809a",
+        "wires": [
+            [
+                "7d7099fb.e2d5f"
+            ]
+        ]
+    },
+    {
+        "id": "7d7099fb.e2d5f",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 987.61669921875,
+        "y": 58.616668701171875,
+        "z": "27c6cdb6.f4809a",
+        "wires": [
+            [
+                "cc76d0c8.367a88"
+            ]
+        ]
+    },
+    {
+        "id": "cc76d0c8.367a88",
+        "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": 1094.61669921875,
+        "y": 92.61666870117188,
+        "z": "27c6cdb6.f4809a",
+        "wires": []
+    },
+    {
+        "id": "4f7b81dc.d4d6f",
+        "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=\"`$service-name + $param-prefix[2]`\"/>",
+        "comments": "",
+        "x": 777.61669921875,
+        "y": 244.61666870117188,
+        "z": "27c6cdb6.f4809a",
+        "wires": []
     }
 ]
\ No newline at end of file
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 587c1dd7..22a17050 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": "22cb0f8b.7a936",
+        "id": "f869c120.9a5e8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 276,
-        "y": 233,
-        "z": "ecded786.86d6f8",
+        "x": 121.5,
+        "y": 90,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "899fe88f.8b0f18"
+                "8af1dc93.0e0da"
             ]
         ]
     },
     {
-        "id": "899fe88f.8b0f18",
+        "id": "8af1dc93.0e0da",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,653 +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": 289,
-        "y": 293,
-        "z": "ecded786.86d6f8",
+        "x": 134.5,
+        "y": 150,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "8c11d44e.febba8"
+                "b03df385.9b70c"
             ]
         ]
     },
     {
-        "id": "8c11d44e.febba8",
+        "id": "b03df385.9b70c",
         "type": "method",
         "name": "method service-delete-tapi",
         "xml": "<method rpc='service-delete-tapi' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 309,
-        "y": 373,
-        "z": "ecded786.86d6f8",
+        "x": 154.5,
+        "y": 230,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "4251fc90.7d3354"
+                "dae9b3c0.70198"
             ]
         ]
     },
     {
-        "id": "4251fc90.7d3354",
+        "id": "dae9b3c0.70198",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 556.5,
-        "y": 373,
-        "z": "ecded786.86d6f8",
+        "x": 402,
+        "y": 230,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "fa22a868.cbac88",
-                "61c8204a.2cec1",
-                "613af82c.220508"
+                "882993c6.73a42",
+                "9a7b4d91.dc0e5",
+                "fe5645b4.4896a8",
+                "361056c9.62d1aa",
+                "fcf7ae69.66bac",
+                "658b7b5f.7441e4",
+                "ca74a3e.de9376"
             ]
         ]
     },
     {
-        "id": "fa22a868.cbac88",
+        "id": "882993c6.73a42",
         "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": 653,
-        "y": 196,
-        "z": "ecded786.86d6f8",
+        "x": 498.5,
+        "y": 53,
+        "z": "3bd40398.0e17fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "61c8204a.2cec1",
+        "id": "9a7b4d91.dc0e5",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='request-id' value='`$optical-service-delete-input.request-id`' />\n",
         "comments": "",
-        "x": 729,
-        "y": 245,
-        "z": "ecded786.86d6f8",
+        "x": 689.5000076293945,
+        "y": 37.00000190734863,
+        "z": "3bd40398.0e17fc",
         "wires": []
     },
     {
-        "id": "613af82c.220508",
+        "id": "ca74a3e.de9376",
         "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 + $optical-service-delete-input.payload.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\"/> ",
+        "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": 759.9999351501465,
-        "y": 378.8888759613037,
-        "z": "ecded786.86d6f8",
+        "x": 575.4999465942383,
+        "y": 328.3888740539551,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "6682edb5.3e9d24",
-                "894f9664.c6abc8"
+                "63d373a2.41054c",
+                "5229271d.664468"
             ]
         ]
     },
     {
-        "id": "ddeadbca.081d98",
+        "id": "bfa60c53.34db1",
         "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": 1492.2221755981445,
-        "y": 305.555513381958,
-        "z": "ecded786.86d6f8",
+        "x": 1332.7221870422363,
+        "y": 97.55551338195801,
+        "z": "3bd40398.0e17fc",
         "wires": []
     },
     {
-        "id": "6682edb5.3e9d24",
+        "id": "63d373a2.41054c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 963.3332595825195,
-        "y": 353.33330249786377,
-        "z": "ecded786.86d6f8",
+        "x": 793.8332633972168,
+        "y": 285.33330154418945,
+        "z": "3bd40398.0e17fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "894f9664.c6abc8",
+        "id": "5229271d.664468",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 939.999885559082,
-        "y": 435.55552768707275,
-        "z": "ecded786.86d6f8",
+        "x": 777.9998893737793,
+        "y": 377.55554580688477,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "dafe166a.8b36d8"
+                "aa57e737.b0fed8"
             ]
         ]
     },
     {
-        "id": "dafe166a.8b36d8",
+        "id": "aa57e737.b0fed8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1135.5554733276367,
-        "y": 446.6666831970215,
-        "z": "ecded786.86d6f8",
+        "x": 981.0554733276367,
+        "y": 303.6666831970215,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "ddeadbca.081d98",
-                "2801b4f8.38386c",
-                "3cf51d10.896032",
-                "a44318ce.afad08"
+                "bfa60c53.34db1",
+                "863b12fd.05227",
+                "b8f3f329.852df",
+                "dbf2f1d6.f28c4"
             ]
         ]
     },
     {
-        "id": "2801b4f8.38386c",
+        "id": "863b12fd.05227",
         "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": 1545.5556449890137,
-        "y": 367.77777004241943,
-        "z": "ecded786.86d6f8",
+        "x": 1363.5556869506836,
+        "y": 152.27777290344238,
+        "z": "3bd40398.0e17fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "3cf51d10.896032",
+        "id": "b8f3f329.852df",
         "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": 1545.555549621582,
-        "y": 422.2222137451172,
-        "z": "ecded786.86d6f8",
+        "x": 1366.055564880371,
+        "y": 209.2222318649292,
+        "z": "3bd40398.0e17fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "852e3fe3.e39dd",
+        "id": "a6a0d931.29ae78",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value='`$aend-cep`' />\n",
         "comments": "",
-        "x": 1931.221923828125,
-        "y": 647.22216796875,
-        "z": "ecded786.86d6f8",
+        "x": 1776.721923828125,
+        "y": 504.22216796875,
+        "z": "3bd40398.0e17fc",
         "wires": []
     },
     {
-        "id": "4644be9d.89b97",
+        "id": "96350f11.361f",
         "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": 1719.1107177734375,
-        "y": 562.8888549804688,
-        "z": "ecded786.86d6f8",
+        "x": 1564.6107177734375,
+        "y": 419.88885498046875,
+        "z": "3bd40398.0e17fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "a44318ce.afad08",
+        "id": "dbf2f1d6.f28c4",
         "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 + $optical-service-delete-input.payload.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\"/> ",
+        "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": 1283.3331146240234,
-        "y": 514.4444074630737,
-        "z": "ecded786.86d6f8",
+        "x": 1128.8331146240234,
+        "y": 371.44440746307373,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "58946d75.cedfa4",
-                "e7cecf42.399a6"
+                "f321d77d.d8fcf8",
+                "21838287.92c3fe"
             ]
         ]
     },
     {
-        "id": "58946d75.cedfa4",
+        "id": "f321d77d.d8fcf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1252.3331146240234,
-        "y": 656.4444074630737,
-        "z": "ecded786.86d6f8",
+        "x": 1097.8331146240234,
+        "y": 513.4444074630737,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "1e4a35c6.1c31ca"
+                "91f84772.c4f2c8"
             ]
         ]
     },
     {
-        "id": "1e4a35c6.1c31ca",
+        "id": "91f84772.c4f2c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1406.5553512573242,
-        "y": 610.666627407074,
-        "z": "ecded786.86d6f8",
+        "x": 1252.0553512573242,
+        "y": 467.666627407074,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "4644be9d.89b97",
-                "29655b58.ca1ca4",
-                "aad55652.80ccf8",
-                "82da300b.4f57c",
-                "2082255.0c982da",
-                "9f9c7a46.ce0ff8",
-                "70a0ebe0.92bcd4",
-                "33fa91ea.5695ce",
-                "425e8f1f.07ad6",
-                "94aa81a4.d0a7a8"
+                "96350f11.361f",
+                "fd9b7231.073dc",
+                "438c73c3.1e914c",
+                "f0125016.faa34",
+                "40bc2de7.03f354",
+                "db818283.160ff",
+                "f97e22d2.872f8",
+                "9544eb2a.40e488",
+                "91c2f578.c64f58"
             ]
         ]
     },
     {
-        "id": "e7cecf42.399a6",
+        "id": "21838287.92c3fe",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1409.9998016357422,
-        "y": 498.88880443573,
-        "z": "ecded786.86d6f8",
+        "x": 1255.4998016357422,
+        "y": 355.88880443573,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "ea3eca27.8a59e8"
+                "77e1cb8f.bccac4"
             ]
         ]
     },
     {
-        "id": "ea3eca27.8a59e8",
+        "id": "77e1cb8f.bccac4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1576.9998016357422,
-        "y": 497.88880443573,
-        "z": "ecded786.86d6f8",
+        "x": 1422.4998016357422,
+        "y": 354.88880443573,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "e7be8bd4.b55258"
+                "92f8a789.a292a8"
             ]
         ]
     },
     {
-        "id": "e7be8bd4.b55258",
+        "id": "92f8a789.a292a8",
         "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": 1744.8886985778809,
-        "y": 496.66657543182373,
-        "z": "ecded786.86d6f8",
+        "x": 1590.3886985778809,
+        "y": 353.66657543182373,
+        "z": "3bd40398.0e17fc",
         "wires": []
     },
     {
-        "id": "29655b58.ca1ca4",
+        "id": "fd9b7231.073dc",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$aend.network-interface-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1641.1108856201172,
-        "y": 665.5554914474487,
-        "z": "ecded786.86d6f8",
+        "x": 1486.6108856201172,
+        "y": 522.5554914474487,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "aea6fbc6.1505d8",
-                "2d663d56.1e55d2"
+                "1a5628eb.513f87",
+                "b8eb04be.936ff8"
             ]
         ]
     },
     {
-        "id": "aea6fbc6.1505d8",
+        "id": "1a5628eb.513f87",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='UNI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1805.888671875,
-        "y": 647.22216796875,
-        "z": "ecded786.86d6f8",
+        "x": 1651.388671875,
+        "y": 504.22216796875,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "852e3fe3.e39dd"
+                "a6a0d931.29ae78"
             ]
         ]
     },
     {
-        "id": "2d663d56.1e55d2",
+        "id": "b8eb04be.936ff8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1808.1108779907227,
-        "y": 720.5555419921875,
-        "z": "ecded786.86d6f8",
+        "x": 1653.6108779907227,
+        "y": 577.5555419921875,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "af008805.61eae8"
+                "54b37131.ec50b"
             ]
         ]
     },
     {
-        "id": "aad55652.80ccf8",
+        "id": "438c73c3.1e914c",
         "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": 1671.1108856201172,
-        "y": 763.3332624435425,
-        "z": "ecded786.86d6f8",
+        "x": 1516.6108856201172,
+        "y": 620.3332624435425,
+        "z": "3bd40398.0e17fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "82da300b.4f57c",
+        "id": "f0125016.faa34",
         "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": 1647.7772598266602,
-        "y": 846.6665992736816,
-        "z": "ecded786.86d6f8",
+        "x": 1493.2772598266602,
+        "y": 703.6665992736816,
+        "z": "3bd40398.0e17fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "2082255.0c982da",
+        "id": "40bc2de7.03f354",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$zend.network-interface-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1549.9998149871826,
-        "y": 915.55544090271,
-        "z": "ecded786.86d6f8",
+        "x": 1395.4998149871826,
+        "y": 772.55544090271,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "3a6cd376.4295ac",
-                "86c6217d.bed2a"
+                "c35140e8.3b796",
+                "59a847b5.312e98"
             ]
         ]
     },
     {
-        "id": "3a6cd376.4295ac",
+        "id": "c35140e8.3b796",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='UNI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1740.3330764770508,
-        "y": 903.2221584320068,
-        "z": "ecded786.86d6f8",
+        "x": 1585.8330764770508,
+        "y": 760.2221584320068,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "b35b94b1.940ff8"
+                "5f2dae98.203c3"
             ]
         ]
     },
     {
-        "id": "86c6217d.bed2a",
+        "id": "59a847b5.312e98",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1742.5553359985352,
-        "y": 970.5555419921875,
-        "z": "ecded786.86d6f8",
+        "x": 1588.0553359985352,
+        "y": 827.5555419921875,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "e1b5d596.201438"
+                "135bc522.303b8b"
             ]
         ]
     },
     {
-        "id": "9f9c7a46.ce0ff8",
+        "id": "db818283.160ff",
         "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": 1571.1112060546875,
-        "y": 1009.9999141693115,
-        "z": "ecded786.86d6f8",
+        "x": 1416.6112060546875,
+        "y": 866.9999141693115,
+        "z": "3bd40398.0e17fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "74642edb.088ea",
+        "id": "cf13929a.a5198",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-cep`\" />\n",
         "comments": "",
-        "x": 2139.999885559082,
-        "y": 972.2221412658691,
-        "z": "ecded786.86d6f8",
+        "x": 1985.499885559082,
+        "y": 829.2221412658691,
+        "z": "3bd40398.0e17fc",
         "wires": []
     },
     {
-        "id": "b35b94b1.940ff8",
+        "id": "5f2dae98.203c3",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value='`$zend-cep`' />\n",
         "comments": "",
-        "x": 1866.6664352416992,
-        "y": 902.2221622467041,
-        "z": "ecded786.86d6f8",
+        "x": 1712.1664352416992,
+        "y": 759.2221622467041,
+        "z": "3bd40398.0e17fc",
         "wires": []
     },
     {
-        "id": "33fa91ea.5695ce",
+        "id": "f97e22d2.872f8",
         "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": 1466.6664199829102,
-        "y": 1124.4443254470825,
-        "z": "ecded786.86d6f8",
+        "x": 1312.1664199829102,
+        "y": 981.4443254470825,
+        "z": "3bd40398.0e17fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "70a0ebe0.92bcd4",
-        "type": "get-resource",
-        "name": "get service db",
-        "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": 1487.7775344848633,
-        "y": 1067.7777080535889,
-        "z": "ecded786.86d6f8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e1b5d596.201438",
+        "id": "135bc522.303b8b",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$db-zend.connection-point`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1884.4444444444443,
-        "y": 973.3333333333333,
-        "z": "ecded786.86d6f8",
+        "x": 1729.9444444444443,
+        "y": 830.3333333333333,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "1ff79f49.8fba61",
-                "54376f65.aa57"
+                "dda38169.1a96b",
+                "943fd023.cc6d9"
             ]
         ]
     },
     {
-        "id": "1ff79f49.8fba61",
+        "id": "dda38169.1a96b",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2012.2222061157227,
-        "y": 974.4444217681885,
-        "z": "ecded786.86d6f8",
+        "x": 1857.7222061157227,
+        "y": 831.4444217681885,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "74642edb.088ea"
+                "cf13929a.a5198"
             ]
         ]
     },
     {
-        "id": "f9bfc410.022418",
+        "id": "582c452e.50a00c",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$db-zend.connection-point + ',' + $zend-cep`\" />\n",
         "comments": "",
-        "x": 2142.221981048584,
-        "y": 1038.8887939453125,
-        "z": "ecded786.86d6f8",
+        "x": 1987.721981048584,
+        "y": 895.8887939453125,
+        "z": "3bd40398.0e17fc",
         "wires": []
     },
     {
-        "id": "54376f65.aa57",
+        "id": "943fd023.cc6d9",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2024.4444444444443,
-        "y": 1037.7777777777778,
-        "z": "ecded786.86d6f8",
+        "x": 1869.9444444444443,
+        "y": 894.7777777777778,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "f9bfc410.022418"
+                "582c452e.50a00c"
             ]
         ]
     },
     {
-        "id": "af008805.61eae8",
+        "id": "54b37131.ec50b",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$db-aend.connection-point`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1935.5554428100586,
-        "y": 723.3333148956299,
-        "z": "ecded786.86d6f8",
+        "x": 1781.0554428100586,
+        "y": 580.3333148956299,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "fdc21e7c.da331",
-                "ede7f03e.32c01"
+                "d7cb5d1f.868ba",
+                "b8aa01ad.10807"
             ]
         ]
     },
     {
-        "id": "6ca90d2f.d086e4",
+        "id": "cd72b99.aafe848",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-cep`\" />\n",
         "comments": "",
-        "x": 2210,
-        "y": 712.22216796875,
-        "z": "ecded786.86d6f8",
+        "x": 2055.5,
+        "y": 569.22216796875,
+        "z": "3bd40398.0e17fc",
         "wires": []
     },
     {
-        "id": "fdc21e7c.da331",
+        "id": "d7cb5d1f.868ba",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2082.2223205566406,
-        "y": 714.4444484710693,
-        "z": "ecded786.86d6f8",
+        "x": 1927.7223205566406,
+        "y": 571.4444484710693,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "6ca90d2f.d086e4"
+                "cd72b99.aafe848"
             ]
         ]
     },
     {
-        "id": "f35c33d.adfbfd",
+        "id": "b905fec4.7ac5f",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value=\"`$db-aend.connection-point + ',' + $aend-cep`\" />\n",
         "comments": "",
-        "x": 2212.222095489502,
-        "y": 778.8888206481934,
-        "z": "ecded786.86d6f8",
+        "x": 2057.722095489502,
+        "y": 635.8888206481934,
+        "z": "3bd40398.0e17fc",
         "wires": []
     },
     {
-        "id": "ede7f03e.32c01",
+        "id": "b8aa01ad.10807",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2094.4445588853623,
-        "y": 777.7778044806587,
-        "z": "ecded786.86d6f8",
+        "x": 1939.9445588853623,
+        "y": 634.7778044806587,
+        "z": "3bd40398.0e17fc",
         "wires": [
             [
-                "f35c33d.adfbfd"
+                "b905fec4.7ac5f"
             ]
         ]
     },
     {
-        "id": "425e8f1f.07ad6",
+        "id": "9544eb2a.40e488",
         "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": 1377.7776336669922,
-        "y": 1185.5554809570312,
-        "z": "ecded786.86d6f8",
+        "x": 1223.2776336669922,
+        "y": 1042.5554809570312,
+        "z": "3bd40398.0e17fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "94aa81a4.d0a7a8",
+        "id": "91c2f578.c64f58",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",
         "comments": "",
-        "x": 1325,
-        "y": 1257,
-        "z": "ecded786.86d6f8",
+        "x": 1170.5,
+        "y": 1114,
+        "z": "3bd40398.0e17fc",
+        "wires": []
+    },
+    {
+        "id": "fe5645b4.4896a8",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "361056c9.62d1aa",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "fcf7ae69.66bac",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "658b7b5f.7441e4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='service-name' value=\"`$optical-service-delete-input.payload.service-name +  $new-esr[2]`\" />\n",
+        "comments": "",
+        "x": 675.0000114440918,
+        "y": 262.50000381469727,
+        "z": "3bd40398.0e17fc",
         "wires": []
     }
 ]
\ No newline at end of file
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 e11d061b..c817cee6 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
@@ -66,4 +66,4 @@ service-instance.service-instance-id = $output.service-instance-id'></delete>
     key="DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id"></delete>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
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 eb1ef93f..4e712ea0 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
@@ -26,7 +26,7 @@ pfx='inter' local-only='false' >
                         <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].available-capacity == 0`'>
+                                    <switch test='`$inter.logical-link[$ida].operational-status == occupied`'>
                                         <outcome value='true'></outcome>
                                         <outcome value='false'>
                                             <block atomic="true">
@@ -69,7 +69,7 @@ pfx='inter' local-only='false' >
                                                     <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-TAPI-1'`" />
+                                                        <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`" />
@@ -109,7 +109,7 @@ pfx='inter' local-only='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-TAPI-2'`" />
+                                                        <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`" />
@@ -161,7 +161,7 @@ force='true'
 resource='logical-link'
      key='logical-link.link-name = $inter.logical-link[$ida].link-name '
       local-only='false'>
-                                                    <parameter name='available-capacity' value='0' />
+                                                    <parameter name='operational-status' value='occupied' />
                                                 </update>
                                                 <call module='optical-service' rpc='create-service-relationship' mode='sync' ></call>
                                                 <return status='success'>
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml b/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml
index 91062b0f..541e0279 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml
@@ -57,6 +57,9 @@ pfx='db-zend'>
             <switch test='`$domain-type`'>
                 <outcome value='MSA'>
                     <block atomic='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-name' value="`$optical-service-create-input.payload.service-name + '_' + $param-prefix[2]`"/>
+                        </set>
                         <call module='optical-service' rpc='service-create-msa' 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 ce1937f3..2bbd79e3 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
@@ -15,6 +15,7 @@ pfx='detail-db'>
                 <outcome value='success'>
                     <set>
                         <parameter name='domain-req' value='`$detail-db.domain-requests`' />
+                        <parameter name='delete-acc-svc-id' value='`$detail-db.service-instance-id`' />
                     </set>
                 </outcome>
             </get-resource>
@@ -28,9 +29,6 @@ pfx='detail-db'>
                 <parameter name='domain-service1' value='`$param-prefix1[0]`' />
                 <parameter name='domain-service2' value='`$param-prefix1[1]`' />
             </set>
-            <set>
-                <parameter name='access-id' value="`$optical-service-delete-input.request-id`" />
-            </set>
             <for index='ppx' start='0' end='`$param-prefix1_length`' >
                 <switch test='`$param-prefix1_length`'>
                     <outcome value='1'>
@@ -55,7 +53,7 @@ pfx='detail-db1'>
                                 <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.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN'`"/>
+                                <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`"/>
                             </set>
                             <switch test='`$domain-type`'>
                                 <outcome value='MSA'>
@@ -128,7 +126,7 @@ pfx='detail-db11'>
                                     </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-TAPI-1'`"/>
+                                        <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>
@@ -182,7 +180,7 @@ pfx='detail-db22'>
                                     </execute>
                                     <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-TAPI-2'`"/>
+                                        <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]`' />
                                     </set>
@@ -256,6 +254,28 @@ pfx='detail-db22'>
                                     <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"
+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' 
+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" />
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml
index 11b729e0..5f87c54d 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml
@@ -24,6 +24,7 @@ pfx='db-aend'>
                         <parameter name='aend-cep-list' value='`$db-aend.connection-point`' />
                         <parameter name='aend-nep' value='`$db-aend.interface-name`' />
                         <parameter name='aend-rate' value='`$db-aend.rate`' />
+                        <parameter name='esr-id' value='`$db-aend.controller-id`' />
                     </set>
                 </outcome>
             </get-resource>
@@ -322,8 +323,13 @@ pfx='zend'      local-only='false'></get-resource>
                     </block>
                 </outcome>
             </switch>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$esr-id`'/>
+                <parameter name="regex" value="_"/>
+                <parameter name="ctx_memory_result_key" value="new-esr"/>
+            </execute>
             <set>
-                <parameter name='service-name' value="`$optical-service-create-input.payload.service-name`" />
+                <parameter name='service-name' value="`$optical-service-create-input.payload.service-name +'_' + $new-esr[2]`"/>
                 <parameter name='svc-action' value="CREATE" />
             </set>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
index a4233171..2eb38164 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
@@ -3,6 +3,28 @@
     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='service-delete-msa' mode='sync'>
         <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'
+pfx='detail-db1'>
+                <outcome value='success'>
+                    <set>
+                        <parameter name='controller-id1' value='`$detail-db1.controller-id`' />
+                    </set>
+                </outcome>
+            </get-resource>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$controller-id1`'/>
+                <parameter name="regex" value="_"/>
+                <parameter name="ctx_memory_result_key" value="param-prefix"/>
+            </execute>
+            <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.payload.service-name' value="`$service-name + $param-prefix[2]`"/>
+            </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />
                 <parameter name="restapiUrl" value="`$controller-ip + '/cxf/openroadm/openroadm-services/' + $optical-service-delete-input.payload.service-name`"/>
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 24b52fbb..0d17afd2 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
@@ -3,16 +3,30 @@
     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='service-delete-tapi' mode='sync'>
         <block atomic="true">
+            <set>
+                <parameter name='request-id' value='`$optical-service-delete-input.request-id`' />
+            </set>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                 <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />
                 <parameter name="level" value="info" />
                 <parameter name="field1" value="Inside optical service delete tapi"/>
             </record>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
+key='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '
+pfx='output'></get-resource>
             <set>
-                <parameter name='request-id' value='`$optical-service-delete-input.request-id`' />
+                <parameter name='esr-id' value='`$output.controller-id`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$esr-id`'/>
+                <parameter name="regex" value="_"/>
+                <parameter name="ctx_memory_result_key" value="new-esr"/>
+            </execute>
+            <set>
+                <parameter name='service-name' value="`$optical-service-delete-input.payload.service-name +  $new-esr[2]`" />
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.get.services.url + $optical-service-delete-input.payload.service-name`" />
+                <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.get.services.url + $service-name`" />
                 <parameter name="restapiUser" value="admin"/>
                 <parameter name="restapiPassword" value="admin"/>
                 <parameter name="httpMethod" value="GET"/>
@@ -43,7 +57,7 @@ from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
 WHERE interface_name = $zend-nep'
 pfx='db-zend'></get-resource>
                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.delete.service.url + $optical-service-delete-input.payload.service-name`" />
+                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.delete.service.url + $service-name`" />
                             <parameter name="restapiUser" value="admin"/>
                             <parameter name="restapiPassword" value="admin"/>
                             <parameter name="httpMethod" value="DELETE"/>
@@ -125,9 +139,6 @@ pfx='zend'      local-only='false'></get-resource>
 resource='SQL' 
 key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'
 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 request_id = $request-id '
-pfx='output'></get-resource>
                                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 resource="service-instance"
 key='customer.global-customer-id = $output.global-customer-id AND