From ee3ee6e27a76ef2c59da5961f0ec1572081aa0ad Mon Sep 17 00:00:00 2001
From: Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>
Date: Wed, 18 Mar 2020 07:02:34 +0000
Subject: [PATCH] DG'S added for MDONS use case to handle cross domain service
 creation

Change-Id: Ibb50d9c82cc6f62c58c8e85b7f088d40c2a7e30d
Issue-ID: SDNC-928
Signed-off-by: Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>
---
 installation/sdnc/src/main/resources/sdnctl.dump   |    1 +
 ...ptical-service_create-service-relationship.json |  223 ++++
 .../optical-service_inter-domain-handling.json     | 1033 ++++++++++++++++++
 .../optical-service_optical-service-create.json    | 1059 +++++++++++++++---
 .../json/optical-service_service-create-tapi.json  | 1142 ++++++++++----------
 .../src/main/resources/graph.versions              |    5 +-
 ...optical-service_create-service-relationship.xml |   51 +
 .../xml/optical-service_inter-domain-handling.xml  |  197 ++++
 .../xml/optical-service_optical-service-create.xml |  235 +++-
 .../xml/optical-service_service-create-tapi.xml    |   10 +-
 .../src/main/json/optical-service-create-tapi.json |   57 +
 11 files changed, 3213 insertions(+), 800 deletions(-)
 create mode 100644 platform-logic/optical-service/src/main/json/optical-service_create-service-relationship.json
 create mode 100644 platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json
 create mode 100644 platform-logic/optical-service/src/main/xml/optical-service_create-service-relationship.xml
 create mode 100644 platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml
 create mode 100644 platform-logic/restapi-templates/src/main/json/optical-service-create-tapi.json

diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump
index 2fc7bcff..f47e1a32 100644
--- a/installation/sdnc/src/main/resources/sdnctl.dump
+++ b/installation/sdnc/src/main/resources/sdnctl.dump
@@ -1906,6 +1906,7 @@ CREATE TABLE `REQUEST_DETAILS` (
   `service_type` varchar(255) DEFAULT NULL,
   `global_customer_id` varchar(255) DEFAULT NULL,
   `notification_url` varchar(255) DEFAULT NULL,
+  `domain_requests` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`request_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/platform-logic/optical-service/src/main/json/optical-service_create-service-relationship.json b/platform-logic/optical-service/src/main/json/optical-service_create-service-relationship.json
new file mode 100644
index 00000000..569e23b7
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_create-service-relationship.json
@@ -0,0 +1,223 @@
+[
+    {
+        "id": "acab78dd.697a38",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 382.5,
+        "y": 262.5,
+        "z": "c7becd47.884",
+        "wires": [
+            [
+                "c2dcb871.d886d8"
+            ]
+        ]
+    },
+    {
+        "id": "56ba0c7c.085e74",
+        "type": "method",
+        "name": "method",
+        "xml": "<method rpc='create-service-relationship' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 381.5,
+        "y": 337.5,
+        "z": "c7becd47.884",
+        "wires": [
+            [
+                "f37956ce.4bd828"
+            ]
+        ]
+    },
+    {
+        "id": "c2dcb871.d886d8",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 593.3333435058594,
+        "y": 198.83333206176758,
+        "z": "c7becd47.884",
+        "wires": [
+            [
+                "56ba0c7c.085e74"
+            ]
+        ]
+    },
+    {
+        "id": "f37956ce.4bd828",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 564.5,
+        "y": 332.5,
+        "z": "c7becd47.884",
+        "wires": [
+            [
+                "c34ad1e6.1b049",
+                "49230af2.d808d4",
+                "30a10176.609d7e",
+                "dc89cfb.651ad3"
+            ]
+        ]
+    },
+    {
+        "id": "c34ad1e6.1b049",
+        "type": "get-resource",
+        "name": "get-resource",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom REQUEST_DETAILS\nWHERE request_id = $as-request-id'\npfx='access-service'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 749.1666946411133,
+        "y": 316.05555152893066,
+        "z": "c7becd47.884",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "49230af2.d808d4",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$access-service.domain-requests`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"domain-services\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 741.5,
+        "y": 361.5,
+        "z": "c7becd47.884",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "30a10176.609d7e",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idc' start='0' end='`$domain-services_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 713.5,
+        "y": 448.5,
+        "z": "c7becd47.884",
+        "wires": [
+            [
+                "c1fe8f71.3771e"
+            ]
+        ]
+    },
+    {
+        "id": "c1fe8f71.3771e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 859.5,
+        "y": 441.5,
+        "z": "c7becd47.884",
+        "wires": [
+            [
+                "a9fba6b1.9ea4a8",
+                "5b28c4f8.97075c"
+            ]
+        ]
+    },
+    {
+        "id": "a9fba6b1.9ea4a8",
+        "type": "get-resource",
+        "name": "get-resource",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom REQUEST_DETAILS\nWHERE request_id = $domain-services[$idc]'\npfx='ds-details'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1007.1666946411133,
+        "y": 279.8333444595337,
+        "z": "c7becd47.884",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d767bb7e.ede568",
+        "type": "save",
+        "name": "save domain service",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $access-service.service-instance-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"service-instance\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/business/customers/customer/' + $optical-service-create-input.global-customer-id + '/service-subscriptions/service-subscription/' + $optical-service-create-input.service-type + '/service-instances/service-instance/' + $ds-details.service-instance-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"service-instance.service-instance-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$ds-details.service-instance-id`\" /> \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1247.1666107177734,
+        "y": 443.61108779907227,
+        "z": "c7becd47.884",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3081486c.145aa8",
+        "type": "save",
+        "name": "save lgical-link",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $access-service.service-instance-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"service-instance\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $inter.logical-link[$ida].link-name`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$inter.logical-link[$ida].link-name`\" /> \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 939.0277938842773,
+        "y": 535.0000419616699,
+        "z": "c7becd47.884",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5b28c4f8.97075c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1047.083396911621,
+        "y": 446.9444456100464,
+        "z": "c7becd47.884",
+        "wires": [
+            [
+                "d767bb7e.ede568"
+            ]
+        ]
+    },
+    {
+        "id": "dc89cfb.651ad3",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$domain-services_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 637.9165725708008,
+        "y": 527.499927520752,
+        "z": "c7becd47.884",
+        "wires": [
+            [
+                "4df19f89.f43cf"
+            ]
+        ]
+    },
+    {
+        "id": "4df19f89.f43cf",
+        "type": "outcome",
+        "name": "2",
+        "xml": "<outcome value='2'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 774.3055114746094,
+        "y": 530.2776975631714,
+        "z": "c7becd47.884",
+        "wires": [
+            [
+                "3081486c.145aa8"
+            ]
+        ]
+    }
+]
\ No newline at end of file
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
new file mode 100644
index 00000000..3c56d2a0
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json
@@ -0,0 +1,1033 @@
+[
+    {
+        "id": "f758e877.9aa428",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 170,
+        "y": 35,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "5c17b7ee.ab4f88"
+            ]
+        ]
+    },
+    {
+        "id": "5c17b7ee.ab4f88",
+        "type": "service-logic",
+        "name": "optical-service ${project.version}",
+        "module": "optical-service",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>",
+        "outputs": 1,
+        "x": 183,
+        "y": 95,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "748bfbc0.155724"
+            ]
+        ]
+    },
+    {
+        "id": "748bfbc0.155724",
+        "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",
+        "wires": [
+            [
+                "dbf465e6.f48758"
+            ]
+        ]
+    },
+    {
+        "id": "dbf465e6.f48758",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 413.5,
+        "y": 159.99998474121094,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "28583d0f.279172"
+            ]
+        ]
+    },
+    {
+        "id": "28583d0f.279172",
+        "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",
+        "wires": [
+            [
+                "b70b6289.977c1",
+                "6ef8cbe3.e8bef4",
+                "6bf74a48.446dd4"
+            ]
+        ]
+    },
+    {
+        "id": "b70b6289.977c1",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 737.3333435058594,
+        "y": 55.66667175292969,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "85b966b9.0f8cf8"
+            ]
+        ]
+    },
+    {
+        "id": "6ef8cbe3.e8bef4",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 746.3333435058594,
+        "y": 106.66667175292969,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "cd963a4d.e22ee8"
+            ]
+        ]
+    },
+    {
+        "id": "85b966b9.0f8cf8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "cd963a4d.e22ee8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6bf74a48.446dd4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 567.3333435058594,
+        "y": 256.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "9c819276.24e11"
+            ]
+        ]
+    },
+    {
+        "id": "9c819276.24e11",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 571.3333435058594,
+        "y": 343.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "d737ac6d.616bf",
+                "26ccb9a4.4d6756",
+                "220b1d2a.b6a942"
+            ]
+        ]
+    },
+    {
+        "id": "26ccb9a4.4d6756",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c76734fa.8d1cc8",
+        "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",
+        "wires": [
+            [
+                "272d946f.d2dc2c"
+            ]
+        ]
+    },
+    {
+        "id": "d737ac6d.616bf",
+        "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",
+        "wires": [
+            [
+                "c76734fa.8d1cc8"
+            ]
+        ]
+    },
+    {
+        "id": "272d946f.d2dc2c",
+        "type": "outcome",
+        "name": "inter-domain",
+        "xml": "<outcome value='inter-domain'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1003.3333435058594,
+        "y": 349.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "9b0d1c2e.0faa7"
+            ]
+        ]
+    },
+    {
+        "id": "ca4ee674.defdf8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a5175c91.4398b",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 1587.833396911621,
+        "y": 298.91669178009033,
+        "z": "5c4cb98c.063918",
+        "wires": []
+    },
+    {
+        "id": "13f040fa.3faaef",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1431.083396911621,
+        "y": 292.416690826416,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "ca4ee674.defdf8",
+                "a5175c91.4398b"
+            ]
+        ]
+    },
+    {
+        "id": "220b1d2a.b6a942",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$access-bend == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 693.3333435058594,
+        "y": 455.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "130ab846.d0f008",
+                "50eacb5c.990954"
+            ]
+        ]
+    },
+    {
+        "id": "130ab846.d0f008",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 837.3333435058594,
+        "y": 455.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "ee14f7be.3c7fa8"
+            ]
+        ]
+    },
+    {
+        "id": "ee14f7be.3c7fa8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "50eacb5c.990954",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 572.3333435058594,
+        "y": 531.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "347e2915.cc1706"
+            ]
+        ]
+    },
+    {
+        "id": "347e2915.cc1706",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 717.3333435058594,
+        "y": 532.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "856ca7c4.6b82e8",
+                "8837a281.40c0b",
+                "de103600.3d65d8",
+                "c43967.77247698"
+            ]
+        ]
+    },
+    {
+        "id": "856ca7c4.6b82e8",
+        "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",
+        "wires": [
+            [
+                "a72d7f41.fec8f"
+            ]
+        ]
+    },
+    {
+        "id": "82932067.81591",
+        "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",
+        "wires": [
+            [
+                "e5f10270.f273a",
+                "7ab99a2a.02a9b4"
+            ]
+        ]
+    },
+    {
+        "id": "a72d7f41.fec8f",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$idb`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1032.3333435058594,
+        "y": 530.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "a10d9b09.c6a018",
+                "65f0439d.6850dc"
+            ]
+        ]
+    },
+    {
+        "id": "a10d9b09.c6a018",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1160.3333435058594,
+        "y": 497.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "e11165ce.81f408"
+            ]
+        ]
+    },
+    {
+        "id": "e11165ce.81f408",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1304.3333435058594,
+        "y": 497.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "82932067.81591",
+                "8944795b.be9238"
+            ]
+        ]
+    },
+    {
+        "id": "7242da65.49c644",
+        "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",
+        "comments": "",
+        "x": 1465.3333435058594,
+        "y": 751.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": []
+    },
+    {
+        "id": "d9d5ec95.325f2",
+        "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",
+        "wires": [
+            [
+                "3bece07b.4143",
+                "308f7f65.579ea"
+            ]
+        ]
+    },
+    {
+        "id": "65f0439d.6850dc",
+        "type": "outcome",
+        "name": "outcome",
+        "xml": "<outcome value='1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1144.3333435058594,
+        "y": 745.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "4117c3fb.234e2c"
+            ]
+        ]
+    },
+    {
+        "id": "4117c3fb.234e2c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1294.3333435058594,
+        "y": 768.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "7242da65.49c644",
+                "d9d5ec95.325f2"
+            ]
+        ]
+    },
+    {
+        "id": "8944795b.be9238",
+        "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",
+        "comments": "",
+        "x": 1457.3333435058594,
+        "y": 480.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": []
+    },
+    {
+        "id": "8837a281.40c0b",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$service1 == $service2 == success`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 467.8333511352539,
+        "y": 972.9166975021362,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "b7e3ef8e.7574d",
+                "ebdeccd7.d965"
+            ]
+        ]
+    },
+    {
+        "id": "3ebe2880.5d2848",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e32376ab.722ab8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e5f10270.f273a",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1602.3333435058594,
+        "y": 520.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "ce267118.2a781"
+            ]
+        ]
+    },
+    {
+        "id": "3bece07b.4143",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1444.3333435058594,
+        "y": 1034.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "5d7bb97e.9b9168"
+            ]
+        ]
+    },
+    {
+        "id": "de103600.3d65d8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d7bea264.ac4f",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 777.0833892822266,
+        "y": 890.6666994094849,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "45335899.f65cd8",
+                "3ebe2880.5d2848",
+                "5ad6860e.7c4058",
+                "105084eb.36fa9b"
+            ]
+        ]
+    },
+    {
+        "id": "45335899.f65cd8",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ef433cfb.addb6",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5ffac9eb.b5f648",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 725.5833854675293,
+        "y": 1123.916766166687,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "ef433cfb.addb6",
+                "e32376ab.722ab8"
+            ]
+        ]
+    },
+    {
+        "id": "1a20d556.18cf3b",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "ce267118.2a781",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1700.3333435058594,
+        "y": 450.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "1a20d556.18cf3b",
+                "1e9f2b96.152c94"
+            ]
+        ]
+    },
+    {
+        "id": "1e9f2b96.152c94",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$service1-status == 200`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1728.3333435058594,
+        "y": 580.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "69014b74.07f204",
+                "1a2962dc.544a6d"
+            ]
+        ]
+    },
+    {
+        "id": "69014b74.07f204",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1897.3333435058594,
+        "y": 535.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "312af284.d49a7e"
+            ]
+        ]
+    },
+    {
+        "id": "1a2962dc.544a6d",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1898.3333435058594,
+        "y": 602.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "1d22b46d.2540bc"
+            ]
+        ]
+    },
+    {
+        "id": "312af284.d49a7e",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='service1' value='success' />\n",
+        "comments": "",
+        "x": 2032.3333435058594,
+        "y": 524.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": []
+    },
+    {
+        "id": "1d22b46d.2540bc",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='service1' value='failure' />\n",
+        "comments": "",
+        "x": 2034.3333435058594,
+        "y": 601.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": []
+    },
+    {
+        "id": "5d7bb97e.9b9168",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1617.3333435058594,
+        "y": 1015.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "6ec325e8.81817c",
+                "b7239a52.656e68"
+            ]
+        ]
+    },
+    {
+        "id": "b7239a52.656e68",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$service2-status == 200`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1749.3333435058594,
+        "y": 1114.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "53ffa173.fbef1",
+                "2ad5ca.ed0e4a36"
+            ]
+        ]
+    },
+    {
+        "id": "53ffa173.fbef1",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1905.3333435058594,
+        "y": 1039.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "4007f828.6542e8"
+            ]
+        ]
+    },
+    {
+        "id": "2ad5ca.ed0e4a36",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1962.3333435058594,
+        "y": 1121.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "dd3cb13a.463cf"
+            ]
+        ]
+    },
+    {
+        "id": "4007f828.6542e8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='service2' value='success' />\n",
+        "comments": "",
+        "x": 2106.3333435058594,
+        "y": 1029.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": []
+    },
+    {
+        "id": "dd3cb13a.463cf",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='service2' value='success' />\n",
+        "comments": "",
+        "x": 2105.3333435058594,
+        "y": 1099.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": []
+    },
+    {
+        "id": "6ec325e8.81817c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c43967.77247698",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='inter' value='' />\n",
+        "comments": "",
+        "x": 901.8333854675293,
+        "y": 578.4166970252991,
+        "z": "5c4cb98c.063918",
+        "wires": []
+    },
+    {
+        "id": "7ab99a2a.02a9b4",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1605.3333435058594,
+        "y": 615.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "f872b304.25e82"
+            ]
+        ]
+    },
+    {
+        "id": "f872b304.25e82",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "308f7f65.579ea",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1403.3333435058594,
+        "y": 1116.6666717529297,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "472ab920.66f758"
+            ]
+        ]
+    },
+    {
+        "id": "472ab920.66f758",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b7e3ef8e.7574d",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 636.333381652832,
+        "y": 896.1666984558105,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "d7bea264.ac4f"
+            ]
+        ]
+    },
+    {
+        "id": "ebdeccd7.d965",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 600.583381652832,
+        "y": 1125.166699886322,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "5ffac9eb.b5f648"
+            ]
+        ]
+    },
+    {
+        "id": "5ad6860e.7c4058",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9b0d1c2e.0faa7",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$inter.logical-link[$ida].available-capacity == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1145,
+        "y": 241.25,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "39e8a51e.7cdb9a",
+                "73566e12.b8034"
+            ]
+        ]
+    },
+    {
+        "id": "39e8a51e.7cdb9a",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1262.5000190734863,
+        "y": 190.00000190734863,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "73566e12.b8034",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1268.7500190734863,
+        "y": 296.2500057220459,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            [
+                "13f040fa.3faaef"
+            ]
+        ]
+    },
+    {
+        "id": "105084eb.36fa9b",
+        "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",
+        "comments": "",
+        "outputs": 1,
+        "x": 1027.5,
+        "y": 841.25,
+        "z": "5c4cb98c.063918",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json b/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json
index 6b76a2d5..3d5395ed 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_optical-service-create.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "a60c3a75.bbec5",
+        "id": "19b0a312.c6518d",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 213,
-        "y": 182,
-        "z": "f1813121.5d5738",
+        "x": 304,
+        "y": 94,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "5b510e2a.808e9"
+                "81c1d0fa.bcc35"
             ]
         ]
     },
     {
-        "id": "c50c5fff.124b48",
+        "id": "e56e4f2c.7f32c",
         "type": "method",
         "name": "method",
         "xml": "<method rpc='optical-service-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 212,
-        "y": 257,
-        "z": "f1813121.5d5738",
+        "x": 303,
+        "y": 169,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "95411f3f.dd7f98"
+                "8a27eddd.8659"
             ]
         ]
     },
     {
-        "id": "5b510e2a.808e9",
+        "id": "81c1d0fa.bcc35",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -38,330 +38,1045 @@
         "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": 430.5,
-        "y": 165,
-        "z": "f1813121.5d5738",
+        "x": 521.5,
+        "y": 77,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "c50c5fff.124b48"
+                "e56e4f2c.7f32c"
             ]
         ]
     },
     {
-        "id": "95411f3f.dd7f98",
+        "id": "8a27eddd.8659",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 388,
-        "y": 270,
-        "z": "f1813121.5d5738",
+        "x": 395,
+        "y": 250.00000762939453,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "3ce1c2e1.3b2f6e",
-                "4f2664fb.690704",
-                "8396ec44.a3b3f",
-                "98a2e7e3.d11d58",
-                "dbd48c3a.1af36",
-                "79f9f3f0.aa019c",
-                "a32436b4.dcfeb8",
-                "6cb71359.685f54"
+                "cb83a0f.af4db6",
+                "c467f6e9.a09748",
+                "27820288.3245de",
+                "eb2c1d7a.9bc0f",
+                "812b7088.1c2e1",
+                "f6999b39.46ee28",
+                "faed5cf2.7521c",
+                "281e3ae5.c7e156",
+                "f4302cf0.c694f",
+                "9cecb747.fbb8f8",
+                "4ff206b2.2a38f8"
             ]
         ]
     },
     {
-        "id": "4f2664fb.690704",
+        "id": "cb83a0f.af4db6",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='0' end='`$optical-service-create-input.payload.param_length`' >\n    \n    \n    \n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 527.9999694824219,
+        "y": 214.00000762939453,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "c2bd7688.8306a8",
+                "e0cd029e.1c401",
+                "c08c879e.8aa398",
+                "e5d38e0f.c60ef",
+                "e48f435a.a53b1",
+                "cd52a71e.a07748",
+                "96ffe338.d9102",
+                "307d0ddd.cbbf82",
+                "6c345065.66388",
+                "6b15a6f5.41dc08",
+                "708a333d.a59a6c",
+                "930d48ba.7db8c8",
+                "2bad3261.39a7be"
+            ]
+        ]
+    },
+    {
+        "id": "c2bd7688.8306a8",
         "type": "switchNode",
-        "name": "switch : domain-type",
-        "xml": "<switch test='`$optical-service-create-input.payload.domain-type`'>\n    \n",
+        "name": "switch uni1",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 265.5,
-        "y": 583,
-        "z": "f1813121.5d5738",
+        "x": 747.9999694824219,
+        "y": 112.00001525878906,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "d95d35a6.d10db",
-                "6077e8a.adc5618"
+                "e2160d67.6a214"
             ]
         ]
     },
     {
-        "id": "d95d35a6.d10db",
-        "type": "outcome",
-        "name": "MSA",
-        "xml": "<outcome value='MSA'>\n",
+        "id": "930d48ba.7db8c8",
+        "type": "set",
+        "name": "set parameter",
+        "xml": "<set>\n<parameter name='params' value='`$optical-service-create-input.payload.param[$idx]`' />\n",
+        "comments": "",
+        "x": 776.9999694824219,
+        "y": 62.00000762939453,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "e2160d67.6a214",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 568,
-        "y": 553,
-        "z": "f1813121.5d5738",
+        "x": 911.9999694824219,
+        "y": 114.00001525878906,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "7a015c66.3154ec"
+                "4c25de7b.31204"
             ]
         ]
     },
     {
-        "id": "6077e8a.adc5618",
-        "type": "outcome",
-        "name": "TAPI",
-        "xml": "<outcome value='TAPI'>\n",
+        "id": "4c25de7b.31204",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "comments": "",
+        "x": 1051.9999694824219,
+        "y": 109.00001525878906,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "e0cd029e.1c401",
+        "type": "switchNode",
+        "name": "switch uni2",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni2_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 564,
-        "y": 662,
-        "z": "f1813121.5d5738",
+        "x": 747.9999694824219,
+        "y": 193.00000762939453,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "ebb70e0a.9be68"
+                "6209659e.61d4fc"
             ]
         ]
     },
     {
-        "id": "3ce1c2e1.3b2f6e",
-        "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",
+        "id": "6209659e.61d4fc",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 770,
-        "y": 145,
-        "z": "f1813121.5d5738",
+        "x": 906.9999694824219,
+        "y": 198.00000762939453,
+        "z": "6aec8519.596ebc",
         "wires": [
-            []
+            [
+                "6da07ddf.5b16c4"
+            ]
         ]
     },
     {
-        "id": "7a015c66.3154ec",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
+        "id": "6da07ddf.5b16c4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "comments": "",
+        "x": 1041.9999694824219,
+        "y": 195.00000762939453,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "c08c879e.8aa398",
+        "type": "switchNode",
+        "name": "switch uni1 coding_func",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni1_coding_func'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 756,
-        "y": 554,
-        "z": "f1813121.5d5738",
+        "x": 751.9999694824219,
+        "y": 289.9999771118164,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "3e4acd01.4d0db2"
+                "a209861e.a84c68"
             ]
         ]
     },
     {
-        "id": "ebb70e0a.9be68",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
+        "id": "a209861e.a84c68",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 749,
-        "y": 667,
-        "z": "f1813121.5d5738",
+        "x": 949.9999694824219,
+        "y": 289.9999771118164,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "9e442bec.ab7e8"
+                "400f8845.d561c8"
             ]
         ]
     },
     {
-        "id": "8396ec44.a3b3f",
-        "type": "call",
-        "name": "call validate-input-parameters",
-        "xml": "<call module='optical-service' rpc='optical-validate-input-params' mode='sync' >\n",
+        "id": "400f8845.d561c8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n\n\n\n",
+        "comments": "",
+        "x": 1086.9999694824219,
+        "y": 286.9999771118164,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "e5d38e0f.c60ef",
+        "type": "switchNode",
+        "name": "switch uni",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 856,
-        "y": 92,
-        "z": "f1813121.5d5738",
+        "x": 720.9999694824219,
+        "y": 380.9999465942383,
+        "z": "6aec8519.596ebc",
         "wires": [
-            []
+            [
+                "43b24bcd.988c54"
+            ]
         ]
     },
     {
-        "id": "9e442bec.ab7e8",
-        "type": "call",
-        "name": "call TAPI DG",
-        "xml": "<call module='optical-service' rpc='service-create-tapi' mode='sync' >\n",
+        "id": "43b24bcd.988c54",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 948,
-        "y": 665,
-        "z": "f1813121.5d5738",
+        "x": 864.9999694824219,
+        "y": 383.9999465942383,
+        "z": "6aec8519.596ebc",
         "wires": [
-            []
+            [
+                "a79c959.2645a68"
+            ]
         ]
     },
     {
-        "id": "3e4acd01.4d0db2",
-        "type": "call",
-        "name": "call MSA DG",
-        "xml": "<call module='optical-service' rpc='service-create-msa' mode='sync' >\n",
+        "id": "a79c959.2645a68",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "comments": "",
+        "x": 1019.9999694824219,
+        "y": 381.9999465942383,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "e48f435a.a53b1",
+        "type": "switchNode",
+        "name": "switch enni",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 960,
-        "y": 550,
-        "z": "f1813121.5d5738",
+        "x": 709.9999694824219,
+        "y": 441.9999465942383,
+        "z": "6aec8519.596ebc",
         "wires": [
-            []
+            [
+                "2e88bf81.cdfcc"
+            ]
+        ]
+    },
+    {
+        "id": "2e88bf81.cdfcc",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 866.9999694824219,
+        "y": 449.9999465942383,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "6cecdd4e.699c54"
+            ]
+        ]
+    },
+    {
+        "id": "6cecdd4e.699c54",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "comments": "",
+        "x": 1028.9999694824219,
+        "y": 461.9999465942383,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "cd52a71e.a07748",
+        "type": "switchNode",
+        "name": "switch uni coding_func",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'uni_coding_func'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 725.9999694824219,
+        "y": 498.4000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "423b71c7.c87b8"
+            ]
+        ]
+    },
+    {
+        "id": "423b71c7.c87b8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 915.9999694824219,
+        "y": 502.4000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "48fc9f8f.e1214"
+            ]
         ]
     },
     {
-        "id": "98a2e7e3.d11d58",
+        "id": "48fc9f8f.e1214",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "comments": "",
+        "x": 1055.9999694824219,
+        "y": 508.4000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "96ffe338.d9102",
+        "type": "switchNode",
+        "name": "switch enni1",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni1_id'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 701.9999694824219,
+        "y": 556.4000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "b119e02f.85a12"
+            ]
+        ]
+    },
+    {
+        "id": "307d0ddd.cbbf82",
+        "type": "switchNode",
+        "name": "switch enni2",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni2_id'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 697.9999694824219,
+        "y": 623.4000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "6a8649d8.5b4328"
+            ]
+        ]
+    },
+    {
+        "id": "b119e02f.85a12",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 869.9999694824219,
+        "y": 559.4000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "78577f48.191f5"
+            ]
+        ]
+    },
+    {
+        "id": "6a8649d8.5b4328",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 860.9999694824219,
+        "y": 627.4000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "260a366a.9008da"
+            ]
+        ]
+    },
+    {
+        "id": "78577f48.191f5",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "comments": "",
+        "x": 1010.9999694824219,
+        "y": 558.4000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "260a366a.9008da",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "comments": "",
+        "x": 994.9999694824219,
+        "y": 631.4000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "6c345065.66388",
+        "type": "switchNode",
+        "name": "switch uni coding_func",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'enni1_coding_func'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 703.9999694824219,
+        "y": 667.8000259399414,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "109cf4b6.34d27b"
+            ]
+        ]
+    },
+    {
+        "id": "109cf4b6.34d27b",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 873.9999694824219,
+        "y": 671.8000259399414,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "a04925ba.233548"
+            ]
+        ]
+    },
+    {
+        "id": "a04925ba.233548",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-rate' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
+        "comments": "",
+        "x": 1017.9999694824219,
+        "y": 682.8000259399414,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "c467f6e9.a09748",
+        "type": "get-resource",
+        "name": "get controller_id from DB",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT controller_id \nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE \nWHERE interface_name = $optical-service-create-input.payload.service-aend.port-id' \npfx='db.source1'>\n    \n    \n    \n    \n    \n    \n    \n    \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 687.9999694824219,
+        "y": 761.6000137329102,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "ea6ce722.102db8"
+            ]
+        ]
+    },
+    {
+        "id": "27820288.3245de",
         "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\nAND interface_id = $optical-service-create-input.payload.service-aend.port-name'\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",
+        "name": "get controller_id from DB",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT controller_id \nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE \nWHERE interface_name = $optical-service-create-input.payload.service-zend.port-id' \npfx='db.source2'>\n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 746,
-        "y": 230,
-        "z": "f1813121.5d5738",
+        "x": 668,
+        "y": 846.6000137329102,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "130f8c79.83a0ec"
+                "2351ae73.eacf92"
             ]
         ]
     },
     {
-        "id": "dbd48c3a.1af36",
+        "id": "89a07cd5.0252",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='controller1' value=\"`$db.source1.controller-id`\"/>\n",
+        "comments": "",
+        "x": 1012.9999694824219,
+        "y": 764.6000137329102,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "9eef6461.fbaa98",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='controller2' value=\"`$db.source2.controller-id`\"/>\n",
+        "comments": "",
+        "x": 1009.9999694824219,
+        "y": 853.6000137329102,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "4ff206b2.2a38f8",
+        "type": "switchNode",
+        "name": "controllers-id check",
+        "xml": "<switch test='`$controller1==$controller2`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 105.99996948242188,
+        "y": 1354.5999755859375,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "6d524179.31442",
+                "29c9a077.5048"
+            ]
+        ]
+    },
+    {
+        "id": "6d524179.31442",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 373.89996337890625,
+        "y": 1285.89990234375,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "77e4cb5c.3ea374"
+            ]
+        ]
+    },
+    {
+        "id": "7fa6e0ba.8dc59",
+        "type": "call",
+        "name": "main-create",
+        "xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 705.9000244140625,
+        "y": 1277.9000244140625,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "a084b4d3.d2ad68"
+            ]
+        ]
+    },
+    {
+        "id": "29c9a077.5048",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 377.89996337890625,
+        "y": 1460.9000244140625,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "3686da83.318ed6"
+            ]
+        ]
+    },
+    {
+        "id": "eb2c1d7a.9bc0f",
         "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",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller1`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 765,
-        "y": 283,
-        "z": "f1813121.5d5738",
+        "x": 679.8999633789062,
+        "y": 902.9000015258789,
+        "z": "6aec8519.596ebc",
         "wires": [
             []
         ]
     },
     {
-        "id": "130f8c79.83a0ec",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "812b7088.1c2e1",
+        "type": "execute",
+        "name": "split node-id a-end retrieved from DB",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller2`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix2\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 667.8999938964844,
+        "y": 950.9000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f6999b39.46ee28",
+        "type": "set",
+        "name": "set controller-ip",
+        "xml": "<set>\n<parameter name='controller-ip1' value='`$param-prefix1[1]`' />\n<parameter name='domain-type1' value='`$param-prefix1[0]`' />\n<parameter name='controller-ip2' value='`$param-prefix2[1]`' />\n<parameter name='domain-type2' value='`$param-prefix2[0]`' />\n ",
+        "comments": "",
+        "x": 592.75,
+        "y": 998.7499771118164,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "3686da83.318ed6",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 976,
-        "y": 229,
-        "z": "f1813121.5d5738",
+        "x": 519.566650390625,
+        "y": 1458.566650390625,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "526e75aa.f179f4"
+                "7f7dd90.ca00828",
+                "402e803d.bb4b3",
+                "f46024a4.178778",
+                "4cfee8aa.5fe5e8",
+                "ddc83fd9.94789"
             ]
         ]
     },
     {
-        "id": "526e75aa.f179f4",
+        "id": "7f7dd90.ca00828",
         "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",
+        "xml": "<set>\n<parameter name='access-aend' value=\"`$optical-service-create-input.payload.service-aend.port-id`\"/>\n<parameter name='access-zend' value=\"`$optical-service-create-input.payload.service-zend.port-id`\"/>\n",
         "comments": "",
-        "x": 1129,
-        "y": 232,
-        "z": "f1813121.5d5738",
+        "x": 690.6499710083008,
+        "y": 1577.6500482559204,
+        "z": "6aec8519.596ebc",
         "wires": []
     },
     {
-        "id": "79f9f3f0.aa019c",
-        "type": "set",
-        "name": "set controller-ip",
-        "xml": "<set>\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n",
+        "id": "ddc83fd9.94789",
+        "type": "call",
+        "name": "inter-domain DG",
+        "xml": "<call module='optical-service' rpc='inter-domain-handling' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 682.1499710083008,
+        "y": 1692.6500492095947,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "77e4cb5c.3ea374",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 529.8999633789062,
+        "y": 1282.9000244140625,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "aa333758.2eb158",
+                "c56b33b.5b1d4d",
+                "dfbe19a.ac6e1e8",
+                "9217e91.3f8cc18",
+                "7fa6e0ba.8dc59"
+            ]
+        ]
+    },
+    {
+        "id": "d28a3ef1.7ab4b",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$final-response-code`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 924.9000244140625,
+        "y": 1190.9000244140625,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "516af1e8.b7429"
+            ]
+        ]
+    },
+    {
+        "id": "516af1e8.b7429",
+        "type": "outcome",
+        "name": "200",
+        "xml": "<outcome value='200'>\n",
         "comments": "",
-        "x": 705,
-        "y": 341,
-        "z": "f1813121.5d5738",
+        "outputs": 1,
+        "x": 1062.9000244140625,
+        "y": 1183.9000244140625,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "8514f080.cd77"
+            ]
+        ]
+    },
+    {
+        "id": "9457262f.dafa78",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Service Created Successfully' />\n<parameter name='ack-final-indicator' value='Y' />\n",
+        "comments": "",
+        "x": 1362.9000244140625,
+        "y": 1226.9000244140625,
+        "z": "6aec8519.596ebc",
         "wires": []
     },
     {
-        "id": "a32436b4.dcfeb8",
-        "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\nAND interface_id = $optical-service-create-input.payload.service-aend.port-name'\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",
+        "id": "8514f080.cd77",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 616,
-        "y": 405,
-        "z": "f1813121.5d5738",
+        "x": 1200.9000244140625,
+        "y": 1179.9000244140625,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "73558010.2c724"
+                "9457262f.dafa78",
+                "d89f6cb.9d2869",
+                "90dcc928.7bcbc8"
             ]
         ]
     },
     {
-        "id": "6cb71359.685f54",
-        "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\nAND interface_id = $optical-service-create-input.payload.service-zend.port-name'\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",
+        "id": "6b15a6f5.41dc08",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$optical-service-create-input.payload.service-aend.port-id`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 748.8999938964844,
+        "y": 152.9000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "708a333d.a59a6c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$optical-service-create-input.payload.service-zend.port-id`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 743.8999938964844,
+        "y": 229.9000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2bad3261.39a7be",
+        "type": "switchNode",
+        "name": "service-name",
+        "xml": "<switch test=\"`$optical-service-create-input.payload.param[$idx].name == 'service-name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 612,
-        "y": 477,
-        "z": "f1813121.5d5738",
+        "x": 670.5666809082031,
+        "y": 722.5666580200195,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "c9ac9911.a76998"
+                "8a2bc3a2.8fb3"
             ]
         ]
     },
     {
-        "id": "73558010.2c724",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "8a2bc3a2.8fb3",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 805,
-        "y": 402,
-        "z": "f1813121.5d5738",
+        "x": 851.5666809082031,
+        "y": 730.5666580200195,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "35f9f711.be4718"
+                "f0ba54a2.8930a8"
             ]
         ]
     },
     {
-        "id": "35f9f711.be4718",
+        "id": "f0ba54a2.8930a8",
         "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",
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$optical-service-create-input.payload.param[$idx].value`\"/>\n",
         "comments": "",
-        "x": 967,
-        "y": 401,
-        "z": "f1813121.5d5738",
+        "x": 995.5667419433594,
+        "y": 728.5666732788086,
+        "z": "6aec8519.596ebc",
         "wires": []
     },
     {
-        "id": "c9ac9911.a76998",
+        "id": "ea6ce722.102db8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 867.8999938964844,
+        "y": 765.9000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "89a07cd5.0252"
+            ]
+        ]
+    },
+    {
+        "id": "2351ae73.eacf92",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 866.8999938964844,
+        "y": 850.9000015258789,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            [
+                "9eef6461.fbaa98"
+            ]
+        ]
+    },
+    {
+        "id": "a084b4d3.d2ad68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 803,
-        "y": 476,
-        "z": "f1813121.5d5738",
+        "x": 861.8999633789062,
+        "y": 1277.9000244140625,
+        "z": "6aec8519.596ebc",
         "wires": [
             [
-                "1b6fe865.a8bca8"
+                "d28a3ef1.7ab4b"
             ]
         ]
     },
     {
-        "id": "1b6fe865.a8bca8",
+        "id": "faed5cf2.7521c",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service1-request-id\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 364,
+        "y": 962,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "281e3ae5.c7e156",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service1-svc-instance-id\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 393,
+        "y": 876,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f4302cf0.c694f",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service2-svc-instance-id\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 327,
+        "y": 1037,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9cecb747.fbb8f8",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"service2-request-id\"/> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 298,
+        "y": 1114,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d89f6cb.9d2869",
+        "type": "call",
+        "name": "create-service-relationship",
+        "xml": "<call module='optical-service' rpc='create-service-relationship' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1459,
+        "y": 1145,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c56b33b.5b1d4d",
+        "type": "set",
+        "name": "set acc ser",
+        "xml": "<set>\n<parameter name='domain-requests' value=\"`$service1-request-id`\" />\n<parameter name='optical-service-create-input.request-id' value=\"`$service1-request-id`\" />\n<parameter name='optical-service-create-input.service-id' value=\"`$service1-svc-instance-id`\" />\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$optical-service-create-input.payload.service-name + '_' + 'MDONS-OTN'`\" /> \n",
+        "comments": "",
+        "x": 699,
+        "y": 1080,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "aa333758.2eb158",
+        "type": "save",
+        "name": "save access service db",
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );\"> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 763,
+        "y": 1170,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f46024a4.178778",
+        "type": "set",
+        "name": "set acc ser",
+        "xml": "<set>\n<parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />\n<parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />\n<parameter name='domain-requests' value=\"`$service1-request-id + ',' + $service2-request-id`\" />\n\n",
+        "comments": "",
+        "x": 699,
+        "y": 1395,
+        "z": "6aec8519.596ebc",
+        "wires": []
+    },
+    {
+        "id": "402e803d.bb4b3",
+        "type": "save",
+        "name": "save access service db",
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );\"> ",
+        "comments": "",
+        "outputs": 1,
+        "x": 761,
+        "y": 1522,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4cfee8aa.5fe5e8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`'domain rquest_' + $domain-requests`\"/>\n<parameter name=\"field2\" value=\"`'Service 1 req id---' + $service1-request-id`\"/>\n<parameter name=\"field3\" value=\"`'Service 2 req id---' + $service2-request-id`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 706.0999755859375,
+        "y": 1458.0999755859375,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dfbe19a.ac6e1e8",
+        "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": 705.0999755859375,
+        "y": 1125.0999755859375,
+        "z": "6aec8519.596ebc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9217e91.3f8cc18",
         "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",
+        "xml": "<set>\n<parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />\n<parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />",
         "comments": "",
-        "x": 971,
-        "y": 473,
-        "z": "f1813121.5d5738",
+        "x": 535,
+        "y": 1071,
+        "z": "6aec8519.596ebc",
         "wires": []
+    },
+    {
+        "id": "90dcc928.7bcbc8",
+        "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": 1385,
+        "y": 1070,
+        "z": "6aec8519.596ebc",
+        "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 9a2ee7af..15b2e9cc 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": "96e558c1.171928",
+        "id": "cb10d6c4.981698",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 174,
-        "y": 96,
-        "z": "4efb9c4a.945e04",
+        "x": 170,
+        "y": 107,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "ba6338c5.40bd88"
+                "63ae4640.f4c188"
             ]
         ]
     },
     {
-        "id": "ba6338c5.40bd88",
+        "id": "63ae4640.f4c188",
         "type": "service-logic",
         "name": "optical-service ${project.version}",
         "module": "optical-service",
@@ -22,1681 +22,1681 @@
         "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": 187,
-        "y": 156,
-        "z": "4efb9c4a.945e04",
+        "x": 183,
+        "y": 167,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "3857a42a.6b4cdc"
+                "ccc0be9.d18f84"
             ]
         ]
     },
     {
-        "id": "3857a42a.6b4cdc",
+        "id": "ccc0be9.d18f84",
         "type": "method",
         "name": "method service-create-tapi",
         "xml": "<method rpc='service-create-tapi' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 207,
-        "y": 236,
-        "z": "4efb9c4a.945e04",
+        "x": 203,
+        "y": 247,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "bca1514.f1c7bb"
+                "9e51a7e2.c96a48"
             ]
         ]
     },
     {
-        "id": "bca1514.f1c7bb",
+        "id": "9e51a7e2.c96a48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 416.5,
-        "y": 241,
-        "z": "4efb9c4a.945e04",
+        "x": 412.5,
+        "y": 252,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "83c30d61.39881",
-                "28460541.766c1a",
-                "58f1dbe7.901a34",
-                "72b2db54.6e2944",
-                "b90929e.4a985d8",
-                "65a74a39.a4d774",
-                "cc0f04eb.f41858",
-                "c7ace3b2.11081",
-                "3ff768b5.f99338",
-                "2995b56c.890f5a",
-                "bf3d0d8f.af5f6"
+                "3ceef95d.a94976",
+                "e43daa8d.210d18",
+                "30c153d0.f4174c",
+                "a085d0a9.db099",
+                "7cbb8085.aa09",
+                "b68ee0d5.ab2f1",
+                "ce711353.77418",
+                "86957885.24ae98",
+                "52992436.be902c",
+                "ff60ecd.026f51",
+                "ceb8b8b2.ae8198"
             ]
         ]
     },
     {
-        "id": "83c30d61.39881",
+        "id": "3ceef95d.a94976",
         "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": 416,
-        "y": 39,
-        "z": "4efb9c4a.945e04",
+        "x": 412,
+        "y": 50,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "28460541.766c1a",
+        "id": "e43daa8d.210d18",
         "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": 614.9999389648438,
-        "y": 90.99998474121094,
-        "z": "4efb9c4a.945e04",
+        "x": 610.9999389648438,
+        "y": 101.99998474121094,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "40e83861.7ed4d8"
+                "c6f3bb2.1ae1f48"
             ]
         ]
     },
     {
-        "id": "58f1dbe7.901a34",
+        "id": "30c153d0.f4174c",
         "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": 635.9999389648438,
-        "y": 155.99996948242188,
-        "z": "4efb9c4a.945e04",
+        "x": 631.9999389648438,
+        "y": 166.99996948242188,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "428896b5.e069b8"
+                "5ed218c5.9a0bc8"
             ]
         ]
     },
     {
-        "id": "40e83861.7ed4d8",
+        "id": "c6f3bb2.1ae1f48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 774.9999389648438,
-        "y": 92.99998474121094,
-        "z": "4efb9c4a.945e04",
+        "x": 770.9999389648438,
+        "y": 103.99998474121094,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "eccba7dd.6944a8"
+                "6a954070.e5ff5"
             ]
         ]
     },
     {
-        "id": "428896b5.e069b8",
+        "id": "5ed218c5.9a0bc8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 784.9999389648438,
-        "y": 153.99996948242188,
-        "z": "4efb9c4a.945e04",
+        "x": 780.9999389648438,
+        "y": 164.99996948242188,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "37897f34.5ca9"
+                "9ead2d56.36328"
             ]
         ]
     },
     {
-        "id": "eccba7dd.6944a8",
+        "id": "6a954070.e5ff5",
         "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",
         "comments": "",
-        "x": 940.9999389648438,
-        "y": 93.99996948242188,
-        "z": "4efb9c4a.945e04",
+        "x": 936.9999389648438,
+        "y": 104.99996948242188,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "37897f34.5ca9",
+        "id": "9ead2d56.36328",
         "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": 934,
-        "y": 153,
-        "z": "4efb9c4a.945e04",
+        "x": 930,
+        "y": 164,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "72b2db54.6e2944",
+        "id": "a085d0a9.db099",
         "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": 604,
-        "y": 45,
-        "z": "4efb9c4a.945e04",
+        "x": 600,
+        "y": 56,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "b90929e.4a985d8",
+        "id": "7cbb8085.aa09",
         "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": 700,
-        "y": 237,
-        "z": "4efb9c4a.945e04",
+        "x": 696,
+        "y": 248,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "65a74a39.a4d774",
+        "id": "b68ee0d5.ab2f1",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$aend.network-interface-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 615,
-        "y": 333,
-        "z": "4efb9c4a.945e04",
+        "x": 611,
+        "y": 344,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "4a9b044a.0f3ccc",
-                "ea6d56a1.b032a8"
+                "c6743c18.bbfeb",
+                "d6efe253.7e8f"
             ]
         ]
     },
     {
-        "id": "4a9b044a.0f3ccc",
+        "id": "c6743c18.bbfeb",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='UNI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 740,
-        "y": 282,
-        "z": "4efb9c4a.945e04",
+        "x": 736,
+        "y": 293,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "c9780ca0.f5f71"
+                "cdb5c5b5.9048e8"
             ]
         ]
     },
     {
-        "id": "4b0b12c9.238b4c",
+        "id": "131024c8.c2705b",
         "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": 1115,
-        "y": 131,
-        "z": "4efb9c4a.945e04",
+        "x": 1111,
+        "y": 142,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "8b8d35a4.ce05f8",
+        "id": "40b15a3.dac47a4",
         "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": 1102,
-        "y": 373,
-        "z": "4efb9c4a.945e04",
+        "x": 1143,
+        "y": 384,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "c9780ca0.f5f71",
+        "id": "cdb5c5b5.9048e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 878,
-        "y": 281,
-        "z": "4efb9c4a.945e04",
+        "x": 874,
+        "y": 292,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "4b0b12c9.238b4c",
-                "72c16e75.1a562",
-                "bd108f1e.ab488"
+                "131024c8.c2705b",
+                "b290b92c.1e7b58",
+                "b86f369c.e3ed78"
             ]
         ]
     },
     {
-        "id": "2ea274d9.8036ac",
+        "id": "d2686a37.db5528",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 898,
-        "y": 396,
-        "z": "4efb9c4a.945e04",
+        "x": 894,
+        "y": 407,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "8b8d35a4.ce05f8",
-                "e25b0e67.09bb4",
-                "a1b81fea.edbde",
-                "514a609b.d74c"
+                "40b15a3.dac47a4",
+                "7a067107.2ec2",
+                "ab1ab8d.88c2948",
+                "75a9a4ed.ec8d2c"
             ]
         ]
     },
     {
-        "id": "3109f9ae.76da66",
+        "id": "4fdc9aa0.b29954",
         "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.1111221313477,
-        "y": 457.22221660614014,
-        "z": "4efb9c4a.945e04",
+        "x": 1229.111083984375,
+        "y": 460.22222900390625,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "11b6c81d.28de98",
-                "599fbaf2.e79674"
+                "c21f9ebf.94222",
+                "c3ad189d.190788"
             ]
         ]
     },
     {
-        "id": "11b6c81d.28de98",
+        "id": "c21f9ebf.94222",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1346.77779006958,
-        "y": 411.0000057220459,
-        "z": "4efb9c4a.945e04",
+        "x": 1342.77779006958,
+        "y": 422.0000057220459,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "d3f94b37.cc4268"
+                "f0cb2de3.028b2"
             ]
         ]
     },
     {
-        "id": "599fbaf2.e79674",
+        "id": "c3ad189d.190788",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1356.2221794128418,
-        "y": 480.7777805328369,
-        "z": "4efb9c4a.945e04",
+        "x": 1352.2221794128418,
+        "y": 491.7777805328369,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "14aab0b3.9d34ff"
+                "27f9e6a9.a5da2a"
             ]
         ]
     },
     {
-        "id": "d3f94b37.cc4268",
+        "id": "f0cb2de3.028b2",
         "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": 1504,
-        "y": 411,
-        "z": "4efb9c4a.945e04",
+        "x": 1500,
+        "y": 422,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "7102ebf7.57bb74",
+        "id": "9994476.f537bb8",
         "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": 1643,
-        "y": 433,
-        "z": "4efb9c4a.945e04",
+        "x": 1639,
+        "y": 444,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "e25b0e67.09bb4",
+        "id": "7a067107.2ec2",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='0' end='`$param-prefix_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1090,
-        "y": 422,
-        "z": "4efb9c4a.945e04",
+        "x": 1086,
+        "y": 433,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "46da2f38.8c645"
+                "6d62527a.1e40bc"
             ]
         ]
     },
     {
-        "id": "14aab0b3.9d34ff",
+        "id": "27f9e6a9.a5da2a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1494,
-        "y": 483,
-        "z": "4efb9c4a.945e04",
+        "x": 1490,
+        "y": 494,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "7102ebf7.57bb74",
-                "4004dd00.d10474"
+                "9994476.f537bb8",
+                "5de58fdb.3dc18"
             ]
         ]
     },
     {
-        "id": "d11a7c1c.7e732",
+        "id": "8b835dad.6e468",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2100.5552864074707,
-        "y": 532.1110572814941,
-        "z": "4efb9c4a.945e04",
+        "x": 2096.5552864074707,
+        "y": 543.1110572814941,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "a50c2dd5.e9535",
+        "id": "f03d8eb8.9e89b",
         "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": 2128.3332290649414,
-        "y": 461.1111087799072,
-        "z": "4efb9c4a.945e04",
+        "x": 2124.3332290649414,
+        "y": 472.1111087799072,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "7c05f290.3530ac",
+        "id": "a19a25b4.a7fc58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1922,
-        "y": 498,
-        "z": "4efb9c4a.945e04",
+        "x": 1918,
+        "y": 509,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "a50c2dd5.e9535",
-                "d11a7c1c.7e732"
+                "f03d8eb8.9e89b",
+                "8b835dad.6e468"
             ]
         ]
     },
     {
-        "id": "46da2f38.8c645",
+        "id": "6d62527a.1e40bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1099,
-        "y": 483,
-        "z": "4efb9c4a.945e04",
+        "x": 1095,
+        "y": 494,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "3109f9ae.76da66"
+                "4fdc9aa0.b29954"
             ]
         ]
     },
     {
-        "id": "a1b81fea.edbde",
+        "id": "ab1ab8d.88c2948",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value='' />\n<parameter name='aend-local-id' value='' />\n\n",
         "comments": "",
-        "x": 1066,
-        "y": 326,
-        "z": "4efb9c4a.945e04",
+        "x": 1062,
+        "y": 337,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "cc0f04eb.f41858",
+        "id": "ce711353.77418",
         "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": 719,
-        "y": 779,
-        "z": "4efb9c4a.945e04",
+        "x": 715,
+        "y": 790,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "c7ace3b2.11081",
+        "id": "86957885.24ae98",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$zend.network-interface-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 488,
-        "y": 1128,
-        "z": "4efb9c4a.945e04",
+        "x": 484,
+        "y": 1139,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "c85fd988.301698",
-                "9efb19c3.6da618"
+                "2dd9facb.4d9096",
+                "9f7e7624.f487d8"
             ]
         ]
     },
     {
-        "id": "c85fd988.301698",
+        "id": "2dd9facb.4d9096",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='UNI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 614,
-        "y": 1048,
-        "z": "4efb9c4a.945e04",
+        "x": 610,
+        "y": 1059,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "b4f379c1.c24888"
+                "70ab075.7054cf8"
             ]
         ]
     },
     {
-        "id": "7c3f18e8.1c0b18",
+        "id": "2cf44710.442d88",
         "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": 1035,
-        "y": 769,
-        "z": "4efb9c4a.945e04",
+        "x": 1031,
+        "y": 780,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "3e6ef851.b14d38",
+        "id": "11c54622.c031aa",
         "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": 986,
-        "y": 1188,
-        "z": "4efb9c4a.945e04",
+        "x": 982,
+        "y": 1199,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "b4f379c1.c24888",
+        "id": "70ab075.7054cf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 894,
-        "y": 827,
-        "z": "4efb9c4a.945e04",
+        "x": 890,
+        "y": 838,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "7c3f18e8.1c0b18",
-                "f950d837.cb97f8",
-                "ccff2354.5c8d6"
+                "2cf44710.442d88",
+                "cee2aa19.600e38",
+                "7c2ba1f9.81021"
             ]
         ]
     },
     {
-        "id": "2ae39741.d1c3c8",
+        "id": "a49ef364.fd7db",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 776,
-        "y": 1245,
-        "z": "4efb9c4a.945e04",
+        "x": 772,
+        "y": 1256,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "3e6ef851.b14d38",
-                "f903e0d6.863cf",
-                "9bced74d.d072a8",
-                "943fe233.c96d1"
+                "11c54622.c031aa",
+                "5bdbd1f1.43aa3",
+                "72f7503a.affea",
+                "54bcccf0.aad274"
             ]
         ]
     },
     {
-        "id": "f903e0d6.863cf",
+        "id": "5bdbd1f1.43aa3",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value='' />\n<parameter name='zend-local-id' value='' />\n",
         "comments": "",
-        "x": 987,
-        "y": 1136,
-        "z": "4efb9c4a.945e04",
+        "x": 983,
+        "y": 1147,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "ea6d56a1.b032a8",
+        "id": "d6efe253.7e8f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 752,
-        "y": 398,
-        "z": "4efb9c4a.945e04",
+        "x": 748,
+        "y": 409,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "2ea274d9.8036ac"
+                "d2686a37.db5528"
             ]
         ]
     },
     {
-        "id": "9efb19c3.6da618",
+        "id": "9f7e7624.f487d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 610,
-        "y": 1243,
-        "z": "4efb9c4a.945e04",
+        "x": 606,
+        "y": 1254,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "2ae39741.d1c3c8"
+                "a49ef364.fd7db"
             ]
         ]
     },
     {
-        "id": "3ff768b5.f99338",
+        "id": "52992436.be902c",
         "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": 227.00006103515625,
-        "y": 1569,
-        "z": "4efb9c4a.945e04",
+        "x": 223.00006103515625,
+        "y": 1580,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "f2fbbd03.f2906",
-                "bebd84e7.a3b248"
+                "807d3a9b.b39f98",
+                "4ca35ad.57ba6a4"
             ]
         ]
     },
     {
-        "id": "f2fbbd03.f2906",
+        "id": "807d3a9b.b39f98",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 368.00006103515625,
-        "y": 1517,
-        "z": "4efb9c4a.945e04",
+        "x": 364.00006103515625,
+        "y": 1528,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "dcee484.0427eb8"
+                "c9f09c9a.c5b34"
             ]
         ]
     },
     {
-        "id": "bebd84e7.a3b248",
+        "id": "4ca35ad.57ba6a4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 382.00006103515625,
-        "y": 1631,
-        "z": "4efb9c4a.945e04",
+        "x": 378.00006103515625,
+        "y": 1642,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "87a25e6a.1b2d"
+                "2378e9dd.60d396"
             ]
         ]
     },
     {
-        "id": "dcee484.0427eb8",
+        "id": "c9f09c9a.c5b34",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 533.0000610351562,
-        "y": 1516,
-        "z": "4efb9c4a.945e04",
+        "x": 529.0000610351562,
+        "y": 1527,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "58ea97a5.b3e618"
+                "f18f6836.1d4108"
             ]
         ]
     },
     {
-        "id": "87a25e6a.1b2d",
+        "id": "2378e9dd.60d396",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 558.0000610351562,
-        "y": 1631,
-        "z": "4efb9c4a.945e04",
+        "x": 554.0000610351562,
+        "y": 1642,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "df77f71.8f24908",
-                "e14a80e1.1f5b7",
-                "9510207c.71682",
-                "6da24e58.717bb",
-                "71928460.ed14cc",
-                "5a15ce33.45154"
+                "70e50a50.c3ff54",
+                "579d26d3.591e88",
+                "750b8813.7e3ec8",
+                "438684f8.c804ec",
+                "b5a7e704.c626d8",
+                "59ec667.1ec9998"
             ]
         ]
     },
     {
-        "id": "58ea97a5.b3e618",
+        "id": "f18f6836.1d4108",
         "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' />\n<parameter name='ack-final-indicator' value=\"Y\" />",
-        "comments": "",
-        "x": 725.0000610351562,
-        "y": 1517,
-        "z": "4efb9c4a.945e04",
-        "wires": []
-    },
-    {
-        "id": "df77f71.8f24908",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Service created successfully' />\n<parameter name='ack-final-indicator' value=\"Y\" />\n",
+        "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": 734.5556030273438,
-        "y": 1874.4443359375,
-        "z": "4efb9c4a.945e04",
+        "x": 721.0000610351562,
+        "y": 1528,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "4a0bc718.a962f8",
+        "id": "98706095.76a01",
         "type": "call",
         "name": "call",
         "xml": "<call module='optical-service' rpc='success-aai-update-tapi' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1271,
-        "y": 2002,
-        "z": "4efb9c4a.945e04",
+        "x": 1267,
+        "y": 2013,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "2995b56c.890f5a",
+        "id": "ff60ecd.026f51",
         "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",
         "comments": "",
-        "x": 327,
-        "y": 1371,
-        "z": "4efb9c4a.945e04",
+        "x": 323,
+        "y": 1382,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "bf3d0d8f.af5f6",
+        "id": "ceb8b8b2.ae8198",
         "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": 291,
-        "y": 1454,
-        "z": "4efb9c4a.945e04",
+        "x": 287,
+        "y": 1465,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "8f662c6.88da9d",
+        "id": "a4f3d4cb.d51068",
         "type": "for",
         "name": "for",
         "xml": "<for index='idl' start='0' end='`$param-prefix1_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1258,
-        "y": 1490,
-        "z": "4efb9c4a.945e04",
+        "x": 1254,
+        "y": 1501,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "b907a417.722e98"
+                "29ec1f.599403e2"
             ]
         ]
     },
     {
-        "id": "ba640497.6998e8",
+        "id": "abf6e183.cf7b",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new + $param-prefix1[$idl]`\" />\n",
         "comments": "",
-        "x": 1710,
-        "y": 1421,
-        "z": "4efb9c4a.945e04",
+        "x": 1706,
+        "y": 1432,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "b907a417.722e98",
+        "id": "29ec1f.599403e2",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$idl`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1393,
-        "y": 1491,
-        "z": "4efb9c4a.945e04",
+        "x": 1389,
+        "y": 1502,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "91e17725.73caf8",
-                "c2c37dd4.88b1e",
-                "84a33271.66a7e"
+                "7815f59.b48cf0c",
+                "3a3a667b.eb736a",
+                "31a716b1.aadeaa"
             ]
         ]
     },
     {
-        "id": "91e17725.73caf8",
+        "id": "7815f59.b48cf0c",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='`$param-prefix1_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1573,
-        "y": 1423,
-        "z": "4efb9c4a.945e04",
+        "x": 1569,
+        "y": 1434,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "ba640497.6998e8"
+                "abf6e183.cf7b"
             ]
         ]
     },
     {
-        "id": "c2c37dd4.88b1e",
+        "id": "3a3a667b.eb736a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1580,
-        "y": 1498,
-        "z": "4efb9c4a.945e04",
+        "x": 1576,
+        "y": 1509,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "7e15b45a.f1185c"
+                "53f306dd.3c4f48"
             ]
         ]
     },
     {
-        "id": "7e15b45a.f1185c",
+        "id": "53f306dd.3c4f48",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new + $param-prefix1[$idl] + ','`\" />\n",
         "comments": "",
-        "x": 1736,
-        "y": 1500,
-        "z": "4efb9c4a.945e04",
+        "x": 1732,
+        "y": 1511,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "84a33271.66a7e",
+        "id": "31a716b1.aadeaa",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='`$idk`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1564,
-        "y": 1558,
-        "z": "4efb9c4a.945e04",
+        "x": 1560,
+        "y": 1569,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "2fb07baa.dd5174"
+                "f6272db.5d44ad"
             ]
         ]
     },
     {
-        "id": "2fb07baa.dd5174",
+        "id": "f6272db.5d44ad",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value='`$zend-new`' />\n",
         "comments": "",
-        "x": 1741,
-        "y": 1556,
-        "z": "4efb9c4a.945e04",
+        "x": 1737,
+        "y": 1567,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "9510207c.71682",
+        "id": "579d26d3.591e88",
         "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": 857.2222900390625,
-        "y": 1697.666748046875,
-        "z": "4efb9c4a.945e04",
+        "x": 853.2222900390625,
+        "y": 1708.666748046875,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "e14a80e1.1f5b7",
+        "id": "70e50a50.c3ff54",
         "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": 875,
-        "y": 1631,
-        "z": "4efb9c4a.945e04",
+        "x": 871,
+        "y": 1642,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "72c16e75.1a562",
+        "id": "b290b92c.1e7b58",
         "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": 1118,
-        "y": 195,
-        "z": "4efb9c4a.945e04",
+        "x": 1114,
+        "y": 206,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "f950d837.cb97f8",
+        "id": "cee2aa19.600e38",
         "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": 1054,
-        "y": 816,
-        "z": "4efb9c4a.945e04",
+        "x": 1050,
+        "y": 827,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "6da24e58.717bb",
+        "id": "750b8813.7e3ec8",
         "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": 877,
-        "y": 1573,
-        "z": "4efb9c4a.945e04",
+        "x": 873,
+        "y": 1584,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "c27a69f2.0ddb38",
+        "id": "20d16b37.4f5834",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1793,
-        "y": 466,
-        "z": "4efb9c4a.945e04",
+        "x": 1789,
+        "y": 477,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "7c05f290.3530ac"
+                "a19a25b4.a7fc58"
             ]
         ]
     },
     {
-        "id": "7b435c8d.3fd214",
+        "id": "c356252d.5683a8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1822.222116470337,
-        "y": 593.3333568572998,
-        "z": "4efb9c4a.945e04",
+        "x": 1818.222116470337,
+        "y": 604.3333568572998,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "d092daa9.9a37d8"
+                "741c9f44.5e3af"
             ]
         ]
     },
     {
-        "id": "d092daa9.9a37d8",
+        "id": "741c9f44.5e3af",
         "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": 1966.6666259765625,
-        "y": 593.3333129882812,
-        "z": "4efb9c4a.945e04",
+        "x": 1962.6666259765625,
+        "y": 604.3333129882812,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "71928460.ed14cc",
+        "id": "438684f8.c804ec",
         "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": 765.9999389648438,
-        "y": 1818.111083984375,
-        "z": "4efb9c4a.945e04",
+        "x": 761.9999389648438,
+        "y": 1829.111083984375,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "5a15ce33.45154",
+        "id": "b5a7e704.c626d8",
         "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": 758.9999389648438,
-        "y": 1758,
-        "z": "4efb9c4a.945e04",
+        "x": 754.9999389648438,
+        "y": 1769,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "bd108f1e.ab488",
+        "id": "b86f369c.e3ed78",
         "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": 1116,
-        "y": 256,
-        "z": "4efb9c4a.945e04",
+        "x": 1112,
+        "y": 267,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "6b2a855d.23024c",
-                "f3b11a4b.2344f8"
+                "112c1c.b3e563e4",
+                "aec0582d.cd7cc8"
             ]
         ]
     },
     {
-        "id": "6b2a855d.23024c",
+        "id": "112c1c.b3e563e4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1274,
-        "y": 216,
-        "z": "4efb9c4a.945e04",
+        "x": 1270,
+        "y": 227,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "eef404ec.f0bb08"
+                "c51550d7.c3d1f"
             ]
         ]
     },
     {
-        "id": "f3b11a4b.2344f8",
+        "id": "aec0582d.cd7cc8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1283.4443893432617,
-        "y": 285.777774810791,
-        "z": "4efb9c4a.945e04",
+        "x": 1279.4443893432617,
+        "y": 296.777774810791,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "d15a3398.6ced1"
+                "4850f247.c34dcc"
             ]
         ]
     },
     {
-        "id": "eef404ec.f0bb08",
+        "id": "c51550d7.c3d1f",
         "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": 1431.22220993042,
-        "y": 215.9999942779541,
-        "z": "4efb9c4a.945e04",
+        "x": 1427.22220993042,
+        "y": 226.9999942779541,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "d15a3398.6ced1",
+        "id": "4850f247.c34dcc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1449.22216796875,
-        "y": 284,
-        "z": "4efb9c4a.945e04",
+        "x": 1445.22216796875,
+        "y": 295,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "afd9ff21.3fd56"
+                "d78c4eb5.bbc8d"
             ]
         ]
     },
     {
-        "id": "afd9ff21.3fd56",
+        "id": "d78c4eb5.bbc8d",
         "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": 1643,
-        "y": 284,
-        "z": "4efb9c4a.945e04",
+        "x": 1639,
+        "y": 295,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "b74dbdb.822994",
+        "id": "39a4154d.b828aa",
         "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": 1341,
-        "y": 1242,
-        "z": "4efb9c4a.945e04",
+        "x": 1337,
+        "y": 1253,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "e8c33d42.33806",
-                "d05bc068.08527"
+                "d0d69a7e.2c9698",
+                "659dd71a.78bb68"
             ]
         ]
     },
     {
-        "id": "e8c33d42.33806",
+        "id": "d0d69a7e.2c9698",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1462,
-        "y": 1203,
-        "z": "4efb9c4a.945e04",
+        "x": 1458,
+        "y": 1214,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "431138f7.d0a218"
+                "2cf98134.38344e"
             ]
         ]
     },
     {
-        "id": "d05bc068.08527",
+        "id": "659dd71a.78bb68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1480,
-        "y": 1297,
-        "z": "4efb9c4a.945e04",
+        "x": 1476,
+        "y": 1308,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "f244762f.d3c018"
+                "ad8cdb39.1a9318"
             ]
         ]
     },
     {
-        "id": "431138f7.d0a218",
+        "id": "2cf98134.38344e",
         "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": 1610,
-        "y": 1200,
-        "z": "4efb9c4a.945e04",
+        "x": 1606,
+        "y": 1211,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "7e69d1da.c8582",
+        "id": "431f9c15.b4bd64",
         "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": 1779,
-        "y": 1250,
-        "z": "4efb9c4a.945e04",
+        "x": 1775,
+        "y": 1261,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "9bced74d.d072a8",
+        "id": "72f7503a.affea",
         "type": "for",
         "name": "for",
         "xml": "<for index='idk' start='0' end='`$param-prefix1_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 987,
-        "y": 1243,
-        "z": "4efb9c4a.945e04",
+        "x": 983,
+        "y": 1254,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "1b2a920e.3e410e"
+                "b262046c.5382f8"
             ]
         ]
     },
     {
-        "id": "f244762f.d3c018",
+        "id": "ad8cdb39.1a9318",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1635,
-        "y": 1300,
-        "z": "4efb9c4a.945e04",
+        "x": 1631,
+        "y": 1311,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "7e69d1da.c8582",
-                "efc25f0c.a1d2c"
+                "431f9c15.b4bd64",
+                "29ec6fee.052a8"
             ]
         ]
     },
     {
-        "id": "efc25f0c.a1d2c",
+        "id": "29ec6fee.052a8",
         "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": 1789,
-        "y": 1314,
-        "z": "4efb9c4a.945e04",
+        "x": 1785,
+        "y": 1325,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "c32606e1.58b168",
-                "4ea93db7.c01e74"
+                "a5051a40.75b1d8",
+                "3532c7e2.141ac8"
             ]
         ]
     },
     {
-        "id": "1b2a920e.3e410e",
+        "id": "b262046c.5382f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1139,
-        "y": 1245,
-        "z": "4efb9c4a.945e04",
+        "x": 1135,
+        "y": 1256,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "b74dbdb.822994"
+                "39a4154d.b828aa"
             ]
         ]
     },
     {
-        "id": "a62b46a5.e1b858",
+        "id": "416d05b6.84daac",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2177,
-        "y": 1325,
-        "z": "4efb9c4a.945e04",
+        "x": 2173,
+        "y": 1336,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "e5a3a6b1.5eb5b8",
+        "id": "e59b1a2d.4329a8",
         "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": 2210,
-        "y": 1215,
-        "z": "4efb9c4a.945e04",
+        "x": 2206,
+        "y": 1226,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "5608122b.ab9f6c",
+        "id": "60931989.6a1588",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2059,
-        "y": 1271,
-        "z": "4efb9c4a.945e04",
+        "x": 2055,
+        "y": 1282,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "e5a3a6b1.5eb5b8",
-                "a62b46a5.e1b858"
+                "e59b1a2d.4329a8",
+                "416d05b6.84daac"
             ]
         ]
     },
     {
-        "id": "c32606e1.58b168",
+        "id": "a5051a40.75b1d8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1927.9998779296875,
-        "y": 1275.6666259765625,
-        "z": "4efb9c4a.945e04",
+        "x": 1923.9998779296875,
+        "y": 1286.6666259765625,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "5608122b.ab9f6c"
+                "60931989.6a1588"
             ]
         ]
     },
     {
-        "id": "4ea93db7.c01e74",
+        "id": "3532c7e2.141ac8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1927.8887939453125,
-        "y": 1380.1109619140625,
-        "z": "4efb9c4a.945e04",
+        "x": 1923.8887939453125,
+        "y": 1391.1109619140625,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "e720f2d5.77fdb"
+                "1671dd0d.761f93"
             ]
         ]
     },
     {
-        "id": "e720f2d5.77fdb",
+        "id": "1671dd0d.761f93",
         "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": 2107.22216796875,
-        "y": 1383.111083984375,
-        "z": "4efb9c4a.945e04",
+        "x": 2103.22216796875,
+        "y": 1394.111083984375,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "943fe233.c96d1",
+        "id": "54bcccf0.aad274",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$param-prefix1_length == 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 941,
-        "y": 1395,
-        "z": "4efb9c4a.945e04",
+        "x": 937,
+        "y": 1406,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "7c8d1f90.d20f8",
-                "59bf8efe.e5d3"
+                "52610222.06045c",
+                "5efd31c6.33b2f"
             ]
         ]
     },
     {
-        "id": "7c8d1f90.d20f8",
+        "id": "52610222.06045c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1081,
-        "y": 1349,
-        "z": "4efb9c4a.945e04",
+        "x": 1077,
+        "y": 1360,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "5a2d4b65.e557b4"
+                "ee5535d1.239b88"
             ]
         ]
     },
     {
-        "id": "5a2d4b65.e557b4",
+        "id": "ee5535d1.239b88",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new`\" />\n",
         "comments": "",
-        "x": 1216,
-        "y": 1349,
-        "z": "4efb9c4a.945e04",
+        "x": 1212,
+        "y": 1360,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "59bf8efe.e5d3",
+        "id": "5efd31c6.33b2f",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1083,
-        "y": 1489,
-        "z": "4efb9c4a.945e04",
+        "x": 1079,
+        "y": 1500,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "8f662c6.88da9d"
+                "a4f3d4cb.d51068"
             ]
         ]
     },
     {
-        "id": "4004dd00.d10474",
+        "id": "5de58fdb.3dc18",
         "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": 1652,
-        "y": 501,
-        "z": "4efb9c4a.945e04",
+        "x": 1648,
+        "y": 512,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "c27a69f2.0ddb38",
-                "7b435c8d.3fd214"
+                "20d16b37.4f5834",
+                "c356252d.5683a8"
             ]
         ]
     },
     {
-        "id": "514a609b.d74c",
+        "id": "75a9a4ed.ec8d2c",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$param-prefix_length == 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1071,
-        "y": 550,
-        "z": "4efb9c4a.945e04",
+        "x": 1067,
+        "y": 561,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "191fbb7.2a4b845",
-                "1cd1ef71.14acd1"
+                "331c057.f8ccefa",
+                "4b64ca6e.49b0f4"
             ]
         ]
     },
     {
-        "id": "191fbb7.2a4b845",
+        "id": "331c057.f8ccefa",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1225,
-        "y": 551,
-        "z": "4efb9c4a.945e04",
+        "x": 1221,
+        "y": 562,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "a558f9eb.613c58"
+                "7e9fbe10.9124"
             ]
         ]
     },
     {
-        "id": "a558f9eb.613c58",
+        "id": "7e9fbe10.9124",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new`\" />\n",
         "comments": "",
-        "x": 1387,
-        "y": 551,
-        "z": "4efb9c4a.945e04",
+        "x": 1383,
+        "y": 562,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "1cd1ef71.14acd1",
+        "id": "4b64ca6e.49b0f4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1229,
-        "y": 602,
-        "z": "4efb9c4a.945e04",
+        "x": 1225,
+        "y": 613,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "93a39454.c21878"
+                "6847867.f7a9678"
             ]
         ]
     },
     {
-        "id": "93a39454.c21878",
+        "id": "6847867.f7a9678",
         "type": "for",
         "name": "for",
         "xml": "<for index='idy' start='0' end='`$param-prefix_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1353,
-        "y": 626,
-        "z": "4efb9c4a.945e04",
+        "x": 1349,
+        "y": 637,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "6e31bfde.e9a2b"
+                "5a0e3964.160d08"
             ]
         ]
     },
     {
-        "id": "12b9813c.84c17f",
+        "id": "ed323941.b82938",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-new + $param-prefix[$idy]`\" />\n",
         "comments": "",
-        "x": 1803,
-        "y": 642,
-        "z": "4efb9c4a.945e04",
+        "x": 1799,
+        "y": 653,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "6e31bfde.e9a2b",
+        "id": "5a0e3964.160d08",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$idy`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1518,
-        "y": 691,
-        "z": "4efb9c4a.945e04",
+        "x": 1514,
+        "y": 702,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "48d2ce69.6ccad",
-                "735daaac.0a3344",
-                "2e826606.462a6a"
+                "b4f9d607.d62178",
+                "d260ee79.5c8ba",
+                "df466256.46eeb"
             ]
         ]
     },
     {
-        "id": "48d2ce69.6ccad",
+        "id": "b4f9d607.d62178",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='`$param-prefix_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1660,
-        "y": 642,
-        "z": "4efb9c4a.945e04",
+        "x": 1656,
+        "y": 653,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "12b9813c.84c17f"
+                "ed323941.b82938"
             ]
         ]
     },
     {
-        "id": "735daaac.0a3344",
+        "id": "d260ee79.5c8ba",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1690,
-        "y": 716,
-        "z": "4efb9c4a.945e04",
+        "x": 1686,
+        "y": 727,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "5f658cca.768614"
+                "2635ec82.339914"
             ]
         ]
     },
     {
-        "id": "5f658cca.768614",
+        "id": "2635ec82.339914",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-new + $param-prefix[$idy] + ','`\" />\n",
         "comments": "",
-        "x": 1807,
-        "y": 726,
-        "z": "4efb9c4a.945e04",
+        "x": 1803,
+        "y": 737,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "2e826606.462a6a",
+        "id": "df466256.46eeb",
         "type": "outcome",
         "name": "outcome",
         "xml": "<outcome value='`$idx`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1669,
-        "y": 797,
-        "z": "4efb9c4a.945e04",
+        "x": 1665,
+        "y": 808,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "4869b073.d45ad"
+                "5f13154d.62bb0c"
             ]
         ]
     },
     {
-        "id": "4869b073.d45ad",
+        "id": "5f13154d.62bb0c",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='aend-new' value='`$aend-new`' />\n",
         "comments": "",
-        "x": 1807,
-        "y": 793,
-        "z": "4efb9c4a.945e04",
+        "x": 1803,
+        "y": 804,
+        "z": "477ddea1.f7699",
         "wires": []
     },
     {
-        "id": "ccff2354.5c8d6",
+        "id": "7c2ba1f9.81021",
         "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": 1036,
-        "y": 902,
-        "z": "4efb9c4a.945e04",
+        "x": 1032,
+        "y": 913,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "f30e06ef.3ea158",
-                "7c8fb487.808e3c"
+                "aefead1b.dd11a",
+                "e40dc66d.cd39c8"
             ]
         ]
     },
     {
-        "id": "f30e06ef.3ea158",
+        "id": "aefead1b.dd11a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1196,
-        "y": 861,
-        "z": "4efb9c4a.945e04",
+        "x": 1192,
+        "y": 872,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "7aa077ea.c86438"
+                "15d190bf.2feb7f"
             ]
         ]
     },
     {
-        "id": "7c8fb487.808e3c",
+        "id": "e40dc66d.cd39c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1205.4443893432617,
-        "y": 930.777774810791,
-        "z": "4efb9c4a.945e04",
+        "x": 1201.4443893432617,
+        "y": 941.777774810791,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "a6409b41.3875a8"
+                "570b2f4e.56f7b"
             ]
         ]
     },
     {
-        "id": "7aa077ea.c86438",
+        "id": "15d190bf.2feb7f",
         "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": 1353.22220993042,
-        "y": 860.9999942779541,
-        "z": "4efb9c4a.945e04",
+        "x": 1349.22220993042,
+        "y": 871.9999942779541,
+        "z": "477ddea1.f7699",
         "wires": [
             []
         ]
     },
     {
-        "id": "a6409b41.3875a8",
+        "id": "570b2f4e.56f7b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1371.22216796875,
-        "y": 929,
-        "z": "4efb9c4a.945e04",
+        "x": 1364.22216796875,
+        "y": 941,
+        "z": "477ddea1.f7699",
         "wires": [
             [
-                "c469b431.4e03c8"
+                "6187c647.5929c8"
             ]
         ]
     },
     {
-        "id": "c469b431.4e03c8",
+        "id": "6187c647.5929c8",
         "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": 1565,
-        "y": 929,
-        "z": "4efb9c4a.945e04",
+        "x": 1542,
+        "y": 939,
+        "z": "477ddea1.f7699",
+        "wires": []
+    },
+    {
+        "id": "59ec667.1ec9998",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",
+        "comments": "",
+        "x": 697,
+        "y": 1886,
+        "z": "477ddea1.f7699",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/resources/graph.versions b/platform-logic/optical-service/src/main/resources/graph.versions
index 16546853..ffe85330 100644
--- a/platform-logic/optical-service/src/main/resources/graph.versions
+++ b/platform-logic/optical-service/src/main/resources/graph.versions
@@ -19,4 +19,7 @@ optical-service optical-service_success-aai-update-tapi ${project.version} sync
 optical-service optical-service_delete-bandwidth-update-odu1 ${project.version} sync
 optical-service optical-service_delete-bandwidth-update-odu2 ${project.version} sync
 optical-service optical-service_delete-bandwidth-update-odu3 ${project.version} sync
-optical-service optical-service_delete-bandwidth-update-odu4 ${project.version} sync
\ No newline at end of file
+optical-service optical-service_delete-bandwidth-update-odu4 ${project.version} sync
+optical-service optical-service_inter-domain-handling ${project.version} sync
+optical-service optical-service_create-service-relationship ${project.version} sync
+
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_create-service-relationship.xml b/platform-logic/optical-service/src/main/xml/optical-service_create-service-relationship.xml
new file mode 100644
index 00000000..669f3800
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_create-service-relationship.xml
@@ -0,0 +1,51 @@
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>
+    <method rpc='create-service-relationship' mode='sync'>
+        <block atomic='true'>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from REQUEST_DETAILS
+WHERE request_id = $as-request-id'
+pfx='access-service'></get-resource>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$access-service.domain-requests`'/>
+                <parameter name="regex" value=","/>
+                <parameter name="ctx_memory_result_key" value="domain-services"/>
+            </execute>
+            <for index='idc' start='0' end='`$domain-services_length`' >
+                <block atomic='true'>
+                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+key='SELECT *
+from REQUEST_DETAILS
+WHERE request_id = $domain-services[$idc]'
+pfx='ds-details'></get-resource>
+                    <block atomic='true'>
+                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  
+     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
+     service-subscription.service-type = $optical-service-create-input.service-type AND
+     service-instance.service-instance-id = $access-service.service-instance-id' force="true" pfx="tmp.AnAI-data">
+                            <parameter name="relationship-list.relationship[0].related-to" value="service-instance" />
+                            <parameter name="relationship-list.relationship[0].related-link" value="`'/business/customers/customer/' + $optical-service-create-input.global-customer-id + '/service-subscriptions/service-subscription/' + $optical-service-create-input.service-type + '/service-instances/service-instance/' + $ds-details.service-instance-id`" />
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="service-instance.service-instance-id" />
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$ds-details.service-instance-id`" />
+                        </save>
+                    </block>
+                </block>
+            </for>
+            <switch test='`$domain-services_length`'>
+                <outcome value='2'>
+                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  
+     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND
+     service-subscription.service-type = $optical-service-create-input.service-type AND
+     service-instance.service-instance-id = $access-service.service-instance-id' force="true" pfx="tmp.AnAI-data">
+                        <parameter name="relationship-list.relationship[0].related-to" value="service-instance" />
+                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $inter.logical-link[$ida].link-name`" />
+                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />
+                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$inter.logical-link[$ida].link-name`" />
+                    </save>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</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
new file mode 100644
index 00000000..eb1ef93f
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml
@@ -0,0 +1,197 @@
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>
+    <method rpc='inter-domain-handling' mode='sync'>
+        <block atomic="true">
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+resource="logical-links"
+key=" "
+pfx='inter' local-only='false' >
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='500' />
+                        <parameter name='error-message' value='No inter-domain-links available' />
+                        <parameter name='ack-final-indicator' value="Y" />
+                    </return>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='500' />
+                        <parameter name='error-message' value='Could not retrieve logical-links' />
+                        <parameter name='ack-final-indicator' value="Y" />
+                    </return>
+                </outcome>
+                <outcome value='success'>
+                    <block atomic="true">
+                        <for index='ida' start='0' end='`$inter.logical-link_length`' >
+                            <switch test='`$inter.logical-link[$ida].link-type`'>
+                                <outcome value='inter-domain'>
+                                    <switch test='`$inter.logical-link[$ida].available-capacity == 0`'>
+                                        <outcome value='true'></outcome>
+                                        <outcome value='false'>
+                                            <block atomic="true">
+                                                <set>
+                                                    <parameter name='access-bend' value='`$inter.logical-link[$ida].relationship-list.relationship[0].relationship-data[1].relationship-value`' />
+                                                    <parameter name='access-cend' value='`$inter.logical-link[$ida].relationship-list.relationship[1].relationship-data[1].relationship-value`' />
+                                                </set>
+                                                <break/>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/inter-domain.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="`'Aaccess bend---' + $access-bend`"/>
+                            <parameter name="field2" value="`'Aaccess cend---' + $access-cend`"/>
+                            <parameter name="field3" value="`'Service 1 req id---' + $service1-request-id`"/>
+                            <parameter name="field4" value="`'Service 2 req id---' + $service2-request-id`"/>
+                        </record>
+                        <switch test="`$access-bend == ''`">
+                            <outcome value='true'>
+                                <return status='failure'>
+                                    <parameter name='error-code' value='500' />
+                                    <parameter name='error-message' value='No inter-domain-links available' />
+                                    <parameter name='ack-final-indicator' value="Y" />
+                                </return>
+                            </outcome>
+                            <outcome value='false'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='access-service-name' value='`$optical-service-create-input.payload.service-name`' />
+                                    </set>
+                                    <for index='idb' start='0' end='2' >
+                                        <switch test='`$idb`'>
+                                            <outcome value='0'>
+                                                <block atomic="true">
+                                                    <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='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`" />
+                                                    </set>
+                                                    <call module='optical-service' rpc='main-create' mode='sync' >
+                                                        <outcome value='success'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name='service1-status' value='`$final-response-code`' />
+                                                                </set>
+                                                                <switch test='`$service1-status == 200`'>
+                                                                    <outcome value='true'>
+                                                                        <set>
+                                                                            <parameter name='service1' value='success' />
+                                                                        </set>
+                                                                    </outcome>
+                                                                    <outcome value='false'>
+                                                                        <set>
+                                                                            <parameter name='service1' value='failure' />
+                                                                        </set>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='error-code' value='500' />
+                                                                <parameter name='error-message' value='Main Create Dg not available' />
+                                                                <parameter name='ack-final-indicator' value="Y" />
+                                                            </return>
+                                                        </outcome>
+                                                    </call>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='1'>
+                                                <block atomic="true">
+                                                    <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='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`" />
+                                                    </set>
+                                                    <call module='optical-service' rpc='main-create' mode='sync' >
+                                                        <outcome value='success'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name='service2-status' value='`$final-response-code`' />
+                                                                </set>
+                                                                <switch test='`$service2-status == 200`'>
+                                                                    <outcome value='true'>
+                                                                        <set>
+                                                                            <parameter name='service2' value='success' />
+                                                                        </set>
+                                                                    </outcome>
+                                                                    <outcome value='false'>
+                                                                        <set>
+                                                                            <parameter name='service2' value='success' />
+                                                                        </set>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='error-code' value='500' />
+                                                                <parameter name='error-message' value='Main Create Dg not available' />
+                                                                <parameter name='ack-final-indicator' value="Y" />
+                                                            </return>
+                                                        </outcome>
+                                                    </call>
+                                                </block>
+                                            </outcome>
+                                        </switch>
+                                    </for>
+                                    <set>
+                                        <parameter name='inter' value='' />
+                                    </set>
+                                    <switch test='`$service1 == $service2 == success`'>
+                                        <outcome value='true'>
+                                            <block>
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+resource='SQL' 
+key='UPDATE REQUEST_DETAILS SET status = "CREATED" WHERE request_id = $as-request-id'
+force='true' pfx='save-result'></save>
+                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+force='true'
+resource='logical-link'
+     key='logical-link.link-name = $inter.logical-link[$ida].link-name '
+      local-only='false'>
+                                                    <parameter name='available-capacity' value='0' />
+                                                </update>
+                                                <call module='optical-service' rpc='create-service-relationship' mode='sync' ></call>
+                                                <return status='success'>
+                                                    <parameter name='error-code' value='200' />
+                                                    <parameter name='error-message' value='Multi-domain-service successfully created' />
+                                                    <parameter name='ack-final-indicator' value="Y" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='false'>
+                                            <block>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/inter-domain.log" />
+                                                    <parameter name="level" value="info" />
+                                                    <parameter name="field1" value="Access service creation failed"/>
+                                                </record>
+                                                <return status='failure'>
+                                                    <parameter name='error-code' value='500' />
+                                                    <parameter name='error-message' value='Multi-domain-service creation failed' />
+                                                    <parameter name='ack-final-indicator' value="Y" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </get-resource>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
index 240316ab..0c09b4a5 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-create.xml
@@ -3,68 +3,203 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>
     <method rpc='optical-service-create' mode='sync'>
         <block atomic='true'>
-            <call module='optical-service' rpc='optical-validate-input-params' mode='sync' ></call>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-key='SELECT controller_id
-from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
-WHERE interface_name = $optical-service-create-input.payload.service-aend.port-id
-AND interface_id = $optical-service-create-input.payload.service-aend.port-name'
-pfx='controllerid'>
-                <outcome value='success'>
-                    <set>
-                        <parameter name='controller-id' value='`$controllerid.controller-id`' />
-                    </set>
-                </outcome>
-            </get-resource>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                <parameter name="original_string" value='`$controller-id`'/>
-                <parameter name="regex" value="_"/>
-                <parameter name="ctx_memory_result_key" value="param-prefix"/>
-            </execute>
-            <set>
-                <parameter name='controller-ip' value='`$param-prefix[1]`' />
-            </set>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-key='SELECT *
-from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
-WHERE interface_name = $optical-service-create-input.payload.service-aend.port-id
-AND interface_id = $optical-service-create-input.payload.service-aend.port-name'
-pfx='db-aend'>
+            <for index='idx' start='0' end='`$optical-service-create-input.payload.param_length`' >
+                <set>
+                    <parameter name='params' value='`$optical-service-create-input.payload.param[$idx]`' />
+                </set>
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'uni1_id'`">
+                    <outcome value='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-aend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <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="`$optical-service-create-input.payload.service-aend.port-id`"/>
+                </record>
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'uni2_id'`">
+                    <outcome value='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-zend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <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="`$optical-service-create-input.payload.service-zend.port-id`"/>
+                </record>
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'uni1_coding_func'`">
+                    <outcome value='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-rate' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'uni_id'`">
+                    <outcome value='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-aend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'enni_id'`">
+                    <outcome value='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-zend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'uni_coding_func'`">
+                    <outcome value='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-rate' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'enni1_id'`">
+                    <outcome value='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-aend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'enni2_id'`">
+                    <outcome value='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-zend.port-id' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'enni1_coding_func'`">
+                    <outcome value='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-rate' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <switch test="`$optical-service-create-input.payload.param[$idx].name == 'service-name'`">
+                    <outcome value='true'>
+                        <set>
+                            <parameter name='optical-service-create-input.payload.service-name' value="`$optical-service-create-input.payload.param[$idx].value`"/>
+                        </set>
+                    </outcome>
+                </switch>
+            </for>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
+key='SELECT controller_id 
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE 
+WHERE interface_name = $optical-service-create-input.payload.service-aend.port-id' 
+pfx='db.source1'>
                 <outcome value='success'>
                     <set>
-                        <parameter name='aend-nodeid' value='`$db-aend.pnf-id`' />
-                        <parameter name='a-end-pnf-name' value='`$db-aend.pnf-name`' />
-                        <parameter name='aend-clli' value='`$db-aend.clli`' />
+                        <parameter name='controller1' value="`$db.source1.controller-id`"/>
                     </set>
                 </outcome>
             </get-resource>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-key='SELECT *
-from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
-WHERE interface_name = $optical-service-create-input.payload.service-zend.port-id
-AND interface_id = $optical-service-create-input.payload.service-zend.port-name'
-pfx='db-zend'>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' 
+key='SELECT controller_id 
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE 
+WHERE interface_name = $optical-service-create-input.payload.service-zend.port-id' 
+pfx='db.source2'>
                 <outcome value='success'>
                     <set>
-                        <parameter name='zend-nodeid' value='`$db-zend.pnf-id`' />
-                        <parameter name='z-end-pnf-name' value='`$db-zend.pnf-name`' />
-                        <parameter name='zend-clli' value='`$db-zend.clli`' />
+                        <parameter name='controller2' value="`$db.source2.controller-id`"/>
                     </set>
                 </outcome>
             </get-resource>
-            <switch test='`$optical-service-create-input.payload.domain-type`'>
-                <outcome value='MSA'>
-                    <block atomic='true'>
-                        <call module='optical-service' rpc='service-create-msa' mode='sync' ></call>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="service1-svc-instance-id"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$controller1`'/>
+                <parameter name="regex" value="_"/>
+                <parameter name="ctx_memory_result_key" value="param-prefix1"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value='`$controller2`'/>
+                <parameter name="regex" value="_"/>
+                <parameter name="ctx_memory_result_key" value="param-prefix2"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="service1-request-id"/>
+            </execute>
+            <set>
+                <parameter name='controller-ip1' value='`$param-prefix1[1]`' />
+                <parameter name='domain-type1' value='`$param-prefix1[0]`' />
+                <parameter name='controller-ip2' value='`$param-prefix2[1]`' />
+                <parameter name='domain-type2' value='`$param-prefix2[0]`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="service2-svc-instance-id"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="service2-request-id"/>
+            </execute>
+            <switch test='`$controller1==$controller2`'>
+                <outcome value='true'>
+                    <block>
+                        <set>
+                            <parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />
+                            <parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />
+                        </set>
+                        <set>
+                            <parameter name='domain-requests' value="`$service1-request-id`" />
+                            <parameter name='optical-service-create-input.request-id' value="`$service1-request-id`" />
+                            <parameter name='optical-service-create-input.service-id' value="`$service1-svc-instance-id`" />
+                            <parameter name='optical-service-create-input.payload.service-name' value="`$optical-service-create-input.payload.service-name + '_' + 'MDONS-OTN'`" />
+                        </set>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="`'domain rquest_' + $domain-requests`"/>
+                            <parameter name="field2" value="`'Access rquest_' + $as-request-id`"/>
+                        </record>
+                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );"></save>
+                        <call module='optical-service' rpc='main-create' mode='sync' >
+                            <outcome value='success'>
+                                <switch test='`$final-response-code`'>
+                                    <outcome value='200'>
+                                        <block>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+resource='SQL' 
+key='UPDATE REQUEST_DETAILS SET status = "CREATED" WHERE request_id = $as-request-id'
+force='true' pfx='save-result'></save>
+                                            <call module='optical-service' rpc='create-service-relationship' mode='sync' ></call>
+                                            <return status='success'>
+                                                <parameter name='error-code' value='200' />
+                                                <parameter name='error-message' value='Service Created Successfully' />
+                                                <parameter name='ack-final-indicator' value='Y' />
+                                            </return>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </outcome>
+                        </call>
                     </block>
                 </outcome>
-                <outcome value='TAPI'>
-                    <block atomic='true'>
-                        <call module='optical-service' rpc='service-create-tapi' mode='sync' ></call>
+                <outcome value='false'>
+                    <block>
+                        <set>
+                            <parameter name='as-request-id' value='`$optical-service-create-input.request-id`' />
+                            <parameter name='as-svc-instance-id' value='`$optical-service-create-input.service-id`' />
+                            <parameter name='domain-requests' value="`$service1-request-id + ',' + $service2-request-id`" />
+                        </set>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />
+                            <parameter name="level" value="info" />
+                            <parameter name="field1" value="`'domain rquest_' + $domain-requests`"/>
+                            <parameter name="field2" value="`'Service 1 req id---' + $service1-request-id`"/>
+                            <parameter name="field3" value="`'Service 2 req id---' + $service2-request-id`"/>
+                        </record>
+                        <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url, domain_requests ) VALUES ( $as-request-id , null , 'CREATING' , $optical-service-create-input.payload.service-rate ,  $as-svc-instance-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , $optical-service-create-input.notification-url , $domain-requests );"></save>
+                        <set>
+                            <parameter name='access-aend' value="`$optical-service-create-input.payload.service-aend.port-id`"/>
+                            <parameter name='access-zend' value="`$optical-service-create-input.payload.service-zend.port-id`"/>
+                        </set>
+                        <call module='optical-service' rpc='inter-domain-handling' mode='sync' ></call>
                     </block>
                 </outcome>
             </switch>
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 f35446d8..11b729e0 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
@@ -353,7 +353,7 @@ pfx='zend'      local-only='false'></get-resource>
                     <block atomic='true'>
                         <return status='failure'>
                             <parameter name='error-code' value='500' />
-                            <parameter name='error-message' value='Service creation failed' />
+                            <parameter name='error-message' value="`'Service creation failed for'+ ':' + $optical-service-create-input.payload.service-name`" />
                             <parameter name='ack-final-indicator' value="Y" />
                         </return>
                     </block>
@@ -393,11 +393,9 @@ force='true' pfx='save-result'></save>
                             <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="pnf.pnf-name" />
                             <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$zend-node-uuid`" />
                         </save>
-                        <return status='success'>
-                            <parameter name='error-code' value='200' />
-                            <parameter name='error-message' value='Service created successfully' />
-                            <parameter name='ack-final-indicator' value="Y" />
-                        </return>
+                        <set>
+                            <parameter name='final-response-code' value="200" />
+                        </set>
                     </block>
                 </outcome>
             </execute>
diff --git a/platform-logic/restapi-templates/src/main/json/optical-service-create-tapi.json b/platform-logic/restapi-templates/src/main/json/optical-service-create-tapi.json
new file mode 100644
index 00000000..610f5bd4
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/optical-service-create-tapi.json
@@ -0,0 +1,57 @@
+{
+   "create-connectivity-service-input-list":[
+      {
+         "end-point":[
+            {
+               "local-id": ${aend-local-id},
+               "layer-protocol-name":"ODU",
+               "connection-end-point":[
+                  {
+                     "connection-end-point-uuid":${aend-cep},
+                     "node-edge-point-uuid": ${aend-nep},
+                     "node-uuid": ${aend-node-uuid},
+                     "topology-uuid":"otn"
+                  }
+               ],
+               "service-interface-point":{
+                  "service-interface-point-uuid": ${aend-cep}
+               },
+               "protection-role":"WORK"
+            },
+            {
+               "local-id": ${zend-local-id},
+               "layer-protocol-name":"ODU",
+               "connection-end-point":[
+                  {
+                     "connection-end-point-uuid":${zend-cep},
+                     "node-edge-point-uuid": ${zend-nep},
+                     "node-uuid": ${zend-node-uuid},
+                     "topology-uuid":"otn"
+                  }
+               ],
+               "service-interface-point":{
+                  "service-interface-point-uuid": ${zend-cep}
+               },
+               "protection-role":"WORK"
+            }
+         ],
+         "layer-protocol-name":"ODU",
+         "connectivity-constraint":{
+            "service-type":"POINT_TO_POINT_CONNECTIVITY"
+         },
+         "routing-constraint":{
+            "route-objective-function":"MIN_WORK_ROUTE_COST"
+         },
+         "topology-constraint":[
+
+         ],
+         "name":[
+            {
+               "value-name":"service-name",
+               "value": ${service-name}
+            }
+         ]
+      }
+   ]
+}
+
-- 
2.16.6