TAPI and MSA create and delete

service changes

Change-Id: I06e25b82112afbe079be2ceda7aa5f6f81a39b97
Issue-ID: SDNC-928
Signed-off-by: Franklin Dsilva <franklin.dsilva@us.fujitsu.com>
Former-commit-id: 55fa8bbbe7392464d9cc212c5dc79eb4036bbe0e

diff --git a/platform-logic/optical-service/src/main/json/optical-service_main-create.json b/platform-logic/optical-service/src/main/json/optical-service_main-create.json
new file mode 100644 (file)
index 0000000..a4a40e3
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_main-create.json
@@ -0,0 +1,367 @@
+[\r
+    {\r
+        "id": "65bbf2ea.e8f944",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 286.8833312988281,\r
+        "y": 269,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "1593715.ae96a8f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f336edeb.74ce6",\r
+        "type": "method",\r
+        "name": "method",\r
+        "xml": "<method rpc='main-create' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 285.8833312988281,\r
+        "y": 344,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "14882330.8313b5"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1593715.ae96a8f",\r
+        "type": "service-logic",\r
+        "name": "optical-service ${project.version}",\r
+        "module": "optical-service",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "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}'>",\r
+        "outputs": 1,\r
+        "x": 504.3833312988281,\r
+        "y": 252,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "f336edeb.74ce6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "14882330.8313b5",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 461.8833312988281,\r
+        "y": 357,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "994bfa4.9799188",\r
+                "c4d3d388.dc35a",\r
+                "204f0598.3ac182",\r
+                "2d636d44.e5a0fa",\r
+                "2c72a67.f372ada",\r
+                "79455985.47e29",\r
+                "887cbe59.b1784",\r
+                "4f44de12.e7fb18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c4d3d388.dc35a",\r
+        "type": "switchNode",\r
+        "name": "switch : domain-type",\r
+        "xml": "<switch test='`$domain-type`'>\n    \n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 339.3833312988281,\r
+        "y": 670,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "77b74d5.6495a34",\r
+                "7bd5cfea.c1ac2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "77b74d5.6495a34",\r
+        "type": "outcome",\r
+        "name": "MSA",\r
+        "xml": "<outcome value='MSA'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 641.8833312988281,\r
+        "y": 640,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "70f7a20a.befe0c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7bd5cfea.c1ac2",\r
+        "type": "outcome",\r
+        "name": "TAPI",\r
+        "xml": "<outcome value='TAPI'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 637.8833312988281,\r
+        "y": 749,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "9b03001b.004b98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "994bfa4.9799188",\r
+        "type": "execute",\r
+        "name": "execute",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 854.88330078125,\r
+        "y": 181,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "70f7a20a.befe0c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 829.8833312988281,\r
+        "y": 641,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "5fc1c8dc.a583e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9b03001b.004b98",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 822.8833312988281,\r
+        "y": 754,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "b46560fc.9378b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "204f0598.3ac182",\r
+        "type": "call",\r
+        "name": "call validate-input-parameters",\r
+        "xml": "<call module='optical-service' rpc='optical-validate-input-params' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 911.88330078125,\r
+        "y": 136,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b46560fc.9378b8",\r
+        "type": "call",\r
+        "name": "call TAPI DG",\r
+        "xml": "<call module='optical-service' rpc='service-create-tapi' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1018.8833618164062,\r
+        "y": 760,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "5fc1c8dc.a583e8",\r
+        "type": "call",\r
+        "name": "call MSA DG",\r
+        "xml": "<call module='optical-service' rpc='service-create-msa' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1048.88330078125,\r
+        "y": 641,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "2d636d44.e5a0fa",\r
+        "type": "get-resource",\r
+        "name": "get resources from DB -controller_id",\r
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $optical-service-create-input.payload.service-aend.port-id'\npfx='controllerid'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 871.88330078125,\r
+        "y": 257,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "33031f70.c9e2f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2c72a67.f372ada",\r
+        "type": "execute",\r
+        "name": "split node-id a-end retrieved from DB",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 871.88330078125,\r
+        "y": 308,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "33031f70.c9e2f",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1107.88330078125,\r
+        "y": 255,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "6316e11e.6a8a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6316e11e.6a8a8",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='controller-id' value='`$controllerid.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "x": 1250.88330078125,\r
+        "y": 257,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "79455985.47e29",\r
+        "type": "set",\r
+        "name": "set controller-ip",\r
+        "xml": "<set>\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n \n",\r
+        "comments": "",\r
+        "x": 815.88330078125,\r
+        "y": 370,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "887cbe59.b1784",\r
+        "type": "get-resource",\r
+        "name": "get-resource",\r
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $optical-service-create-input.payload.service-aend.port-id'\npfx='db-aend'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 693.88330078125,\r
+        "y": 424,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "1d791c96.d1da33"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4f44de12.e7fb18",\r
+        "type": "get-resource",\r
+        "name": "get-resource",\r
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\nWHERE interface_name = $optical-service-create-input.payload.service-zend.port-id'\npfx='db-zend'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 679.88330078125,\r
+        "y": 487,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "ef8516e4.6c5f7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1d791c96.d1da33",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 877.88330078125,\r
+        "y": 426,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "c56f5bdc.a7e378"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c56f5bdc.a7e378",\r
+        "type": "set",\r
+        "name": "set",\r
+        "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",\r
+        "comments": "",\r
+        "x": 1044.88330078125,\r
+        "y": 425,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ef8516e4.6c5f7",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 876.88330078125,\r
+        "y": 491,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": [\r
+            [\r
+                "3ea4fdfa.d7bd4a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3ea4fdfa.d7bd4a",\r
+        "type": "set",\r
+        "name": "set",\r
+        "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",\r
+        "comments": "",\r
+        "x": 1044.88330078125,\r
+        "y": 492,\r
+        "z": "30ae7182.add8b6",\r
+        "wires": []\r
+    }\r
+]
\ No newline at end of file

diff --git a/platform-logic/optical-service/src/main/json/optical-service_optical-service-delete.json b/platform-logic/optical-service/src/main/json/optical-service_optical-service-delete.json
index 270a3cf..fbb368b 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_optical-service-delete.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_optical-service-delete.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "7d351c38.c4c6cc",\r
+        "id": "b65cdeae.8f7b08",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 146,\r
-        "y": 70,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 129,\r
+        "y": 129.88333129882812,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "6c3e5cdb.13fe9c"\r
+                "644f31e7.7234b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c3e5cdb.13fe9c",\r
+        "id": "644f31e7.7234b8",\r
         "type": "service-logic",\r
         "name": "optical-service ${project.version}",\r
         "module": "optical-service",\r
@@ -22,515 +22,1454 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 254.5,\r
-        "y": 148,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 237.5,\r
+        "y": 207.88333129882812,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "c9af40a8.771678"\r
+                "168fe70c.0f8c41"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9af40a8.771678",\r
+        "id": "168fe70c.0f8c41",\r
         "type": "method",\r
         "name": "method",\r
         "xml": "<method rpc='optical-service-delete' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 123,\r
-        "y": 239,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 106,\r
+        "y": 298.8833312988281,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "487722a8.b389a4"\r
+                "cfd0169c.a3cee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "487722a8.b389a4",\r
+        "id": "cfd0169c.a3cee",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 309,\r
-        "y": 235,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 292,\r
+        "y": 294.8833312988281,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "a1fed560.31e7a8",\r
-                "4b9bbd62.4750fc",\r
-                "eac944ef.f83328",\r
-                "b567b7de.be2de8",\r
-                "c0977e42.e4156"\r
+                "30cb33e3.b12a94",\r
+                "2e82bc92.4b93a4",\r
+                "5e98d3f6.94968c",\r
+                "cf17dc19.012ac",\r
+                "d4ebf687.1cccd8",\r
+                "cbe18d30.3b4198",\r
+                "840d7865.dda6b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfd79d0e.9f7ee8",\r
+        "id": "30cb33e3.b12a94",\r
         "type": "execute",\r
-        "name": "Call MSA Controller",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$controller-ip + '/cxf/openroadm/openroadm-services/' + $optical-service-delete-input.payload.service-name`\"/>\n<parameter name='restapiUser' value='admin' />\n<parameter name='restapiPassword' value='admin' />\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"service-delete-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.msa.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/> \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n\n\n\n\n\n",\r
+        "name": "execute",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 574.9999694824219,\r
+        "y": 20,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "2e82bc92.4b93a4",\r
+        "type": "get-resource",\r
+        "name": "get resources from DB -controller_id",\r
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT *\nfrom REQUEST_DETAILS\nWHERE request_id = $optical-service-delete-input.request-id'\npfx='detail-db'>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 640.9999389648438,\r
+        "y": 71.8833236694336,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "78b1b9eb.f0f1a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "78b1b9eb.f0f1a8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 700,\r
-        "y": 326,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 881,\r
+        "y": 68.8833236694336,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "582ceeba.7fcce",\r
-                "867ca716.d4515"\r
+                "b1511a3a.314df"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1fed560.31e7a8",\r
+        "id": "b1511a3a.314df",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='domain-req' value='`$detail-db.domain-requests`' />\n\n\n\n\n\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "x": 1046,\r
+        "y": 67.8833236694336,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5e98d3f6.94968c",\r
+        "type": "set",\r
+        "name": "set domain-services",\r
+        "xml": "<set>\n<parameter name='notification-url' value=\"http://167.254.204.152:31817/asyncNotification\" />\n<parameter name='domain-service1' value='`$param-prefix1[0]`' />\n<parameter name='domain-service2' value='`$param-prefix1[1]`' />",\r
+        "comments": "",\r
+        "x": 589.9999389648438,\r
+        "y": 165.88333129882812,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cf17dc19.012ac",\r
         "type": "execute",\r
-        "name": "execute",\r
-        "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",\r
+        "name": "split domain-requests for access services",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$domain-req`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 553,\r
-        "y": 36,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 651.1166381835938,\r
+        "y": 115.99999237060547,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "582ceeba.7fcce",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
+        "id": "d4ebf687.1cccd8",\r
+        "type": "for",\r
+        "name": "for",\r
+        "xml": "<for index='ppx' start='0' end='`$param-prefix1_length`' >\n    \n    \n    \n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 894,\r
-        "y": 306,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 544,\r
+        "y": 289,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "c3bd28c6.e626b"\r
+                "91896047.66eb7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "867ca716.d4515",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "91896047.66eb7",\r
+        "type": "switchNode",\r
+        "name": "switch",\r
+        "xml": "<switch test='`$param-prefix1_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 869,\r
-        "y": 410,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 698,\r
+        "y": 287,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "791a6dc2.40ab1c"\r
+                "2c37340b.4002cc",\r
+                "7784419a.212fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3bd28c6.e626b",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic='true'>",\r
-        "atomic": "true",\r
+        "id": "2c37340b.4002cc",\r
+        "type": "outcome",\r
+        "name": "1",\r
+        "xml": "<outcome value='1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1053,\r
-        "y": 301,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 881,\r
+        "y": 281,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "caa7c35f.0456c8"\r
+                "be5c1afb.f2037"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "caa7c35f.0456c8",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Error deleting the Service' />\n",\r
-        "comments": "",\r
-        "x": 1285,\r
-        "y": 245,\r
-        "z": "7b1b071a.92faa",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "2041d7aa.c3ae1",\r
+        "id": "be5c1afb.f2037",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1424,\r
-        "y": 549,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1050,\r
+        "y": 281,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "27f66eb0.3c9aaa",\r
-                "e6dae4f7.8c52b",\r
-                "276e2c67.21f3ec",\r
-                "126b611e.fd67af",\r
-                "881b58f7.fb4a6"\r
+                "7f6fcc65.18cb7c",\r
+                "3a1a70c6.408b8",\r
+                "795303c1.2dac44",\r
+                "3ab986c7.09e812"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27f66eb0.3c9aaa",\r
-        "type": "record",\r
-        "name": "record",\r
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside controller\"/>\n\n",\r
+        "id": "7784419a.212fa",\r
+        "type": "outcome",\r
+        "name": "2",\r
+        "xml": "<outcome value='2'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1639,\r
-        "y": 464,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 631,\r
+        "y": 718,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
-            []\r
+            [\r
+                "e41aac03.bbaa5"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "e6dae4f7.8c52b",\r
-        "type": "save",\r
-        "name": "Update status in DB",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"DELETING\" WHERE request_id = $optical-service-delete-input.request-id' \nforce='true' pfx='save-result'>\n\n\n\n\n\n\n\n\n\n",\r
+        "id": "3a1a70c6.408b8",\r
+        "type": "execute",\r
+        "name": "split node-id a-end retrieved from DB",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller-id1`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1641,\r
-        "y": 550,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1322,\r
+        "y": 286,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "276e2c67.21f3ec",\r
+        "id": "7f6fcc65.18cb7c",\r
         "type": "get-resource",\r
-        "name": "get-resource",\r
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT *\nfrom REQUEST_DETAILS \nWHERE request_id = $optical-service-delete-input.request-id'\npfx='db.request-details'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n\n",\r
+        "name": "get resources from DB -controller_id",\r
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom REQUEST_DETAILS\nWHERE request_id = $domain-service1'\npfx='detail-db1'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1637,\r
-        "y": 626,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1326.11669921875,\r
+        "y": 246.11666870117188,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "ccbf1f5f.52d948"\r
+                "e2726a7c.0cf32"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cdc717d5.1094b8",\r
-        "type": "record",\r
-        "name": "record",\r
-        "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=\"Successfully sent the request\"/>\n\n",\r
+        "id": "e2726a7c.0cf32",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1238,\r
-        "y": 332,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1571.11669921875,\r
+        "y": 245.11666870117188,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
-            []\r
+            [\r
+                "70e7b1a6.2a20f"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "791a6dc2.40ab1c",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic='true'>",\r
-        "atomic": "true",\r
+        "id": "70e7b1a6.2a20f",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='controller-id1' value='`$detail-db1.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "x": 1719.11669921875,\r
+        "y": 247.11666870117188,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "795303c1.2dac44",\r
+        "type": "set",\r
+        "name": "set domain-services",\r
+        "xml": "<set>\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN'`\"/>",\r
+        "comments": "",\r
+        "x": 1274.11669921875,\r
+        "y": 358.1166687011719,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3ab986c7.09e812",\r
+        "type": "switchNode",\r
+        "name": "switch domain-type",\r
+        "xml": "<switch test='`$domain-type`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1036,\r
-        "y": 413,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1263,\r
+        "y": 493,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "cdc717d5.1094b8",\r
-                "d4fa1dc0.5c15a8"\r
+                "e04cd56f.45dfc8",\r
+                "2fc7713.599bf0e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4fa1dc0.5c15a8",\r
-        "type": "switchNode",\r
-        "name": "switch",\r
-        "xml": "<switch test='`$service-delete-response.configuration-response-common.response-code`'>\n",\r
+        "id": "e04cd56f.45dfc8",\r
+        "type": "outcome",\r
+        "name": "MSA",\r
+        "xml": "<outcome value='MSA'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1221,\r
-        "y": 410,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1466,\r
+        "y": 404,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "bbeca38a.ba0cc",\r
-                "86f8972f.01b4c8"\r
+                "5962de98.7a93e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bbeca38a.ba0cc",\r
+        "id": "2fc7713.599bf0e",\r
         "type": "outcome",\r
-        "name": "200 success",\r
-        "xml": "<outcome value='200'>\n",\r
+        "name": "TAPI",\r
+        "xml": "<outcome value='TAPI'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1409,\r
-        "y": 416,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1469,\r
+        "y": 584,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "2041d7aa.c3ae1"\r
+                "c51e88be.9e544"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86f8972f.01b4c8",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
+        "id": "5962de98.7a93e8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1395,\r
-        "y": 295,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1606,\r
+        "y": 401,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "8b978b7.90f6978"\r
+                "314acdb7.afb7da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b978b7.90f6978",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='`$service-delete-response.configuration-response-common.response-code`' />\n<parameter name='error-message' value='`$service-delete-response.configuration-response-common.response-message`' />\n",\r
+        "id": "314acdb7.afb7da",\r
+        "type": "call",\r
+        "name": "call MSA DELETE DG",\r
+        "xml": "<call module='optical-service' rpc='service-delete-msa' mode='sync' >\n",\r
         "comments": "",\r
-        "x": 1582,\r
-        "y": 294,\r
-        "z": "7b1b071a.92faa",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 1794,\r
+        "y": 402,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "af9224a8.a9533",\r
+                "3e7bdf94.045928"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "ccbf1f5f.52d948",\r
+        "id": "af9224a8.a9533",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1847,\r
-        "y": 621,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1979,\r
+        "y": 358,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "ae1d75fe.230f18"\r
+                "bbe67c9b.ae8e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae1d75fe.230f18",\r
-        "type": "set",\r
-        "name": "set",\r
-        "xml": "<set>\n<parameter name='instance-id' value='`$db.request-details.service-instance-id`' />\n<parameter name='customer-id' value='`$db.request-details.global-customer-id`' />\n<parameter name='service-id' value='`$db.request-details.service-type`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
+        "id": "3e7bdf94.045928",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
-        "x": 1986,\r
-        "y": 622,\r
-        "z": "7b1b071a.92faa",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 1981,\r
+        "y": 450,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "449903c8.0a6724"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "126b611e.fd67af",\r
-        "type": "update",\r
-        "name": "update resource status- DELETING in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true' \nresource='service-instance' \nkey = 'customer.global-customer-id = $customer-id AND\n     service-subscription.service-type = $service-id AND\n     service-instance.service-instance-id = $instance-id'\nlocal-only='false'>\n    <parameter name='orchestration-status' value='DELETING' />\n\n    \n    \n    \n\n",\r
+        "id": "bbe67c9b.ae8e2",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1730,\r
-        "y": 714,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 2150,\r
+        "y": 349,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
-            []\r
+            [\r
+                "3a0958a9.5973c8"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "881b58f7.fb4a6",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "xml": "<return status='success'>\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"Service Deletion in Progress\" />\n<parameter name='ack-final-indicator' value='N' />",\r
+        "id": "3a0958a9.5973c8",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",\r
         "comments": "",\r
-        "x": 1619,\r
-        "y": 810,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 2293,\r
+        "y": 324,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4b9bbd62.4750fc",\r
-        "type": "get-resource",\r
-        "name": "get resources from DB -controller_id",\r
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom REQUEST_DETAILS\nWHERE request_id = $optical-service-delete-input.request-id'\npfx='controllerid'>",\r
+        "id": "449903c8.0a6724",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Failed to call MSA DG' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
+        "comments": "",\r
+        "x": 2150,\r
+        "y": 480,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c51e88be.9e544",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 665,\r
-        "y": 109,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1625,\r
+        "y": 586,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "3249f019.f6152"\r
+                "a271ced2.6952d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eac944ef.f83328",\r
-        "type": "execute",\r
-        "name": "split node-id a-end retrieved from DB",\r
-        "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",\r
+        "id": "a271ced2.6952d8",\r
+        "type": "call",\r
+        "name": "call TAPI DELETE DG",\r
+        "xml": "<call module='optical-service' rpc='service-delete-tapi' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 646,\r
-        "y": 168,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1813,\r
+        "y": 587,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
-            []\r
+            [\r
+                "3ea9b0c9.5ce928",\r
+                "3153866d.fe9922"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "3249f019.f6152",\r
+        "id": "3ea9b0c9.5ce928",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 892,\r
-        "y": 104,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1998,\r
+        "y": 543,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "4e515097.338e48"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3153866d.fe9922",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2000,\r
+        "y": 635,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "e7c2b606.d88798"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4e515097.338e48",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2169,\r
+        "y": 534,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "cc783b3b.8e16b"\r
+                "128c0365.4d99ed",\r
+                "99a0a090.74b4e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc783b3b.8e16b",\r
+        "id": "128c0365.4d99ed",\r
         "type": "set",\r
         "name": "set",\r
-        "xml": "<set>\n<parameter name='controller-id' value='`$controllerid.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",\r
+        "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",\r
+        "comments": "",\r
+        "x": 2312,\r
+        "y": 509,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e7c2b606.d88798",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Failed to call MSA DG' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
         "comments": "",\r
-        "x": 1083,\r
-        "y": 106,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 2169,\r
+        "y": 665,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b567b7de.be2de8",\r
+        "id": "71b9114.072a4f",\r
+        "type": "call",\r
+        "name": "call TAPI DELETE DG",\r
+        "xml": "<call module='optical-service' rpc='service-delete-tapi' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1315,\r
+        "y": 891,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "1978613e.4073f7",\r
+                "2736e495.752c04"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "63600e7b.0d9eb8",\r
         "type": "set",\r
-        "name": "set controller-ip",\r
-        "xml": "<set>\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n<parameter name='notification-url' value=\"`$prop.controller.url + '/' + $prop.sdnc.async.url`\" />\n",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-TAPI-1'`\"/>\n<parameter name='domain-type' value='`$domain1[0]`' />\n<parameter name='controller-ip' value='`$domain1[1]`' />\n",\r
         "comments": "",\r
-        "x": 593,\r
-        "y": 223,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1296.11669921875,\r
+        "y": 815.1167602539062,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c0977e42.e4156",\r
+        "id": "e41aac03.bbaa5",\r
         "type": "switchNode",\r
-        "name": "switch domain-type",\r
-        "xml": "<switch test='`$domain-type`'>\n",\r
+        "name": "switch",\r
+        "xml": "<switch test='`$ppx`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 188,\r
-        "y": 324,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 771.1167602539062,\r
+        "y": 723.11669921875,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "1f20cc0f.cf39ec",\r
-                "fe8682d2.0d3618"\r
+                "bc61c8e0.999178",\r
+                "d5fffe4f.796c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f20cc0f.cf39ec",\r
+        "id": "bc61c8e0.999178",\r
         "type": "outcome",\r
-        "name": "MSA",\r
-        "xml": "<outcome value='MSA'>\n",\r
+        "name": "0",\r
+        "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 363,\r
-        "y": 325,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 951.1167602539062,\r
+        "y": 723.11669921875,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "d9880526.733f4"\r
+                "b7c6609b.2477c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe8682d2.0d3618",\r
+        "id": "d5fffe4f.796c18",\r
         "type": "outcome",\r
-        "name": "TAPI",\r
-        "xml": "<outcome value='TAPI'>\n",\r
+        "name": "1",\r
+        "xml": "<outcome value='1'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 899.1167602539062,\r
+        "y": 1097.11669921875,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "a2b3475f.c55ff"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ab6f8311.54637",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service2`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-TAPI-2'`\"/>\n<parameter name='domain-type' value='`$domain2[0]`' />\n<parameter name='controller-ip' value='`$domain2[1]`' />\n\n\n",\r
+        "comments": "",\r
+        "x": 1294.11669921875,\r
+        "y": 1170.11669921875,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fc3b2634.80fb1",\r
+        "type": "call",\r
+        "name": "call TAPI DELETE DG",\r
+        "xml": "<call module='optical-service' rpc='service-delete-tapi' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 324,\r
-        "y": 428,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1301.11669921875,\r
+        "y": 1243.11669921875,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "c4af063b.a8dc38"\r
+                "d0a61851.774d7",\r
+                "67e5500f.2b88c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9880526.733f4",\r
+        "id": "b7c6609b.2477c8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 507,\r
-        "y": 326,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1091.11669921875,\r
+        "y": 724.11669921875,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "bfd79d0e.9f7ee8"\r
+                "63600e7b.0d9eb8",\r
+                "71b9114.072a4f",\r
+                "fb442d76.8c0b1",\r
+                "e8836a64.f81ae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4af063b.a8dc38",\r
+        "id": "a2b3475f.c55ff",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 475,\r
-        "y": 421,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1025.1167602539062,\r
+        "y": 1106.11669921875,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
             [\r
-                "5c1ca252.745f4c"\r
+                "ab6f8311.54637",\r
+                "fc3b2634.80fb1",\r
+                "4d169812.58b88",\r
+                "8f4e881d.558318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c1ca252.745f4c",\r
-        "type": "call",\r
-        "name": "call TAPI DELETE DG",\r
-        "xml": "<call module='optical-service' rpc='service-delete-tapi' mode='sync' >\n",\r
+        "id": "1978613e.4073f7",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 643,\r
-        "y": 524,\r
-        "z": "7b1b071a.92faa",\r
+        "x": 1576,\r
+        "y": 844,\r
+        "z": "e2f7091c.1492b8",\r
         "wires": [\r
-            []\r
+            [\r
+                "b4b3ae50.b80768"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2736e495.752c04",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1560,\r
+        "y": 973,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "ecbd8135.fa342"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b4b3ae50.b80768",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1732,\r
+        "y": 851,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "e387ae63.768b78",\r
+                "6a4932f.f7508cc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e387ae63.768b78",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",\r
+        "comments": "",\r
+        "x": 1898.9998779296875,\r
+        "y": 764,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6a4932f.f7508cc",\r
+        "type": "switchNode",\r
+        "name": "switch",\r
+        "xml": "<switch test='`$service1-status == 200`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1887.9998779296875,\r
+        "y": 881,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "f2ab530d.5d599",\r
+                "7ea5454b.c5d99c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f2ab530d.5d599",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2029.9998779296875,\r
+        "y": 811,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "896e220.db3996"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7ea5454b.c5d99c",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2031,\r
+        "y": 929,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "251983ac.1c994c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "896e220.db3996",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='service1' value='success' />\n",\r
+        "comments": "",\r
+        "x": 2185,\r
+        "y": 817,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "251983ac.1c994c",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='service1' value='failure' />\n",\r
+        "comments": "",\r
+        "x": 2198,\r
+        "y": 927,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ecbd8135.fa342",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Main Delete Dg not available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
+        "comments": "",\r
+        "x": 1732,\r
+        "y": 974,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d0a61851.774d7",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1543,\r
+        "y": 1167,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "7ee5420a.dabadc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "67e5500f.2b88c8",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1550,\r
+        "y": 1306,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "dec65b83.66c9b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7ee5420a.dabadc",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1698,\r
+        "y": 1175,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "11571d88.b80ba2",\r
+                "8e369286.a24f1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "11571d88.b80ba2",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='service2-status' value='`$final-response-code`' />\n",\r
+        "comments": "",\r
+        "x": 1894,\r
+        "y": 1090,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8e369286.a24f1",\r
+        "type": "switchNode",\r
+        "name": "switch",\r
+        "xml": "<switch test='`$service2-status == 200`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1875,\r
+        "y": 1215,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "bc9b1c9e.2d7528",\r
+                "6e8a106a.b8a098"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bc9b1c9e.2d7528",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2037,\r
+        "y": 1140,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "88261b09.8da33"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6e8a106a.b8a098",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2043,\r
+        "y": 1262,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "e617e321.5b485"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "88261b09.8da33",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='service2' value='success' />\n",\r
+        "comments": "",\r
+        "x": 2192,\r
+        "y": 1143,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e617e321.5b485",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='service2' value='failure' />\n",\r
+        "comments": "",\r
+        "x": 2205,\r
+        "y": 1265,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "dec65b83.66c9b",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Main Delete Dg not available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
+        "comments": "",\r
+        "x": 1751,\r
+        "y": 1306,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cbe18d30.3b4198",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='access-id' value=\"`$optical-service-delete-input.request-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 548.8999938964844,\r
+        "y": 211.85000610351562,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "99a0a090.74b4e8",\r
+        "type": "record",\r
+        "name": "record",\r
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/service-delete-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$service1-status`\"/>\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2306.85009765625,\r
+        "y": 583.8499755859375,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "840d7865.dda6b",\r
+        "type": "switchNode",\r
+        "name": "switch",\r
+        "xml": "<switch test='`$ppx`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 362.20001220703125,\r
+        "y": 1446.64990234375,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "35bc7c0e.531f0c",\r
+                "647592de.7dc3ec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "35bc7c0e.531f0c",\r
+        "type": "outcome",\r
+        "name": "0",\r
+        "xml": "<outcome value='0'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 598.4000549316406,\r
+        "y": 1349.3999633789062,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "362cac69.39ad1c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "647592de.7dc3ec",\r
+        "type": "outcome",\r
+        "name": "1",\r
+        "xml": "<outcome value='1'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 589.4000549316406,\r
+        "y": 1522.39990234375,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "96d3d87a.161f98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "362cac69.39ad1c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 740.4000244140625,\r
+        "y": 1353.3999633789062,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "827658b9.c24fd"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "827658b9.c24fd",\r
+        "type": "switchNode",\r
+        "name": "switch",\r
+        "xml": "<switch test='`$service1-status`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 882.75,\r
+        "y": 1358.5999145507812,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "30018cf9.344a24",\r
+                "7de52130.2c5fc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f7b9ef6.7932f9",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1217.75,\r
+        "y": 1300.7999877929688,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "2fd5efbb.db2cd8",\r
+                "a5309500.d76bc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2fd5efbb.db2cd8",\r
+        "type": "delete",\r
+        "name": "delete",\r
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id\"> ",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1381.75,\r
+        "y": 1297.8001098632812,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a5309500.d76bc",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"Service Deleted Successfully\" />\n<parameter name='ack-final-indicator' value='Y' />",\r
+        "comments": "",\r
+        "x": 1423.75,\r
+        "y": 1481.8001098632812,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "30018cf9.344a24",\r
+        "type": "outcome",\r
+        "name": "200",\r
+        "xml": "<outcome value='200'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1056.199951171875,\r
+        "y": 1308.2499389648438,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "f7b9ef6.7932f9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7de52130.2c5fc",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1033.199951171875,\r
+        "y": 1460.2499389648438,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "6461eb1d.8fedb4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d7f1c2ce.8da74",\r
+        "type": "switchNode",\r
+        "name": "switch",\r
+        "xml": "<switch test='`$service1-status == $service2-status == 200`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 857.75,\r
+        "y": 1529.599853515625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "d0c11e44.eff1b8",\r
+                "ebfe8068.c9971"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d0c11e44.eff1b8",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1015.75,\r
+        "y": 1538.599853515625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "505e7a53.be6c6c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "505e7a53.be6c6c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1155.75,\r
+        "y": 1545.599853515625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "2406e71c.d43e8",\r
+                "37282d8f.acde4a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2406e71c.d43e8",\r
+        "type": "delete",\r
+        "name": "delete",\r
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id\"> ",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1319.75,\r
+        "y": 1545.599853515625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ebfe8068.c9971",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1003.75,\r
+        "y": 1670.599853515625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "383c08d1.28a08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "383c08d1.28a08",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1147.75,\r
+        "y": 1683.599853515625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "495cad00.8d5f24"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "495cad00.8d5f24",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Access service request entry cannot be deleted' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
+        "comments": "",\r
+        "x": 1322.75,\r
+        "y": 1676.599853515625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "37282d8f.acde4a",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"Service Deleted Successfully\" />\n<parameter name='ack-final-indicator' value='Y' />",\r
+        "comments": "",\r
+        "x": 1337.75,\r
+        "y": 1626.599853515625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "70ec6ec4.5ccf08",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Access service request entry cannot be deleted' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
+        "comments": "",\r
+        "x": 1211.5,\r
+        "y": 1472.3998413085938,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "96d3d87a.161f98",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 736.4000244140625,\r
+        "y": 1523.39990234375,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "d7f1c2ce.8da74"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fb442d76.8c0b1",\r
+        "type": "get-resource",\r
+        "name": "get resources from DB -controller_id",\r
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom REQUEST_DETAILS\nWHERE request_id = $domain-service1'\npfx='detail-db11'>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1377.6666259765625,\r
+        "y": 680.6666259765625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "84c6499.61865b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "84c6499.61865b8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1623.6666259765625,\r
+        "y": 684.6666259765625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "4427d502.6c96cc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4427d502.6c96cc",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='controller-id11' value='`$detail-db11.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "x": 1791.6666259765625,\r
+        "y": 686.6666259765625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e8836a64.f81ae",\r
+        "type": "execute",\r
+        "name": "split node-id a-end retrieved from DB",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller-id11`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"domain1\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1398.6666259765625,\r
+        "y": 756.6666259765625,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4d169812.58b88",\r
+        "type": "get-resource",\r
+        "name": "get resources from DB -controller_id",\r
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\nkey='SELECT controller_id\nfrom REQUEST_DETAILS\nWHERE request_id = $domain-service2'\npfx='detail-db22'>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1324.6666259765625,\r
+        "y": 1056.666748046875,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "e0ea4817.5936a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e0ea4817.5936a",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1569.6666259765625,\r
+        "y": 1060.666748046875,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "9748df16.f21cf8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9748df16.f21cf8",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='controller-id22' value='`$detail-db22.controller-id`' />\n\n\n\n\n\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "x": 1718.6666259765625,\r
+        "y": 1064.666748046875,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8f4e881d.558318",\r
+        "type": "execute",\r
+        "name": "split node-id a-end retrieved from DB",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$controller-id22`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"domain2\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1327.6666259765625,\r
+        "y": 1118.666748046875,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "9e23ba6e.b8b718",\r
+        "type": "update",\r
+        "name": "update",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\nkey = 'pnf.pnf-name = $a-end-pnf-name\n      AND p-interface.interface-name = $optical-service-create-input.payload.service-aend.port-id'\n      local-only='false'>\n<parameter name='available-capacity' value='`$available-bandwidth-aend`' />\n\n\n\n<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'\nkey='logical-link.link-name = $tmp.link-id' >\n    <parameter name='link-name' value='`$tmp.link-id`' />\n    <parameter name='link-type' value='`$link.link-type`' />\n    <parameter name='in-maint' value='true' />\n    <parameter name='speed-value' value='100' />\n    <parameter name='speed-units' value='Gbps' />\n    <parameter name='operational-status' value='`$link.administrative-state`' />\n    <parameter name='available-capacity' value='100' />\n\n\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1418.6666717529297,\r
+        "y": 1385.6666717529297,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "6461eb1d.8fedb4",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1130.3333740234375,\r
+        "y": 1413.3331909179688,\r
+        "z": "e2f7091c.1492b8",\r
+        "wires": [\r
+            [\r
+                "70ec6ec4.5ccf08"\r
+            ]\r
         ]\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
new file mode 100644 (file)
index 0000000..df94ddf
--- /dev/null
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
@@ -0,0 +1,365 @@
+[\r
+    {\r
+        "id": "53abb973.be3358",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 320.566650390625,\r
+        "y": 127.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "a8f6adda.0744"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a8f6adda.0744",\r
+        "type": "service-logic",\r
+        "name": "optical-service ${project.version}",\r
+        "module": "optical-service",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "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}'>",\r
+        "outputs": 1,\r
+        "x": 333.566650390625,\r
+        "y": 187.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "18e37cee.ceb953"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "18e37cee.ceb953",\r
+        "type": "method",\r
+        "name": "method service-delete-msa-sync",\r
+        "xml": "<method rpc='service-delete-msa' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 353.566650390625,\r
+        "y": 267.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "64d96c24.58677c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "64d96c24.58677c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 601.066650390625,\r
+        "y": 267.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "d0c8eab9.2acb7",\r
+                "7e4b0c6a.d80e4c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d0c8eab9.2acb7",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='optical-service-create-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-MSA'`\"/>\n",\r
+        "comments": "",\r
+        "x": 783.566650390625,\r
+        "y": 242.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7e4b0c6a.d80e4c",\r
+        "type": "execute",\r
+        "name": "Call MSA Controller",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$controller-ip + '/cxf/openroadm/openroadm-services/' + $optical-service-delete-input.payload.service-name`\"/>\n<parameter name='restapiUser' value='admin' />\n<parameter name='restapiPassword' value='admin' />\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"service-delete-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.msa.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/> \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 781.566650390625,\r
+        "y": 344.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "e8374b35.9489e8",\r
+                "59601e7a.333fb8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "59601e7a.333fb8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 960.566650390625,\r
+        "y": 415.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "f7639000.8d09b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e8374b35.9489e8",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 957.566650390625,\r
+        "y": 301.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "44136677.41a668"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "44136677.41a668",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1119.566650390625,\r
+        "y": 296.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "656a3cd0.5027ec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f7639000.8d09b",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1133.566650390625,\r
+        "y": 418.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "6f5cb50c.47cb9c",\r
+                "61d2d42e.74ce34"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "656a3cd0.5027ec",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Error deleting the Service' />\n",\r
+        "comments": "",\r
+        "x": 1287.566650390625,\r
+        "y": 293.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6f5cb50c.47cb9c",\r
+        "type": "record",\r
+        "name": "record",\r
+        "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=\"Successfully sent the request\"/>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1314.566650390625,\r
+        "y": 377.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "61d2d42e.74ce34",\r
+        "type": "switchNode",\r
+        "name": "switch",\r
+        "xml": "<switch test='`$service-delete-response.configuration-response-common.response-code`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1307.566650390625,\r
+        "y": 468.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "6a32e2cb.011efc",\r
+                "126ef311.e5b135"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6a32e2cb.011efc",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1450.566650390625,\r
+        "y": 443.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "20f6b725.7d2e3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "20f6b725.7d2e3",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='`$service-delete-response.configuration-response-common.response-code`' />\n<parameter name='error-message' value='`$service-delete-response.configuration-response-common.response-message`' />\n",\r
+        "comments": "",\r
+        "x": 1647.566650390625,\r
+        "y": 441.56666564941406,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "126ef311.e5b135",\r
+        "type": "outcome",\r
+        "name": "200",\r
+        "xml": "<outcome value='200'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1474.566650390625,\r
+        "y": 557.5666656494141,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "47d51f0e.38e19"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "47d51f0e.38e19",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1638.566650390625,\r
+        "y": 552.5666656494141,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "b9afc35f.499458",\r
+                "f8b135a9.17c5d8",\r
+                "70aa5b37.57ec94",\r
+                "a77548a2.59db78",\r
+                "ba4b7b38.d871e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b9afc35f.499458",\r
+        "type": "record",\r
+        "name": "record",\r
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside controller\"/>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1810.566650390625,\r
+        "y": 520.5666656494141,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "f8b135a9.17c5d8",\r
+        "type": "save",\r
+        "name": "save",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"DELETING\" WHERE request_id = $optical-service-delete-input.request-id' \nforce='true' pfx='save-result'>\n\n\n\n\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1820.566650390625,\r
+        "y": 607.5666656494141,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "70aa5b37.57ec94",\r
+        "type": "get-resource",\r
+        "name": "get-resource",\r
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT *\nfrom REQUEST_DETAILS \nWHERE request_id = $optical-service-delete-input.request-id'\npfx='db.request-details'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n    \n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1826.566650390625,\r
+        "y": 683.5666656494141,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "84297f07.a526"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "84297f07.a526",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1984.566650390625,\r
+        "y": 674.5666656494141,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            [\r
+                "aff15672.da7fa8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "aff15672.da7fa8",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='instance-id' value='`$db.request-details.service-instance-id`' />\n<parameter name='customer-id' value='`$db.request-details.global-customer-id`' />\n<parameter name='service-id' value='`$db.request-details.service-type`' />\n\n\n\n\n\n\n\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "x": 2133.566650390625,\r
+        "y": 677.5666656494141,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a77548a2.59db78",\r
+        "type": "update",\r
+        "name": "update",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true' \nresource='service-instance' \nkey = 'customer.global-customer-id = $customer-id AND\n     service-subscription.service-type = $service-id AND\n     service-instance.service-instance-id = $instance-id'\nlocal-only='false'>\n    <parameter name='orchestration-status' value='DELETING' />\n\n    \n    \n    \n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1799.566650390625,\r
+        "y": 750.5666656494141,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ba4b7b38.d871e",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",\r
+        "comments": "",\r
+        "x": 1790.566650390625,\r
+        "y": 859.566650390625,\r
+        "z": "8588d9b2.517e38",\r
+        "wires": []\r
+    }\r
+]
\ No newline at end of file

diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json b/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json
index cef6bc4..587c1dd 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json
@@ -269,7 +269,6 @@
         "wires": [\r
             [\r
                 "4644be9d.89b97",\r
-                "652250d1.df0d6",\r
                 "29655b58.ca1ca4",\r
                 "aad55652.80ccf8",\r
                 "82da300b.4f57c",\r
@@ -277,7 +276,8 @@
                 "9f9c7a46.ce0ff8",\r
                 "70a0ebe0.92bcd4",\r
                 "33fa91ea.5695ce",\r
-                "425e8f1f.07ad6"\r
+                "425e8f1f.07ad6",\r
+                "94aa81a4.d0a7a8"\r
             ]\r
         ]\r
     },\r
@@ -325,17 +325,6 @@
         "z": "ecded786.86d6f8",\r
         "wires": []\r
     },\r
-    {\r
-        "id": "652250d1.df0d6",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "xml": "<return status='success'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='Service deleted successfully' />\n<parameter name='ack-final-indicator' value=\"Y\" />\n",\r
-        "comments": "",\r
-        "x": 1297.7775955200195,\r
-        "y": 1231.1110696792603,\r
-        "z": "ecded786.86d6f8",\r
-        "wires": []\r
-    },\r
     {\r
         "id": "29655b58.ca1ca4",\r
         "type": "switchNode",\r
@@ -670,5 +659,16 @@
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "94aa81a4.d0a7a8",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",\r
+        "comments": "",\r
+        "x": 1325,\r
+        "y": 1257,\r
+        "z": "ecded786.86d6f8",\r
+        "wires": []\r
     }\r
 ]
\ 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 ffe8533..417792c 100644 (file)
--- a/platform-logic/optical-service/src/main/resources/graph.versions
+++ b/platform-logic/optical-service/src/main/resources/graph.versions
@@ -22,4 +22,5 @@ optical-service optical-service_delete-bandwidth-update-odu3 ${project.version}
 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
-
+optical-service main-create ${project.version} sync
+optical-service service-delete-msa ${project.version} sync

diff --git a/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml b/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml
new file mode 100644 (file)
index 0000000..91062b0
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml
@@ -0,0 +1,71 @@
+<service-logic\r
+    xmlns='http://www.onap.org/sdnc/svclogic'\r
+    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}'>\r
+    <method rpc='main-create' mode='sync'>\r
+        <block atomic='true'>\r
+            <call module='optical-service' rpc='optical-validate-input-params' mode='sync' ></call>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                <parameter name='fileName' value='/opt/onap/sdnc/data/properties/optical-service-dg.properties' />\r
+                <parameter name='contextPrefix' value='prop' />\r
+            </execute>\r
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+key='SELECT controller_id\r
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\r
+WHERE interface_name = $optical-service-create-input.payload.service-aend.port-id'\r
+pfx='controllerid'>\r
+                <outcome value='success'>\r
+                    <set>\r
+                        <parameter name='controller-id' value='`$controllerid.controller-id`' />\r
+                    </set>\r
+                </outcome>\r
+            </get-resource>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                <parameter name="original_string" value='`$controller-id`'/>\r
+                <parameter name="regex" value="_"/>\r
+                <parameter name="ctx_memory_result_key" value="param-prefix"/>\r
+            </execute>\r
+            <set>\r
+                <parameter name='controller-ip' value='`$param-prefix[1]`' />\r
+                <parameter name='domain-type' value='`$param-prefix[0]`' />\r
+            </set>\r
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+key='SELECT *\r
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\r
+WHERE interface_name = $optical-service-create-input.payload.service-aend.port-id'\r
+pfx='db-aend'>\r
+                <outcome value='success'>\r
+                    <set>\r
+                        <parameter name='aend-nodeid' value='`$db-aend.pnf-id`' />\r
+                        <parameter name='a-end-pnf-name' value='`$db-aend.pnf-name`' />\r
+                        <parameter name='aend-clli' value='`$db-aend.clli`' />\r
+                    </set>\r
+                </outcome>\r
+            </get-resource>\r
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+key='SELECT *\r
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\r
+WHERE interface_name = $optical-service-create-input.payload.service-zend.port-id'\r
+pfx='db-zend'>\r
+                <outcome value='success'>\r
+                    <set>\r
+                        <parameter name='zend-nodeid' value='`$db-zend.pnf-id`' />\r
+                        <parameter name='z-end-pnf-name' value='`$db-zend.pnf-name`' />\r
+                        <parameter name='zend-clli' value='`$db-zend.clli`' />\r
+                    </set>\r
+                </outcome>\r
+            </get-resource>\r
+            <switch test='`$domain-type`'>\r
+                <outcome value='MSA'>\r
+                    <block atomic='true'>\r
+                        <call module='optical-service' rpc='service-create-msa' mode='sync' ></call>\r
+                    </block>\r
+                </outcome>\r
+                <outcome value='TAPI'>\r
+                    <block atomic='true'>\r
+                        <call module='optical-service' rpc='service-create-tapi' mode='sync' ></call>\r
+                    </block>\r
+                </outcome>\r
+            </switch>\r
+        </block>\r
+    </method>\r
+</service-logic>
\ No newline at end of file

diff --git a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml
index 4b42278..ce1937f 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml
@@ -8,113 +8,271 @@
                 <parameter name='contextPrefix' value='prop' />\r
             </execute>\r
             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
-key='SELECT controller_id\r
+key='SELECT *\r
 from REQUEST_DETAILS\r
 WHERE request_id = $optical-service-delete-input.request-id'\r
-pfx='controllerid'>\r
+pfx='detail-db'>\r
                 <outcome value='success'>\r
                     <set>\r
-                        <parameter name='controller-id' value='`$controllerid.controller-id`' />\r
+                        <parameter name='domain-req' value='`$detail-db.domain-requests`' />\r
                     </set>\r
                 </outcome>\r
             </get-resource>\r
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                <parameter name="original_string" value='`$controller-id`'/>\r
-                <parameter name="regex" value="_"/>\r
-                <parameter name="ctx_memory_result_key" value="param-prefix"/>\r
+                <parameter name="original_string" value='`$domain-req`'/>\r
+                <parameter name="regex" value=","/>\r
+                <parameter name="ctx_memory_result_key" value="param-prefix1"/>\r
             </execute>\r
             <set>\r
-                <parameter name='controller-ip' value='`$param-prefix[1]`' />\r
-                <parameter name='domain-type' value='`$param-prefix[0]`' />\r
-                <parameter name='notification-url' value="`$prop.controller.url + '/' + $prop.sdnc.async.url`" />\r
+                <parameter name='notification-url' value="http://167.254.204.152:31817/asyncNotification" />\r
+                <parameter name='domain-service1' value='`$param-prefix1[0]`' />\r
+                <parameter name='domain-service2' value='`$param-prefix1[1]`' />\r
             </set>\r
-            <switch test='`$domain-type`'>\r
-                <outcome value='MSA'>\r
-                    <block>\r
-                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />\r
-                            <parameter name="restapiUrl" value="`$controller-ip + '/cxf/openroadm/openroadm-services/' + $optical-service-delete-input.payload.service-name`"/>\r
-                            <parameter name='restapiUser' value='admin' />\r
-                            <parameter name='restapiPassword' value='admin' />\r
-                            <parameter name="httpMethod" value="DELETE"/>\r
-                            <parameter name="responsePrefix" value="service-delete-response"/>\r
-                            <parameter name='contentType' value='application/json' />\r
-                            <parameter name='format' value='json' />\r
-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.msa.jks"/>\r
-                            <parameter name="trustStorePassword" value="adminadmin"/>\r
-                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                            <parameter name="keyStorePassword" value="adminadmin"/>\r
-                            <outcome value='failure'>\r
-                                <block atomic='true'>\r
-                                    <return status='failure'>\r
-                                        <parameter name='error-code' value='500' />\r
-                                        <parameter name='error-message' value='Error deleting the Service' />\r
-                                    </return>\r
-                                </block>\r
-                            </outcome>\r
-                            <outcome value='success'>\r
-                                <block atomic='true'>\r
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                        <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />\r
-                                        <parameter name="level" value="info" />\r
-                                        <parameter name="field1" value="Successfully sent the request"/>\r
-                                    </record>\r
-                                    <switch test='`$service-delete-response.configuration-response-common.response-code`'>\r
-                                        <outcome value='Other'>\r
+            <set>\r
+                <parameter name='access-id' value="`$optical-service-delete-input.request-id`" />\r
+            </set>\r
+            <for index='ppx' start='0' end='`$param-prefix1_length`' >\r
+                <switch test='`$param-prefix1_length`'>\r
+                    <outcome value='1'>\r
+                        <block atomic='true'>\r
+                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+key='SELECT controller_id\r
+from REQUEST_DETAILS\r
+WHERE request_id = $domain-service1'\r
+pfx='detail-db1'>\r
+                                <outcome value='success'>\r
+                                    <set>\r
+                                        <parameter name='controller-id1' value='`$detail-db1.controller-id`' />\r
+                                    </set>\r
+                                </outcome>\r
+                            </get-resource>\r
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                                <parameter name="original_string" value='`$controller-id1`'/>\r
+                                <parameter name="regex" value="_"/>\r
+                                <parameter name="ctx_memory_result_key" value="param-prefix"/>\r
+                            </execute>\r
+                            <set>\r
+                                <parameter name='domain-type' value='`$param-prefix[0]`' />\r
+                                <parameter name='controller-ip' value='`$param-prefix[1]`' />\r
+                                <parameter name='optical-service-delete-input.request-id' value="`$domain-service1`" />\r
+                                <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN'`"/>\r
+                            </set>\r
+                            <switch test='`$domain-type`'>\r
+                                <outcome value='MSA'>\r
+                                    <block>\r
+                                        <call module='optical-service' rpc='service-delete-msa' mode='sync' >\r
+                                            <outcome value='success'>\r
+                                                <block atomic='true'>\r
+                                                    <set>\r
+                                                        <parameter name='service1-status' value='`$final-response-code`' />\r
+                                                    </set>\r
+                                                </block>\r
+                                            </outcome>\r
+                                            <outcome value='failure'>\r
+                                                <return status='failure'>\r
+                                                    <parameter name='error-code' value='500' />\r
+                                                    <parameter name='error-message' value='Failed to call MSA DG' />\r
+                                                    <parameter name='ack-final-indicator' value="Y" />\r
+                                                </return>\r
+                                            </outcome>\r
+                                        </call>\r
+                                    </block>\r
+                                </outcome>\r
+                                <outcome value='TAPI'>\r
+                                    <block>\r
+                                        <call module='optical-service' rpc='service-delete-tapi' mode='sync' >\r
+                                            <outcome value='success'>\r
+                                                <block>\r
+                                                    <set>\r
+                                                        <parameter name='service1-status' value='`$final-response-code`' />\r
+                                                    </set>\r
+                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/service-delete-tapi.log" />\r
+                                                        <parameter name="level" value="info" />\r
+                                                        <parameter name="field1" value="`$service1-status`"/>\r
+                                                    </record>\r
+                                                </block>\r
+                                            </outcome>\r
+                                            <outcome value='failure'>\r
+                                                <return status='failure'>\r
+                                                    <parameter name='error-code' value='500' />\r
+                                                    <parameter name='error-message' value='Failed to call MSA DG' />\r
+                                                    <parameter name='ack-final-indicator' value="Y" />\r
+                                                </return>\r
+                                            </outcome>\r
+                                        </call>\r
+                                    </block>\r
+                                </outcome>\r
+                            </switch>\r
+                        </block>\r
+                    </outcome>\r
+                    <outcome value='2'>\r
+                        <switch test='`$ppx`'>\r
+                            <outcome value='0'>\r
+                                <block>\r
+                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+key='SELECT controller_id\r
+from REQUEST_DETAILS\r
+WHERE request_id = $domain-service1'\r
+pfx='detail-db11'>\r
+                                        <outcome value='success'>\r
+                                            <set>\r
+                                                <parameter name='controller-id11' value='`$detail-db11.controller-id`' />\r
+                                            </set>\r
+                                        </outcome>\r
+                                    </get-resource>\r
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                                        <parameter name="original_string" value='`$controller-id11`'/>\r
+                                        <parameter name="regex" value="_"/>\r
+                                        <parameter name="ctx_memory_result_key" value="domain1"/>\r
+                                    </execute>\r
+                                    <set>\r
+                                        <parameter name='optical-service-delete-input.request-id' value="`$domain-service1`" />\r
+                                        <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-TAPI-1'`"/>\r
+                                        <parameter name='domain-type' value='`$domain1[0]`' />\r
+                                        <parameter name='controller-ip' value='`$domain1[1]`' />\r
+                                    </set>\r
+                                    <call module='optical-service' rpc='service-delete-tapi' mode='sync' >\r
+                                        <outcome value='success'>\r
+                                            <block>\r
+                                                <set>\r
+                                                    <parameter name='service1-status' value='`$final-response-code`' />\r
+                                                </set>\r
+                                                <switch test='`$service1-status == 200`'>\r
+                                                    <outcome value='true'>\r
+                                                        <set>\r
+                                                            <parameter name='service1' value='success' />\r
+                                                        </set>\r
+                                                    </outcome>\r
+                                                    <outcome value='false'>\r
+                                                        <set>\r
+                                                            <parameter name='service1' value='failure' />\r
+                                                        </set>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </block>\r
+                                        </outcome>\r
+                                        <outcome value='failure'>\r
                                             <return status='failure'>\r
-                                                <parameter name='error-code' value='`$service-delete-response.configuration-response-common.response-code`' />\r
-                                                <parameter name='error-message' value='`$service-delete-response.configuration-response-common.response-message`' />\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='Main Delete Dg not available' />\r
+                                                <parameter name='ack-final-indicator' value="Y" />\r
                                             </return>\r
                                         </outcome>\r
-                                        <outcome value='200'>\r
-                                            <block atomic='true'>\r
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />\r
-                                                    <parameter name="level" value="info" />\r
-                                                    <parameter name="field1" value="Inside controller"/>\r
-                                                </record>\r
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \r
-resource='SQL' \r
-key='UPDATE REQUEST_DETAILS SET status = "DELETING" WHERE request_id = $optical-service-delete-input.request-id' \r
-force='true' pfx='save-result'></save>\r
-                                                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \r
-key='SELECT *\r
-from REQUEST_DETAILS \r
-WHERE request_id = $optical-service-delete-input.request-id'\r
-pfx='db.request-details'>\r
-                                                    <outcome value='success'>\r
+                                    </call>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value='1'>\r
+                                <block>\r
+                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+key='SELECT controller_id\r
+from REQUEST_DETAILS\r
+WHERE request_id = $domain-service2'\r
+pfx='detail-db22'>\r
+                                        <outcome value='success'>\r
+                                            <set>\r
+                                                <parameter name='controller-id22' value='`$detail-db22.controller-id`' />\r
+                                            </set>\r
+                                        </outcome>\r
+                                    </get-resource>\r
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                                        <parameter name="original_string" value='`$controller-id22`'/>\r
+                                        <parameter name="regex" value="_"/>\r
+                                        <parameter name="ctx_memory_result_key" value="domain2"/>\r
+                                    </execute>\r
+                                    <set>\r
+                                        <parameter name='optical-service-delete-input.request-id' value="`$domain-service2`" />\r
+                                        <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-TAPI-2'`"/>\r
+                                        <parameter name='domain-type' value='`$domain2[0]`' />\r
+                                        <parameter name='controller-ip' value='`$domain2[1]`' />\r
+                                    </set>\r
+                                    <call module='optical-service' rpc='service-delete-tapi' mode='sync' >\r
+                                        <outcome value='success'>\r
+                                            <block>\r
+                                                <set>\r
+                                                    <parameter name='service2-status' value='`$final-response-code`' />\r
+                                                </set>\r
+                                                <switch test='`$service2-status == 200`'>\r
+                                                    <outcome value='true'>\r
                                                         <set>\r
-                                                            <parameter name='instance-id' value='`$db.request-details.service-instance-id`' />\r
-                                                            <parameter name='customer-id' value='`$db.request-details.global-customer-id`' />\r
-                                                            <parameter name='service-id' value='`$db.request-details.service-type`' />\r
+                                                            <parameter name='service2' value='success' />\r
                                                         </set>\r
                                                     </outcome>\r
-                                                </get-resource>\r
-                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \r
-force='true' \r
-resource='service-instance' \r
-key = 'customer.global-customer-id = $customer-id AND\r
-     service-subscription.service-type = $service-id AND\r
-     service-instance.service-instance-id = $instance-id'\r
-local-only='false'>\r
-                                                    <parameter name='orchestration-status' value='DELETING' />\r
-                                                </update>\r
-                                                <return status='success'>\r
-                                                    <parameter name="error-code" value="200" />\r
-                                                    <parameter name="error-message" value="Service Deletion in Progress" />\r
-                                                    <parameter name='ack-final-indicator' value='N' />\r
-                                                </return>\r
+                                                    <outcome value='false'>\r
+                                                        <set>\r
+                                                            <parameter name='service2' value='failure' />\r
+                                                        </set>\r
+                                                    </outcome>\r
+                                                </switch>\r
                                             </block>\r
                                         </outcome>\r
-                                    </switch>\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='error-code' value='500' />\r
+                                                <parameter name='error-message' value='Main Delete Dg not available' />\r
+                                                <parameter name='ack-final-indicator' value="Y" />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </call>\r
+                                </block>\r
+                            </outcome>\r
+                        </switch>\r
+                    </outcome>\r
+                </switch>\r
+            </for>\r
+            <switch test='`$ppx`'>\r
+                <outcome value='0'>\r
+                    <block>\r
+                        <switch test='`$service1-status`'>\r
+                            <outcome value='200'>\r
+                                <block>\r
+                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
+    resource="SQL"\r
+    key="DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id"></delete>\r
+                                    <return status='success'>\r
+                                        <parameter name="error-code" value="200" />\r
+                                        <parameter name="error-message" value="Service Deleted Successfully" />\r
+                                        <parameter name='ack-final-indicator' value='Y' />\r
+                                    </return>\r
                                 </block>\r
                             </outcome>\r
-                        </execute>\r
+                            <outcome value='Other'>\r
+                                <block>\r
+                                    <return status='failure'>\r
+                                        <parameter name='error-code' value='500' />\r
+                                        <parameter name='error-message' value='Access service request entry cannot be deleted' />\r
+                                        <parameter name='ack-final-indicator' value="Y" />\r
+                                    </return>\r
+                                </block>\r
+                            </outcome>\r
+                        </switch>\r
                     </block>\r
                 </outcome>\r
-                <outcome value='TAPI'>\r
+                <outcome value='1'>\r
                     <block>\r
-                        <call module='optical-service' rpc='service-delete-tapi' mode='sync' ></call>\r
+                        <switch test='`$service1-status == $service2-status == 200`'>\r
+                            <outcome value='true'>\r
+                                <block>\r
+                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
+    resource="SQL"\r
+    key="DELETE FROM REQUEST_DETAILS WHERE request_id = $access-id"></delete>\r
+                                    <return status='success'>\r
+                                        <parameter name="error-code" value="200" />\r
+                                        <parameter name="error-message" value="Service Deleted Successfully" />\r
+                                        <parameter name='ack-final-indicator' value='Y' />\r
+                                    </return>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value='false'>\r
+                                <block>\r
+                                    <return status='failure'>\r
+                                        <parameter name='error-code' value='500' />\r
+                                        <parameter name='error-message' value='Access service request entry cannot be deleted' />\r
+                                        <parameter name='ack-final-indicator' value="Y" />\r
+                                    </return>\r
+                                </block>\r
+                            </outcome>\r
+                        </switch>\r
                     </block>\r
                 </outcome>\r
             </switch>\r

diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
new file mode 100644 (file)
index 0000000..562195a
--- /dev/null
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
@@ -0,0 +1,89 @@
+<service-logic\r
+    xmlns='http://www.onap.org/sdnc/svclogic'\r
+    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}'>\r
+    <method rpc='service-delete-msa' mode='sync'>\r
+        <block atomic="true">\r
+            <set>\r
+                <parameter name='optical-service-create-input.request-id' value="`$domain-service1`" />\r
+                <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN-MSA'`"/>\r
+            </set>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />\r
+                <parameter name="restapiUrl" value="`$controller-ip + '/cxf/openroadm/openroadm-services/' + $optical-service-delete-input.payload.service-name`"/>\r
+                <parameter name='restapiUser' value='admin' />\r
+                <parameter name='restapiPassword' value='admin' />\r
+                <parameter name="httpMethod" value="DELETE"/>\r
+                <parameter name="responsePrefix" value="service-delete-response"/>\r
+                <parameter name='contentType' value='application/json' />\r
+                <parameter name='format' value='json' />\r
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.msa.jks"/>\r
+                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                <outcome value='failure'>\r
+                    <block atomic='true'>\r
+                        <return status='failure'>\r
+                            <parameter name='error-code' value='500' />\r
+                            <parameter name='error-message' value='Error deleting the Service' />\r
+                        </return>\r
+                    </block>\r
+                </outcome>\r
+                <outcome value='success'>\r
+                    <block atomic='true'>\r
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />\r
+                            <parameter name="level" value="info" />\r
+                            <parameter name="field1" value="Successfully sent the request"/>\r
+                        </record>\r
+                        <switch test='`$service-delete-response.configuration-response-common.response-code`'>\r
+                            <outcome value='Other'>\r
+                                <return status='failure'>\r
+                                    <parameter name='error-code' value='`$service-delete-response.configuration-response-common.response-code`' />\r
+                                    <parameter name='error-message' value='`$service-delete-response.configuration-response-common.response-message`' />\r
+                                </return>\r
+                            </outcome>\r
+                            <outcome value='200'>\r
+                                <block atomic='true'>\r
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                        <parameter name="file" value="/opt/opendaylight/current/data/log/optical-service-create.log" />\r
+                                        <parameter name="level" value="info" />\r
+                                        <parameter name="field1" value="Inside controller"/>\r
+                                    </record>\r
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \r
+resource='SQL' \r
+key='UPDATE REQUEST_DETAILS SET status = "DELETING" WHERE request_id = $optical-service-delete-input.request-id' \r
+force='true' pfx='save-result'></save>\r
+                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \r
+key='SELECT *\r
+from REQUEST_DETAILS \r
+WHERE request_id = $optical-service-delete-input.request-id'\r
+pfx='db.request-details'>\r
+                                        <outcome value='success'>\r
+                                            <set>\r
+                                                <parameter name='instance-id' value='`$db.request-details.service-instance-id`' />\r
+                                                <parameter name='customer-id' value='`$db.request-details.global-customer-id`' />\r
+                                                <parameter name='service-id' value='`$db.request-details.service-type`' />\r
+                                            </set>\r
+                                        </outcome>\r
+                                    </get-resource>\r
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \r
+force='true' \r
+resource='service-instance' \r
+key = 'customer.global-customer-id = $customer-id AND\r
+     service-subscription.service-type = $service-id AND\r
+     service-instance.service-instance-id = $instance-id'\r
+local-only='false'>\r
+                                        <parameter name='orchestration-status' value='DELETING' />\r
+                                    </update>\r
+                                    <set>\r
+                                        <parameter name='final-response-code' value="200" />\r
+                                    </set>\r
+                                </block>\r
+                            </outcome>\r
+                        </switch>\r
+                    </block>\r
+                </outcome>\r
+            </execute>\r
+        </block>\r
+    </method>\r
+</service-logic>
\ No newline at end of file

diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
index 919c554..24b52fb 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml
@@ -136,11 +136,9 @@ service-instance.service-instance-id = $output.service-instance-id'></delete>
                                     <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
     resource="SQL"\r
     key="DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id"></delete>\r
-                                    <return status='success'>\r
-                                        <parameter name='error-code' value='200' />\r
-                                        <parameter name='error-message' value='Service deleted successfully' />\r
-                                        <parameter name='ack-final-indicator' value="Y" />\r
-                                    </return>\r
+                                    <set>\r
+                                        <parameter name='final-response-code' value="200" />\r
+                                    </set>\r
                                 </block>\r
                             </outcome>\r
                         </execute>\r