Inter Domain DG'S modified

author Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>

Thu, 16 Apr 2020 15:23:14 +0000 (15:23 +0000)

committer Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>

Thu, 16 Apr 2020 15:23:22 +0000 (15:23 +0000)
author Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>
Thu, 16 Apr 2020 15:23:14 +0000 (15:23 +0000)
committer Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>
Thu, 16 Apr 2020 15:23:22 +0000 (15:23 +0000)
diff --git a/platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json b/platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json

index a4f65e7..86ae420 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json
@@ -1,20 +1,20 @@
  [\r
      {\r
-        "id": "b2c9d122.8079d",\r
+        "id": "dc8e74bc.6b0e6",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 279.566650390625,\r
-        "y": 287,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 201.5,\r
+        "y": 89.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              [\r
-                "b624e48.81e8398"\r
+                "793fbbb8.688d0c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b624e48.81e8398",\r
+        "id": "793fbbb8.688d0c",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -22,235 +22,235 @@
          "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": 466.566650390625,\r
-        "y": 236,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 388.5,\r
+        "y": 38.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              [\r
-                "e75c0d8a.68d908"\r
+                "fac8c114.6a11a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e75c0d8a.68d908",\r
+        "id": "fac8c114.6a11a",\r
          "type": "method",\r
          "name": "method",\r
          "xml": "<method rpc='aai-delete-service-handling' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 320.566650390625,\r
-        "y": 410,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 242.5,\r
+        "y": 212.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              [\r
-                "730df27.f0e4c0c"\r
+                "af5e3982.ec86d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "730df27.f0e4c0c",\r
+        "id": "af5e3982.ec86d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 493.566650390625,\r
-        "y": 409,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 415.5,\r
+        "y": 211.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              [\r
-                "6723ac25.55f13c",\r
-                "eb2abe2d.21c0e8",\r
-                "914875aa.50ff98",\r
-                "7a255a1a.b26164",\r
-                "8dbb40fc.b81ee",\r
-                "c3a4108f.675268"\r
+                "47ce9b8c.699c64",\r
+                "532ef147.e30af8",\r
+                "d5300514.b84e18",\r
+                "e3be8795.085c9",\r
+                "31c5321a.c7540e",\r
+                "137b4c1c.0ee49c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6723ac25.55f13c",\r
+        "id": "47ce9b8c.699c64",\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/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 724.566650390625,\r
-        "y": 296,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 646.5,\r
+        "y": 98.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "eb2abe2d.21c0e8",\r
+        "id": "532ef147.e30af8",\r
          "type": "get-resource",\r
          "name": "Get service from AAI",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\n key='customer.global-customer-id = $output.global-customer-id AND\n     service-subscription.service-type = $output.service-type AND\n     service-instance.service-instance-id = $output.service-instance-id' \npfx='aai.service'      local-only='false'>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 743.566650390625,\r
-        "y": 412,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 665.5,\r
+        "y": 214.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "914875aa.50ff98",\r
+        "id": "d5300514.b84e18",\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/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n<parameter name=\"field2\" value=\"`$aai.service.orchestration-status`\"/>\n<parameter name=\"field3\" value=\"`$aai.service.relationship-list.relationship_length`\"/>\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 753.566650390625,\r
-        "y": 478,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 675.5,\r
+        "y": 280.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7a255a1a.b26164",\r
+        "id": "e3be8795.085c9",\r
          "type": "for",\r
          "name": "for",\r
-        "xml": "<for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >\n",\r
+        "xml": "<for index='idx' start='1' end='`$aai.service.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 726.566650390625,\r
-        "y": 541,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 648.5,\r
+        "y": 343.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              [\r
-                "d1115849.8412c"\r
+                "3755c730.096448"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d29a06.61df4e",\r
+        "id": "9620ad1b.3b5ab",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />\n<parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />\n\n",\r
          "comments": "",\r
-        "x": 1136.566650390625,\r
-        "y": 228,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 1058.5,\r
+        "y": 30.5,\r
+        "z": "78cee624.48d318",\r
          "wires": []\r
      },\r
      {\r
-        "id": "99771c42.d3d4f",\r
+        "id": "7afe7104.170b88",\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/async-notif.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside Revert PInterface details\"/>\n<parameter name=\"field2\" value=\"`$pnf-name`\"/>\n<parameter name=\"field3\" value=\"`$pinterface-name`\"/>\n\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1159.566650390625,\r
-        "y": 297,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 1081.5,\r
+        "y": 99.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8dbb40fc.b81ee",\r
+        "id": "31c5321a.c7540e",\r
          "type": "delete",\r
          "name": "delete service instance AAI",\r
          "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\nkey='customer.global-customer-id = $output.global-customer-id AND\nservice-subscription.service-type = $output.service-type AND\nservice-instance.service-instance-id = $output.service-instance-id'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 746.566650390625,\r
-        "y": 617,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 668.5,\r
+        "y": 419.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d1115849.8412c",\r
+        "id": "3755c730.096448",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 910.566650390625,\r
-        "y": 545,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 832.5,\r
+        "y": 347.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              [\r
-                "9d29a06.61df4e",\r
-                "99771c42.d3d4f",\r
-                "d7dc2f90.81174",\r
-                "1e0cbdbd.3ee7f2",\r
-                "d3321d96.966928",\r
-                "d37a6f28.98bec"\r
+                "9620ad1b.3b5ab",\r
+                "7afe7104.170b88",\r
+                "d6286179.01c048",\r
+                "651efb55.9daa24",\r
+                "24dec78d.b7fd48",\r
+                "3e61b022.837b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3a4108f.675268",\r
+        "id": "137b4c1c.0ee49c",\r
          "type": "delete",\r
          "name": "delete from db",\r
          "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id\">",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 683.566650390625,\r
-        "y": 674,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 605.5,\r
+        "y": 476.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d3321d96.966928",\r
+        "id": "24dec78d.b7fd48",\r
          "type": "get-resource",\r
          "name": "get p-interface total capacity",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name ' \npfx='p.in.details'      local-only='false'>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1256.4554443359375,\r
-        "y": 353.1111145019531,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 1178.3887939453125,\r
+        "y": 155.61111450195312,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d37a6f28.98bec",\r
+        "id": "3e61b022.837b4",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='new-rate' value='`$p.in.details.speed-value`' />\n",\r
          "comments": "",\r
-        "x": 1196.677734375,\r
-        "y": 443.3333435058594,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 1118.611083984375,\r
+        "y": 245.83334350585938,\r
+        "z": "78cee624.48d318",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d7dc2f90.81174",\r
+        "id": "d6286179.01c048",\r
          "type": "update",\r
          "name": "update p-interface capacity AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='p-interface'\n     key='pnf.pnf-name = $pnf-name AND\n     p-interface.interface-name = $pinterface-name '\n      local-only='false'>\n<parameter name='available-capacity' value='`$new-rate`' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1163.566650390625,\r
-        "y": 549,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 1085.5,\r
+        "y": 351.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1e0cbdbd.3ee7f2",\r
+        "id": "651efb55.9daa24",\r
          "type": "save",\r
          "name": "update pinterface rate DB",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $new-rate WHERE interface_name = $pinterface-name '\nforce='true' pfx='save-result'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1154.566650390625,\r
-        "y": 617,\r
-        "z": "4d560a72.e4927c",\r
+        "x": 1076.5,\r
+        "y": 419.5,\r
+        "z": "78cee624.48d318",\r
          "wires": [\r
              []\r
          ]\r
diff --git a/platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json b/platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json

index 3c56d2a..57ebd25 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json
@@ -1,20 +1,20 @@
  [\r
      {\r
-        "id": "f758e877.9aa428",\r
+        "id": "389b367f.fc91aa",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 170,\r
-        "y": 35,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 157.5,\r
+        "y": 140,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "5c17b7ee.ab4f88"\r
+                "247d6de0.b063f2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c17b7ee.ab4f88",\r
+        "id": "247d6de0.b063f2",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -22,1010 +22,1010 @@
          "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": 183,\r
-        "y": 95,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 170.5,\r
+        "y": 200,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "748bfbc0.155724"\r
+                "163fe816.9d3ba8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "748bfbc0.155724",\r
+        "id": "163fe816.9d3ba8",\r
          "type": "method",\r
          "name": "method service-create-tapi",\r
          "xml": "<method rpc='inter-domain-handling' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 203,\r
-        "y": 175,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 190.5,\r
+        "y": 280,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "dbf465e6.f48758"\r
+                "af3a973b.40dd08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dbf465e6.f48758",\r
+        "id": "af3a973b.40dd08",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 413.5,\r
-        "y": 159.99998474121094,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 401,\r
+        "y": 264.99998474121094,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "28583d0f.279172"\r
+                "c7bde6fd.a9cd08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28583d0f.279172",\r
+        "id": "c7bde6fd.a9cd08",\r
          "type": "get-resource",\r
          "name": "get-resource",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"logical-links\"\nkey=\" \"\npfx='inter' local-only='false' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 580.3333435058594,\r
-        "y": 114.66667175292969,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 567.8333435058594,\r
+        "y": 219.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "b70b6289.977c1",\r
-                "6ef8cbe3.e8bef4",\r
-                "6bf74a48.446dd4"\r
+                "33ac5ab7.2291a6",\r
+                "a16804ab.521db8",\r
+                "fcb475cb.a0be98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b70b6289.977c1",\r
+        "id": "33ac5ab7.2291a6",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 737.3333435058594,\r
-        "y": 55.66667175292969,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 724.8333435058594,\r
+        "y": 160.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "85b966b9.0f8cf8"\r
+                "5eb01f99.89617"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ef8cbe3.e8bef4",\r
+        "id": "a16804ab.521db8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 746.3333435058594,\r
-        "y": 106.66667175292969,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 733.8333435058594,\r
+        "y": 211.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "cd963a4d.e22ee8"\r
+                "47cadf70.ddac9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85b966b9.0f8cf8",\r
+        "id": "5eb01f99.89617",\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='No inter-domain-links available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 901.3333435058594,\r
-        "y": 53.66667175292969,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 888.8333435058594,\r
+        "y": 158.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cd963a4d.e22ee8",\r
+        "id": "47cadf70.ddac9",\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='Could not retrieve logical-links' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 908.3333435058594,\r
-        "y": 106.66667175292969,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 895.8333435058594,\r
+        "y": 211.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6bf74a48.446dd4",\r
+        "id": "fcb475cb.a0be98",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 567.3333435058594,\r
-        "y": 256.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 554.8333435058594,\r
+        "y": 361.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "9c819276.24e11"\r
+                "1cd2f550.3b31eb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c819276.24e11",\r
+        "id": "1cd2f550.3b31eb",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 571.3333435058594,\r
-        "y": 343.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 558.8333435058594,\r
+        "y": 448.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "d737ac6d.616bf",\r
-                "26ccb9a4.4d6756",\r
-                "220b1d2a.b6a942"\r
+                "61403202.67ffac",\r
+                "5cf9c1.73b5e64",\r
+                "b39431ae.10e55"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26ccb9a4.4d6756",\r
+        "id": "5cf9c1.73b5e64",\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/inter-domain.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`'Aaccess bend---' + $access-bend`\"/>\n<parameter name=\"field2\" value=\"`'Aaccess cend---' + $access-cend`\"/>\n<parameter name=\"field3\" value=\"`'Service 1 req id---' + $service1-request-id`\"/>\n<parameter name=\"field4\" value=\"`'Service 2 req id---' + $service2-request-id`\"/>\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 735.3333435058594,\r
-        "y": 398.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 722.8333435058594,\r
+        "y": 503.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c76734fa.8d1cc8",\r
+        "id": "61f864fb.8ad3fc",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$inter.logical-link[$ida].link-type`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 861.3333435058594,\r
-        "y": 349.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 848.8333435058594,\r
+        "y": 454.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "272d946f.d2dc2c"\r
+                "750846eb.eb1858"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d737ac6d.616bf",\r
+        "id": "61403202.67ffac",\r
          "type": "for",\r
          "name": "for",\r
          "xml": "<for index='ida' start='0' end='`$inter.logical-link_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 730.3333435058594,\r
-        "y": 349.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 717.8333435058594,\r
+        "y": 454.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "c76734fa.8d1cc8"\r
+                "61f864fb.8ad3fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "272d946f.d2dc2c",\r
+        "id": "750846eb.eb1858",\r
          "type": "outcome",\r
          "name": "inter-domain",\r
          "xml": "<outcome value='inter-domain'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1003.3333435058594,\r
-        "y": 349.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 990.8333435058594,\r
+        "y": 454.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "9b0d1c2e.0faa7"\r
+                "4071f83b.54b008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ca4ee674.defdf8",\r
+        "id": "bb3b4d5f.2b2bc",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='access-bend' value='`$inter.logical-link[$ida].relationship-list.relationship[0].relationship-data[1].relationship-value`' />\n<parameter name='access-cend' value='`$inter.logical-link[$ida].relationship-list.relationship[1].relationship-data[1].relationship-value`' />\n",\r
          "comments": "",\r
-        "x": 1570.083396911621,\r
-        "y": 200.4166898727417,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1557.583396911621,\r
+        "y": 305.4166898727417,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a5175c91.4398b",\r
+        "id": "e9fe864f.b1d708",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 1587.833396911621,\r
-        "y": 298.91669178009033,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1575.333396911621,\r
+        "y": 403.91669178009033,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "13f040fa.3faaef",\r
+        "id": "8c88b9bd.0e2f28",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1431.083396911621,\r
-        "y": 292.416690826416,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1418.583396911621,\r
+        "y": 397.416690826416,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "ca4ee674.defdf8",\r
-                "a5175c91.4398b"\r
+                "bb3b4d5f.2b2bc",\r
+                "e9fe864f.b1d708"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "220b1d2a.b6a942",\r
+        "id": "b39431ae.10e55",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test=\"`$access-bend == ''`\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 693.3333435058594,\r
-        "y": 455.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 680.8333435058594,\r
+        "y": 560.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "130ab846.d0f008",\r
-                "50eacb5c.990954"\r
+                "1bff9a4a.aa1c56",\r
+                "c7a0ae8a.585af"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "130ab846.d0f008",\r
+        "id": "1bff9a4a.aa1c56",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 837.3333435058594,\r
-        "y": 455.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 824.8333435058594,\r
+        "y": 560.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "ee14f7be.3c7fa8"\r
+                "99508862.dd9ed8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee14f7be.3c7fa8",\r
+        "id": "99508862.dd9ed8",\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='No inter-domain-links available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 986.3333435058594,\r
-        "y": 456.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 973.8333435058594,\r
+        "y": 561.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "50eacb5c.990954",\r
+        "id": "c7a0ae8a.585af",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 572.3333435058594,\r
-        "y": 531.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 559.8333435058594,\r
+        "y": 636.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "347e2915.cc1706"\r
+                "64bdfe75.3731a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "347e2915.cc1706",\r
+        "id": "64bdfe75.3731a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 717.3333435058594,\r
-        "y": 532.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 704.8333435058594,\r
+        "y": 637.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "856ca7c4.6b82e8",\r
-                "8837a281.40c0b",\r
-                "de103600.3d65d8",\r
-                "c43967.77247698"\r
+                "d71ceee8.2cc21",\r
+                "5812464d.ff2318",\r
+                "d5d60b0e.6b7598",\r
+                "e899697c.47e108"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "856ca7c4.6b82e8",\r
+        "id": "d71ceee8.2cc21",\r
          "type": "for",\r
          "name": "for",\r
          "xml": "<for index='idb' start='0' end='2' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 906.3333435058594,\r
-        "y": 530.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 893.8333435058594,\r
+        "y": 635.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "a72d7f41.fec8f"\r
+                "4df590dd.62851"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "82932067.81591",\r
+        "id": "f4b1528e.2b869",\r
          "type": "call",\r
          "name": "call",\r
          "xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1457.3333435058594,\r
-        "y": 545.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1444.8333435058594,\r
+        "y": 650.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "e5f10270.f273a",\r
-                "7ab99a2a.02a9b4"\r
+                "b82ddceb.8c1de",\r
+                "11734593.7b34da"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a72d7f41.fec8f",\r
+        "id": "4df590dd.62851",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$idb`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1032.3333435058594,\r
-        "y": 530.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1019.8333435058594,\r
+        "y": 635.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "a10d9b09.c6a018",\r
-                "65f0439d.6850dc"\r
+                "e24cf2b6.2e8bb",\r
+                "fcc6fd38.e5cb2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a10d9b09.c6a018",\r
+        "id": "e24cf2b6.2e8bb",\r
          "type": "outcome",\r
          "name": "outcome",\r
          "xml": "<outcome value='0'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1160.3333435058594,\r
-        "y": 497.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1147.8333435058594,\r
+        "y": 602.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "e11165ce.81f408"\r
+                "14ca5977.d20f97"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e11165ce.81f408",\r
+        "id": "14ca5977.d20f97",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1304.3333435058594,\r
-        "y": 497.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1291.8333435058594,\r
+        "y": 602.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "82932067.81591",\r
-                "8944795b.be9238"\r
+                "f4b1528e.2b869",\r
+                "13ff6105.eaad1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7242da65.49c644",\r
+        "id": "a1dafaaf.167958",\r
          "type": "set",\r
          "name": "set",\r
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-cend`' />\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-zend`' />\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$access-service-name + '_' + 'MDONS-OTN-TAPI-2'`\" />\n<parameter name='domain-type' value=\"TAPI\" />\n<parameter name='optical-service-create-input.request-id' value=\"`$service2-request-id`\" />\n<parameter name='optical-service-create-input.service-id' value=\"`$service2-svc-instance-id`\" />\n",\r
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-cend`' />\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-zend`' />\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$access-service-name + '_MDONS-OTN'`\" />\n<parameter name='domain-type' value=\"TAPI\" />\n<parameter name='optical-service-create-input.request-id' value=\"`$service2-request-id`\" />\n<parameter name='optical-service-create-input.service-id' value=\"`$service2-svc-instance-id`\" />\n",\r
          "comments": "",\r
-        "x": 1465.3333435058594,\r
-        "y": 751.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1452.8333435058594,\r
+        "y": 856.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9d5ec95.325f2",\r
+        "id": "c16d7ee9.39a1a",\r
          "type": "call",\r
          "name": "call",\r
          "xml": "<call module='optical-service' rpc='main-create' mode='sync' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1302.3333435058594,\r
-        "y": 1038.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1289.8333435058594,\r
+        "y": 1143.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "3bece07b.4143",\r
-                "308f7f65.579ea"\r
+                "eadb5b74.6cde68",\r
+                "2fe5acd9.03dff4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "65f0439d.6850dc",\r
+        "id": "fcc6fd38.e5cb2",\r
          "type": "outcome",\r
          "name": "outcome",\r
          "xml": "<outcome value='1'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1144.3333435058594,\r
-        "y": 745.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1131.8333435058594,\r
+        "y": 850.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "4117c3fb.234e2c"\r
+                "6d4682a2.6cf8ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4117c3fb.234e2c",\r
+        "id": "6d4682a2.6cf8ac",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1294.3333435058594,\r
-        "y": 768.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1281.8333435058594,\r
+        "y": 873.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "7242da65.49c644",\r
-                "d9d5ec95.325f2"\r
+                "a1dafaaf.167958",\r
+                "c16d7ee9.39a1a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8944795b.be9238",\r
+        "id": "13ff6105.eaad1f",\r
          "type": "set",\r
          "name": "set",\r
-        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-aend`' />\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-bend`' />\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$access-service-name + '_' + 'MDONS-OTN-TAPI-1'`\" />\n<parameter name='domain-type' value=\"TAPI\" />\n<parameter name='optical-service-create-input.request-id' value=\"`$service1-request-id`\" />\n<parameter name='optical-service-create-input.service-id' value=\"`$service1-svc-instance-id`\" />\n\n",\r
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-aend`' />\n<parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-bend`' />\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$access-service-name +  '_MDONS-OTN'`\" />\n<parameter name='domain-type' value=\"TAPI\" />\n<parameter name='optical-service-create-input.request-id' value=\"`$service1-request-id`\" />\n<parameter name='optical-service-create-input.service-id' value=\"`$service1-svc-instance-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1457.3333435058594,\r
-        "y": 480.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1444.8333435058594,\r
+        "y": 585.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8837a281.40c0b",\r
+        "id": "5812464d.ff2318",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$service1 == $service2 == success`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 467.8333511352539,\r
-        "y": 972.9166975021362,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 455.3333511352539,\r
+        "y": 1077.9166975021362,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "b7e3ef8e.7574d",\r
-                "ebdeccd7.d965"\r
+                "5c9c5b68.cd5504",\r
+                "495561a5.fec34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ebe2880.5d2848",\r
+        "id": "2552ecde.5a89f4",\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='Multi-domain-service successfully created' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 972.3333892822266,\r
-        "y": 970.4167022705078,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 959.8333892822266,\r
+        "y": 1075.4167022705078,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e32376ab.722ab8",\r
+        "id": "e8dd732b.52f0b",\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='Multi-domain-service creation failed' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 886.5833892822266,\r
-        "y": 1182.9167022705078,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 874.0833892822266,\r
+        "y": 1287.9167022705078,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e5f10270.f273a",\r
+        "id": "b82ddceb.8c1de",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1602.3333435058594,\r
-        "y": 520.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1589.8333435058594,\r
+        "y": 625.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "ce267118.2a781"\r
+                "35cec1fe.7cd71e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3bece07b.4143",\r
+        "id": "eadb5b74.6cde68",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1444.3333435058594,\r
-        "y": 1034.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1431.8333435058594,\r
+        "y": 1139.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "5d7bb97e.9b9168"\r
+                "72d0218e.8f2fd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "de103600.3d65d8",\r
+        "id": "d5d60b0e.6b7598",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='access-service-name' value='`$optical-service-create-input.payload.service-name`' />\n",\r
          "comments": "",\r
-        "x": 853.3333435058594,\r
-        "y": 493.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 840.8333435058594,\r
+        "y": 598.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d7bea264.ac4f",\r
+        "id": "caf045ec.2f23f8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 777.0833892822266,\r
-        "y": 890.6666994094849,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 764.5833892822266,\r
+        "y": 995.6666994094849,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "45335899.f65cd8",\r
-                "3ebe2880.5d2848",\r
-                "5ad6860e.7c4058",\r
-                "105084eb.36fa9b"\r
+                "9e317702.903b08",\r
+                "2552ecde.5a89f4",\r
+                "146e2604.39be4a",\r
+                "2c1dad44.b6ddc2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "45335899.f65cd8",\r
+        "id": "9e317702.903b08",\r
          "type": "save",\r
          "name": "update acc service db",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE REQUEST_DETAILS SET status = \"CREATED\" WHERE request_id = $as-request-id'\nforce='true' pfx='save-result'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 983.3333892822266,\r
-        "y": 790.6666984558105,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 970.8333892822266,\r
+        "y": 895.6666984558105,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ef433cfb.addb6",\r
+        "id": "9b1c21a0.1f564",\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/inter-domain.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Access service creation failed\"/>\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 862.8333892822266,\r
-        "y": 1084.4167003631592,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 850.3333892822266,\r
+        "y": 1189.4167003631592,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5ffac9eb.b5f648",\r
+        "id": "eb99418.1ac6dc",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 725.5833854675293,\r
-        "y": 1123.916766166687,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 713.0833854675293,\r
+        "y": 1228.916766166687,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "ef433cfb.addb6",\r
-                "e32376ab.722ab8"\r
+                "9b1c21a0.1f564",\r
+                "e8dd732b.52f0b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1a20d556.18cf3b",\r
+        "id": "c5ae62a0.518d9",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",\r
          "comments": "",\r
-        "x": 1850.3333435058594,\r
-        "y": 448.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1837.8333435058594,\r
+        "y": 553.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ce267118.2a781",\r
+        "id": "35cec1fe.7cd71e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1700.3333435058594,\r
-        "y": 450.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1687.8333435058594,\r
+        "y": 555.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "1a20d556.18cf3b",\r
-                "1e9f2b96.152c94"\r
+                "c5ae62a0.518d9",\r
+                "cc685478.44b5d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1e9f2b96.152c94",\r
+        "id": "cc685478.44b5d8",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$service1-status == 200`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1728.3333435058594,\r
-        "y": 580.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1715.8333435058594,\r
+        "y": 685.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "69014b74.07f204",\r
-                "1a2962dc.544a6d"\r
+                "4120a771.cb7b78",\r
+                "304cf1d.95f070e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "69014b74.07f204",\r
+        "id": "4120a771.cb7b78",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1897.3333435058594,\r
-        "y": 535.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1884.8333435058594,\r
+        "y": 640.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "312af284.d49a7e"\r
+                "b8c2bbf6.152258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1a2962dc.544a6d",\r
+        "id": "304cf1d.95f070e",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1898.3333435058594,\r
-        "y": 602.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1885.8333435058594,\r
+        "y": 707.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "1d22b46d.2540bc"\r
+                "d123f6e.9b1a508"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "312af284.d49a7e",\r
+        "id": "b8c2bbf6.152258",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='service1' value='success' />\n",\r
          "comments": "",\r
-        "x": 2032.3333435058594,\r
-        "y": 524.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 2019.8333435058594,\r
+        "y": 629.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1d22b46d.2540bc",\r
+        "id": "d123f6e.9b1a508",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='service1' value='failure' />\n",\r
          "comments": "",\r
-        "x": 2034.3333435058594,\r
-        "y": 601.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 2021.8333435058594,\r
+        "y": 706.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5d7bb97e.9b9168",\r
+        "id": "72d0218e.8f2fd",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1617.3333435058594,\r
-        "y": 1015.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1604.8333435058594,\r
+        "y": 1120.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "6ec325e8.81817c",\r
-                "b7239a52.656e68"\r
+                "1b71dbd0.f488a4",\r
+                "f3c54b18.1b0eb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b7239a52.656e68",\r
+        "id": "f3c54b18.1b0eb8",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$service2-status == 200`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1749.3333435058594,\r
-        "y": 1114.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1736.8333435058594,\r
+        "y": 1219.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "53ffa173.fbef1",\r
-                "2ad5ca.ed0e4a36"\r
+                "d06b5ea3.2c7da",\r
+                "9a666773.f65fe8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53ffa173.fbef1",\r
+        "id": "d06b5ea3.2c7da",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1905.3333435058594,\r
-        "y": 1039.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1892.8333435058594,\r
+        "y": 1144.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "4007f828.6542e8"\r
+                "be86fbe9.594738"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ad5ca.ed0e4a36",\r
+        "id": "9a666773.f65fe8",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1962.3333435058594,\r
-        "y": 1121.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1949.8333435058594,\r
+        "y": 1226.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "dd3cb13a.463cf"\r
+                "4df0a4d2.d2637c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4007f828.6542e8",\r
+        "id": "be86fbe9.594738",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='service2' value='success' />\n",\r
          "comments": "",\r
-        "x": 2106.3333435058594,\r
-        "y": 1029.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 2093.8333435058594,\r
+        "y": 1134.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dd3cb13a.463cf",\r
+        "id": "4df0a4d2.d2637c",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='service2' value='success' />\n",\r
          "comments": "",\r
-        "x": 2105.3333435058594,\r
-        "y": 1099.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 2092.8333435058594,\r
+        "y": 1204.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ec325e8.81817c",\r
+        "id": "1b71dbd0.f488a4",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='service2-status' value='`$final-response-code`' />\n",\r
          "comments": "",\r
-        "x": 1787.3333435058594,\r
-        "y": 962.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1774.8333435058594,\r
+        "y": 1067.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c43967.77247698",\r
+        "id": "e899697c.47e108",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='inter' value='' />\n",\r
          "comments": "",\r
-        "x": 901.8333854675293,\r
-        "y": 578.4166970252991,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 889.3333854675293,\r
+        "y": 683.4166970252991,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7ab99a2a.02a9b4",\r
+        "id": "11734593.7b34da",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1605.3333435058594,\r
-        "y": 615.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1592.8333435058594,\r
+        "y": 720.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "f872b304.25e82"\r
+                "528f2a75.c81264"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f872b304.25e82",\r
+        "id": "528f2a75.c81264",\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 Create Dg not available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 1765.3333435058594,\r
-        "y": 636.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1752.8333435058594,\r
+        "y": 741.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "308f7f65.579ea",\r
+        "id": "2fe5acd9.03dff4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1403.3333435058594,\r
-        "y": 1116.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1390.8333435058594,\r
+        "y": 1221.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "472ab920.66f758"\r
+                "c76d7b74.481948"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "472ab920.66f758",\r
+        "id": "c76d7b74.481948",\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 Create Dg not available' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 1563.3333435058594,\r
-        "y": 1137.6666717529297,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1550.8333435058594,\r
+        "y": 1242.6666717529297,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b7e3ef8e.7574d",\r
+        "id": "5c9c5b68.cd5504",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 636.333381652832,\r
-        "y": 896.1666984558105,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 623.833381652832,\r
+        "y": 1001.1666984558105,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "d7bea264.ac4f"\r
+                "caf045ec.2f23f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebdeccd7.d965",\r
+        "id": "495561a5.fec34",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 600.583381652832,\r
-        "y": 1125.166699886322,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 588.083381652832,\r
+        "y": 1230.166699886322,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "5ffac9eb.b5f648"\r
+                "eb99418.1ac6dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5ad6860e.7c4058",\r
+        "id": "146e2604.39be4a",\r
          "type": "call",\r
          "name": "create-service-relationship",\r
          "xml": "<call module='optical-service' rpc='create-service-relationship' mode='sync' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 983.3333892822266,\r
-        "y": 889.4166984558105,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 970.8333892822266,\r
+        "y": 994.4166984558105,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9b0d1c2e.0faa7",\r
+        "id": "4071f83b.54b008",\r
          "type": "switchNode",\r
          "name": "switch",\r
-        "xml": "<switch test='`$inter.logical-link[$ida].available-capacity == 0`'>\n",\r
+        "xml": "<switch test='`$inter.logical-link[$ida].operational-status == occupied`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1145,\r
-        "y": 241.25,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1132.5,\r
+        "y": 346.25,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "39e8a51e.7cdb9a",\r
-                "73566e12.b8034"\r
+                "9d6b0593.4c7858",\r
+                "1087939c.29799c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "39e8a51e.7cdb9a",\r
+        "id": "9d6b0593.4c7858",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1262.5000190734863,\r
-        "y": 190.00000190734863,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1250.0000190734863,\r
+        "y": 295.00000190734863,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "73566e12.b8034",\r
+        "id": "1087939c.29799c",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1268.7500190734863,\r
-        "y": 296.2500057220459,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1256.2500190734863,\r
+        "y": 401.2500057220459,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              [\r
-                "13f040fa.3faaef"\r
+                "8c88b9bd.0e2f28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "105084eb.36fa9b",\r
+        "id": "2c1dad44.b6ddc2",\r
          "type": "update",\r
          "name": "update logical-link-status AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\n     key='logical-link.link-name = $inter.logical-link[$ida].link-name '\n      local-only='false'>\n<parameter name='available-capacity' value='0' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\n     key='logical-link.link-name = $inter.logical-link[$ida].link-name '\n      local-only='false'>\n<parameter name='operational-status' value='occupied' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1027.5,\r
-        "y": 841.25,\r
-        "z": "5c4cb98c.063918",\r
+        "x": 1015,\r
+        "y": 946.25,\r
+        "z": "f30c4ed5.582ba",\r
          "wires": [\r
              []\r
          ]\r
diff --git a/platform-logic/optical-service/src/main/json/optical-service_main-create.json b/platform-logic/optical-service/src/main/json/optical-service_main-create.json

index a4a40e3..5f81d00 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_main-create.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_main-create.json
@@ -1,36 +1,36 @@
  [\r
      {\r
-        "id": "65bbf2ea.e8f944",\r
+        "id": "fa16ded3.d901b8",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 286.8833312988281,\r
-        "y": 269,\r
-        "z": "30ae7182.add8b6",\r
+        "x": 115.56666564941406,\r
+        "y": 208,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "1593715.ae96a8f"\r
+                "90403a74.09bb68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f336edeb.74ce6",\r
+        "id": "f00eb096.4df5f8",\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
+        "x": 114.56666564941406,\r
+        "y": 283,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "14882330.8313b5"\r
+                "f2783a8d.204c9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1593715.ae96a8f",\r
+        "id": "90403a74.09bb68",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -38,330 +38,342 @@
          "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
+        "x": 333.06666564941406,\r
+        "y": 191,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "f336edeb.74ce6"\r
+                "f00eb096.4df5f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14882330.8313b5",\r
+        "id": "f2783a8d.204c9",\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
+        "x": 290.56666564941406,\r
+        "y": 296,\r
+        "z": "85a5350a.773aa",\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
+                "ee7be5b0.aa7dc8",\r
+                "1dad9f12.1a3e61",\r
+                "aaac41a5.27aa68",\r
+                "f2b644f.38afa38",\r
+                "8c0272ce.5073f8",\r
+                "c0d24976.f4106",\r
+                "f7e9652a.8ce238",\r
+                "6f7933ca.5a605c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c4d3d388.dc35a",\r
+        "id": "1dad9f12.1a3e61",\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
+        "x": 168.06666564941406,\r
+        "y": 609,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "77b74d5.6495a34",\r
-                "7bd5cfea.c1ac2"\r
+                "e31c6328.82295",\r
+                "4cf89a4b.d30f7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "77b74d5.6495a34",\r
+        "id": "e31c6328.82295",\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
+        "x": 470.56666564941406,\r
+        "y": 579,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "70f7a20a.befe0c"\r
+                "b7bf1438.6f1708"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bd5cfea.c1ac2",\r
+        "id": "4cf89a4b.d30f7c",\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
+        "x": 466.56666564941406,\r
+        "y": 688,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "9b03001b.004b98"\r
+                "8393cee1.c83828"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "994bfa4.9799188",\r
+        "id": "ee7be5b0.aa7dc8",\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
+        "x": 683.5666351318359,\r
+        "y": 120,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "70f7a20a.befe0c",\r
+        "id": "b7bf1438.6f1708",\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
+        "x": 658.5666656494141,\r
+        "y": 580,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "5fc1c8dc.a583e8"\r
+                "e32158b8.9895f",\r
+                "2158346f.f6bbfc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b03001b.004b98",\r
+        "id": "8393cee1.c83828",\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
+        "x": 651.5666656494141,\r
+        "y": 693,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "b46560fc.9378b8"\r
+                "a02ebdd4.76b6e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "204f0598.3ac182",\r
+        "id": "aaac41a5.27aa68",\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
+        "x": 740.5666351318359,\r
+        "y": 75,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b46560fc.9378b8",\r
+        "id": "a02ebdd4.76b6e",\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
+        "x": 847.5666961669922,\r
+        "y": 699,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5fc1c8dc.a583e8",\r
+        "id": "e32158b8.9895f",\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
+        "x": 877.5666351318359,\r
+        "y": 580,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2d636d44.e5a0fa",\r
+        "id": "f2b644f.38afa38",\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
+        "x": 700.5666351318359,\r
+        "y": 196,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "33031f70.c9e2f"\r
+                "b77153b2.c2f938"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2c72a67.f372ada",\r
+        "id": "8c0272ce.5073f8",\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
+        "x": 700.5666351318359,\r
+        "y": 247,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "33031f70.c9e2f",\r
+        "id": "b77153b2.c2f938",\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
+        "x": 936.5666351318359,\r
+        "y": 194,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "6316e11e.6a8a8"\r
+                "8f62ab7a.db0b3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6316e11e.6a8a8",\r
+        "id": "8f62ab7a.db0b3",\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
+        "x": 1079.566635131836,\r
+        "y": 196,\r
+        "z": "85a5350a.773aa",\r
          "wires": []\r
      },\r
      {\r
-        "id": "79455985.47e29",\r
+        "id": "c0d24976.f4106",\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
+        "xml": "<set>\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n\n \n",\r
          "comments": "",\r
-        "x": 815.88330078125,\r
-        "y": 370,\r
-        "z": "30ae7182.add8b6",\r
+        "x": 644.5666351318359,\r
+        "y": 309,\r
+        "z": "85a5350a.773aa",\r
          "wires": []\r
      },\r
      {\r
-        "id": "887cbe59.b1784",\r
+        "id": "f7e9652a.8ce238",\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
+        "x": 522.5666351318359,\r
+        "y": 363,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "1d791c96.d1da33"\r
+                "a1f4b6c7.113a2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4f44de12.e7fb18",\r
+        "id": "6f7933ca.5a605c",\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
+        "x": 508.56663513183594,\r
+        "y": 426,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "ef8516e4.6c5f7"\r
+                "2ea9e371.7eafec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1d791c96.d1da33",\r
+        "id": "a1f4b6c7.113a2",\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
+        "x": 706.5666351318359,\r
+        "y": 365,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "c56f5bdc.a7e378"\r
+                "46b0b834.385158"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c56f5bdc.a7e378",\r
+        "id": "46b0b834.385158",\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
+        "x": 873.5666351318359,\r
+        "y": 364,\r
+        "z": "85a5350a.773aa",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ef8516e4.6c5f7",\r
+        "id": "2ea9e371.7eafec",\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
+        "x": 705.5666351318359,\r
+        "y": 430,\r
+        "z": "85a5350a.773aa",\r
          "wires": [\r
              [\r
-                "3ea4fdfa.d7bd4a"\r
+                "89fb9148.b2f3a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ea4fdfa.d7bd4a",\r
+        "id": "89fb9148.b2f3a8",\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
+        "x": 873.5666351318359,\r
+        "y": 431,\r
+        "z": "85a5350a.773aa",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2158346f.f6bbfc",\r
+        "type": "set",\r
+        "name": "set service-name",\r
+        "xml": "<set>\n<parameter name='optical-service-create-input.payload.service-name' value=\"`$optical-service-create-input.payload.service-name + '_' + $param-prefix[2]`\"/>\n \n",\r
+        "comments": "",\r
+        "x": 840.5,\r
+        "y": 507.5,\r
+        "z": "85a5350a.773aa",\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 fbb368b..8c2cfb8 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": "b65cdeae.8f7b08",\r
+        "id": "c17df4ee.ad8458",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 129,\r
-        "y": 129.88333129882812,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 112.5,\r
+        "y": 195,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "644f31e7.7234b8"\r
+                "2f8ae227.f9075e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "644f31e7.7234b8",\r
+        "id": "2f8ae227.f9075e",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -22,1454 +22,1513 @@
          "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": 237.5,\r
-        "y": 207.88333129882812,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 221,\r
+        "y": 273,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "168fe70c.0f8c41"\r
+                "34dadbb5.269934"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "168fe70c.0f8c41",\r
+        "id": "34dadbb5.269934",\r
          "type": "method",\r
          "name": "method",\r
          "xml": "<method rpc='optical-service-delete' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 106,\r
-        "y": 298.8833312988281,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 89.5,\r
+        "y": 364,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "cfd0169c.a3cee"\r
+                "e6b811fb.e9938"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cfd0169c.a3cee",\r
+        "id": "e6b811fb.e9938",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 292,\r
-        "y": 294.8833312988281,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 275.5,\r
+        "y": 360,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "30cb33e3.b12a94",\r
-                "2e82bc92.4b93a4",\r
-                "5e98d3f6.94968c",\r
-                "cf17dc19.012ac",\r
-                "d4ebf687.1cccd8",\r
-                "cbe18d30.3b4198",\r
-                "840d7865.dda6b"\r
+                "60962f66.88821",\r
+                "616349b4.624558",\r
+                "4ec77896.6688b8",\r
+                "f1e1cc05.18be2",\r
+                "e639fab2.57e918",\r
+                "2b88b50f.6d1f2a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30cb33e3.b12a94",\r
+        "id": "60962f66.88821",\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": 574.9999694824219,\r
-        "y": 20,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 545.9999771118164,\r
+        "y": 32.61667013168335,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2e82bc92.4b93a4",\r
+        "id": "616349b4.624558",\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
+        "x": 659.4999542236328,\r
+        "y": 126.9999942779541,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "78b1b9eb.f0f1a8"\r
+                "b9be5065.25db9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "78b1b9eb.f0f1a8",\r
+        "id": "b9be5065.25db9",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 881,\r
-        "y": 68.8833236694336,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 887.0000114440918,\r
+        "y": 118.9999942779541,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "b1511a3a.314df"\r
+                "1b12f198.60face"\r
              ]\r
          ]\r
      },\r
      {\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
+        "id": "4ec77896.6688b8",\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
+        "x": 668.4999465942383,\r
+        "y": 236.00000381469727,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cf17dc19.012ac",\r
+        "id": "f1e1cc05.18be2",\r
          "type": "execute",\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": 651.1166381835938,\r
-        "y": 115.99999237060547,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 704.6166534423828,\r
+        "y": 188.61665606498718,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d4ebf687.1cccd8",\r
+        "id": "e639fab2.57e918",\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": 544,\r
-        "y": 289,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 527.5,\r
+        "y": 354.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "91896047.66eb7"\r
+                "623884ec.5f3a8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "91896047.66eb7",\r
+        "id": "623884ec.5f3a8c",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$param-prefix1_length`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 698,\r
-        "y": 287,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 681.5,\r
+        "y": 352.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "2c37340b.4002cc",\r
-                "7784419a.212fa"\r
+                "d5d414a3.d47da8",\r
+                "b4f97507.a007b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2c37340b.4002cc",\r
+        "id": "d5d414a3.d47da8",\r
          "type": "outcome",\r
          "name": "1",\r
          "xml": "<outcome value='1'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 881,\r
-        "y": 281,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 864.5,\r
+        "y": 346.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "be5c1afb.f2037"\r
+                "e287faaa.f3da48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "be5c1afb.f2037",\r
+        "id": "e287faaa.f3da48",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1050,\r
-        "y": 281,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1033.5,\r
+        "y": 346.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "7f6fcc65.18cb7c",\r
-                "3a1a70c6.408b8",\r
-                "795303c1.2dac44",\r
-                "3ab986c7.09e812"\r
+                "ee746443.f75118",\r
+                "7b7f945a.86e22c",\r
+                "97c1a1ae.42a57",\r
+                "f357d481.8e4f58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7784419a.212fa",\r
+        "id": "b4f97507.a007b8",\r
          "type": "outcome",\r
          "name": "2",\r
          "xml": "<outcome value='2'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 631,\r
-        "y": 718,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 614.5,\r
+        "y": 783.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "e41aac03.bbaa5"\r
+                "f4eb142b.f563f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3a1a70c6.408b8",\r
+        "id": "7b7f945a.86e22c",\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": 1322,\r
-        "y": 286,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1305.5,\r
+        "y": 351.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7f6fcc65.18cb7c",\r
+        "id": "ee746443.f75118",\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-db1'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1326.11669921875,\r
-        "y": 246.11666870117188,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1309.61669921875,\r
+        "y": 311.23333740234375,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "e2726a7c.0cf32"\r
+                "657a4de1.7e7434"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e2726a7c.0cf32",\r
+        "id": "657a4de1.7e7434",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1571.11669921875,\r
-        "y": 245.11666870117188,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1554.61669921875,\r
+        "y": 310.23333740234375,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "70e7b1a6.2a20f"\r
+                "2456ff5f.8ccfc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "70e7b1a6.2a20f",\r
+        "id": "2456ff5f.8ccfc",\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
+        "x": 1702.61669921875,\r
+        "y": 312.23333740234375,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "795303c1.2dac44",\r
+        "id": "97c1a1ae.42a57",\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
+        "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
+        "x": 1257.61669921875,\r
+        "y": 423.23333740234375,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3ab986c7.09e812",\r
+        "id": "f357d481.8e4f58",\r
          "type": "switchNode",\r
          "name": "switch domain-type",\r
          "xml": "<switch test='`$domain-type`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1263,\r
-        "y": 493,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1246.5,\r
+        "y": 558.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "e04cd56f.45dfc8",\r
-                "2fc7713.599bf0e"\r
+                "fccd0b30.b9cbc8",\r
+                "bef3609.dfed5a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e04cd56f.45dfc8",\r
+        "id": "fccd0b30.b9cbc8",\r
          "type": "outcome",\r
          "name": "MSA",\r
          "xml": "<outcome value='MSA'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1466,\r
-        "y": 404,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1449.5,\r
+        "y": 469.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "5962de98.7a93e8"\r
+                "a299e8ab.d4c218"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2fc7713.599bf0e",\r
+        "id": "bef3609.dfed5a",\r
          "type": "outcome",\r
          "name": "TAPI",\r
          "xml": "<outcome value='TAPI'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1469,\r
-        "y": 584,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1452.5,\r
+        "y": 649.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "c51e88be.9e544"\r
+                "6037d29.154702c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5962de98.7a93e8",\r
+        "id": "a299e8ab.d4c218",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1606,\r
-        "y": 401,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1589.5,\r
+        "y": 466.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "314acdb7.afb7da"\r
+                "11bafb72.872785"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "314acdb7.afb7da",\r
+        "id": "11bafb72.872785",\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
          "outputs": 1,\r
-        "x": 1794,\r
-        "y": 402,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1777.5,\r
+        "y": 467.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "af9224a8.a9533",\r
-                "3e7bdf94.045928"\r
+                "67a6d9a9.a380e8",\r
+                "b6015380.84934"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "af9224a8.a9533",\r
+        "id": "67a6d9a9.a380e8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1979,\r
-        "y": 358,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1962.5,\r
+        "y": 423.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "bbe67c9b.ae8e2"\r
+                "bea424de.48e7e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3e7bdf94.045928",\r
+        "id": "b6015380.84934",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1981,\r
-        "y": 450,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1964.5,\r
+        "y": 515.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "449903c8.0a6724"\r
+                "68e25a.54defda8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bbe67c9b.ae8e2",\r
+        "id": "bea424de.48e7e8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2150,\r
-        "y": 349,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 2133.5,\r
+        "y": 414.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "3a0958a9.5973c8"\r
+                "92667335.f399b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3a0958a9.5973c8",\r
+        "id": "92667335.f399b",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='service1-status' value='`$final-response-code`' />\n",\r
          "comments": "",\r
-        "x": 2293,\r
-        "y": 324,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 2276.5,\r
+        "y": 389.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "449903c8.0a6724",\r
+        "id": "68e25a.54defda8",\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
+        "x": 2133.5,\r
+        "y": 545.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c51e88be.9e544",\r
+        "id": "6037d29.154702c",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1625,\r
-        "y": 586,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1608.5,\r
+        "y": 651.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "a271ced2.6952d8"\r
+                "c1da415.e052fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a271ced2.6952d8",\r
+        "id": "c1da415.e052fc",\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": 1813,\r
-        "y": 587,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1796.5,\r
+        "y": 652.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "3ea9b0c9.5ce928",\r
-                "3153866d.fe9922"\r
+                "c9ff3987.f9cc28",\r
+                "32a118e.8eb39e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ea9b0c9.5ce928",\r
+        "id": "c9ff3987.f9cc28",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1998,\r
-        "y": 543,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1981.5,\r
+        "y": 608.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "4e515097.338e48"\r
+                "d0a6dc35.167bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3153866d.fe9922",\r
+        "id": "32a118e.8eb39e8",\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
+        "x": 1983.5,\r
+        "y": 700.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "e7c2b606.d88798"\r
+                "f15af963.5b5418"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4e515097.338e48",\r
+        "id": "d0a6dc35.167bc",\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
+        "x": 2152.5,\r
+        "y": 599.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "128c0365.4d99ed",\r
-                "99a0a090.74b4e8"\r
+                "905a5288.1d934",\r
+                "757c5587.8c047c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "128c0365.4d99ed",\r
+        "id": "905a5288.1d934",\r
          "type": "set",\r
          "name": "set",\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
+        "x": 2295.5,\r
+        "y": 574.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7c2b606.d88798",\r
+        "id": "f15af963.5b5418",\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": 2169,\r
-        "y": 665,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 2152.5,\r
+        "y": 730.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "71b9114.072a4f",\r
+        "id": "e770f30c.f95fb",\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
+        "x": 1298.5,\r
+        "y": 956.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "1978613e.4073f7",\r
-                "2736e495.752c04"\r
+                "279a4131.3c50fe",\r
+                "12daba39.e98ea6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63600e7b.0d9eb8",\r
+        "id": "66eb021.82f40fc",\r
          "type": "set",\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
+        "xml": "<set>\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`\"/>\n<parameter name='domain-type' value='`$domain1[0]`' />\n<parameter name='controller-ip' value='`$domain1[1]`' />\n",\r
          "comments": "",\r
-        "x": 1296.11669921875,\r
-        "y": 815.1167602539062,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1279.61669921875,\r
+        "y": 880.2334289550781,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e41aac03.bbaa5",\r
+        "id": "f4eb142b.f563f8",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$ppx`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 771.1167602539062,\r
-        "y": 723.11669921875,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 754.6167602539062,\r
+        "y": 788.2333679199219,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "bc61c8e0.999178",\r
-                "d5fffe4f.796c18"\r
+                "e9f6b436.fcdbc8",\r
+                "5bc45c8e.581fe4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bc61c8e0.999178",\r
+        "id": "e9f6b436.fcdbc8",\r
          "type": "outcome",\r
          "name": "0",\r
          "xml": "<outcome value='0'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 951.1167602539062,\r
-        "y": 723.11669921875,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 934.6167602539062,\r
+        "y": 788.2333679199219,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "b7c6609b.2477c8"\r
+                "969523a9.6bb09"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5fffe4f.796c18",\r
+        "id": "5bc45c8e.581fe4",\r
          "type": "outcome",\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
+        "x": 882.6167602539062,\r
+        "y": 1162.2333679199219,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "a2b3475f.c55ff"\r
+                "293ec8e4.019748"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab6f8311.54637",\r
+        "id": "8c2a8c7c.a451",\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
+        "xml": "<set>\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service2`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`\"/>\n<parameter name='domain-type' value='`$domain2[0]`' />\n<parameter name='controller-ip' value='`$domain2[1]`' />\n\n\n",\r
          "comments": "",\r
-        "x": 1294.11669921875,\r
-        "y": 1170.11669921875,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1277.61669921875,\r
+        "y": 1235.2333679199219,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fc3b2634.80fb1",\r
+        "id": "ce3eac33.d1ef7",\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": 1301.11669921875,\r
-        "y": 1243.11669921875,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1284.61669921875,\r
+        "y": 1308.2333679199219,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "d0a61851.774d7",\r
-                "67e5500f.2b88c8"\r
+                "c8833e1f.21b83",\r
+                "d3120001.a70e1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b7c6609b.2477c8",\r
+        "id": "969523a9.6bb09",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1091.11669921875,\r
-        "y": 724.11669921875,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1074.61669921875,\r
+        "y": 789.2333679199219,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "63600e7b.0d9eb8",\r
-                "71b9114.072a4f",\r
-                "fb442d76.8c0b1",\r
-                "e8836a64.f81ae"\r
+                "66eb021.82f40fc",\r
+                "e770f30c.f95fb",\r
+                "54b2f238.cd48bc",\r
+                "71435f69.1d588"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a2b3475f.c55ff",\r
+        "id": "293ec8e4.019748",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1025.1167602539062,\r
-        "y": 1106.11669921875,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1008.6167602539062,\r
+        "y": 1171.2333679199219,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "ab6f8311.54637",\r
-                "fc3b2634.80fb1",\r
-                "4d169812.58b88",\r
-                "8f4e881d.558318"\r
+                "8c2a8c7c.a451",\r
+                "ce3eac33.d1ef7",\r
+                "a41e1354.f17a4",\r
+                "402c6221.29fbfc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1978613e.4073f7",\r
+        "id": "279a4131.3c50fe",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1576,\r
-        "y": 844,\r
-        "z": "e2f7091c.1492b8",\r
+        "x": 1559.5,\r
+        "y": 909.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "b4b3ae50.b80768"\r
+                "41399ce9.b1c0e4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2736e495.752c04",\r
+        "id": "12daba39.e98ea6",\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
+        "x": 1543.5,\r
+        "y": 1038.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "ecbd8135.fa342"\r
+                "1b2c47f4.41a498"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b4b3ae50.b80768",\r
+        "id": "41399ce9.b1c0e4",\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
+        "x": 1715.5,\r
+        "y": 916.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "e387ae63.768b78",\r
-                "6a4932f.f7508cc"\r
+                "c73df929.f6ae38",\r
+                "91dcae30.1f35"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e387ae63.768b78",\r
+        "id": "c73df929.f6ae38",\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
+        "x": 1882.4998779296875,\r
+        "y": 829.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6a4932f.f7508cc",\r
+        "id": "91dcae30.1f35",\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
+        "x": 1871.4998779296875,\r
+        "y": 946.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "f2ab530d.5d599",\r
-                "7ea5454b.c5d99c"\r
+                "a76b03e3.6d946",\r
+                "35234e07.f4ce22"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f2ab530d.5d599",\r
+        "id": "a76b03e3.6d946",\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
+        "x": 2013.4998779296875,\r
+        "y": 876.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "896e220.db3996"\r
+                "3e585958.e262c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7ea5454b.c5d99c",\r
+        "id": "35234e07.f4ce22",\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
+        "x": 2014.5,\r
+        "y": 994.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "251983ac.1c994c"\r
+                "dcda07af.655078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "896e220.db3996",\r
+        "id": "3e585958.e262c6",\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
+        "x": 2168.5,\r
+        "y": 882.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "251983ac.1c994c",\r
+        "id": "dcda07af.655078",\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
+        "x": 2181.5,\r
+        "y": 992.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ecbd8135.fa342",\r
+        "id": "1b2c47f4.41a498",\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
+        "x": 1715.5,\r
+        "y": 1039.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d0a61851.774d7",\r
+        "id": "c8833e1f.21b83",\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
+        "x": 1526.5,\r
+        "y": 1232.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "7ee5420a.dabadc"\r
+                "48e846a7.aa0238"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "67e5500f.2b88c8",\r
+        "id": "d3120001.a70e1",\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
+        "x": 1533.5,\r
+        "y": 1371.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "dec65b83.66c9b"\r
+                "6f442ba4.a9bd94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7ee5420a.dabadc",\r
+        "id": "48e846a7.aa0238",\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
+        "x": 1681.5,\r
+        "y": 1240.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "11571d88.b80ba2",\r
-                "8e369286.a24f1"\r
+                "e50cb4fe.0872a8",\r
+                "d3d1dcfc.971ef"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "11571d88.b80ba2",\r
+        "id": "e50cb4fe.0872a8",\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
+        "x": 1877.5,\r
+        "y": 1155.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8e369286.a24f1",\r
+        "id": "d3d1dcfc.971ef",\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
+        "x": 1858.5,\r
+        "y": 1280.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "bc9b1c9e.2d7528",\r
-                "6e8a106a.b8a098"\r
+                "c12b59f0.2b2a08",\r
+                "1e2be21a.84b09e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bc9b1c9e.2d7528",\r
+        "id": "c12b59f0.2b2a08",\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
+        "x": 2020.5,\r
+        "y": 1205.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "88261b09.8da33"\r
+                "8a03b0aa.7cc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6e8a106a.b8a098",\r
+        "id": "1e2be21a.84b09e",\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
+        "x": 2026.5,\r
+        "y": 1327.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "e617e321.5b485"\r
+                "374b4547.8f703a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "88261b09.8da33",\r
+        "id": "8a03b0aa.7cc6",\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
+        "x": 2175.5,\r
+        "y": 1208.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e617e321.5b485",\r
+        "id": "374b4547.8f703a",\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
+        "x": 2188.5,\r
+        "y": 1330.1166687011719,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dec65b83.66c9b",\r
+        "id": "6f442ba4.a9bd94",\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
+        "x": 1734.5,\r
+        "y": 1371.1166687011719,\r
+        "z": "fd6341d7.d80b3",\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
+        "id": "757c5587.8c047c",\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
+        "x": 2290.35009765625,\r
+        "y": 648.9666442871094,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "840d7865.dda6b",\r
+        "id": "2b88b50f.6d1f2a",\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
+        "x": 345.70001220703125,\r
+        "y": 1511.7665710449219,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "35bc7c0e.531f0c",\r
-                "647592de.7dc3ec"\r
+                "67345bfe.f921b4",\r
+                "e5284e9a.754bb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "35bc7c0e.531f0c",\r
+        "id": "67345bfe.f921b4",\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
+        "x": 581.9000549316406,\r
+        "y": 1414.5166320800781,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "362cac69.39ad1c"\r
+                "ae809859.8b1778"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "647592de.7dc3ec",\r
+        "id": "e5284e9a.754bb",\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
+        "x": 572.9000549316406,\r
+        "y": 1587.5165710449219,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "96d3d87a.161f98"\r
+                "7df23ffd.b4b17"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "362cac69.39ad1c",\r
+        "id": "ae809859.8b1778",\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
+        "x": 723.9000244140625,\r
+        "y": 1418.5166320800781,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "827658b9.c24fd"\r
+                "c1901914.b04438"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "827658b9.c24fd",\r
+        "id": "c1901914.b04438",\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
+        "x": 866.25,\r
+        "y": 1423.7165832519531,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "30018cf9.344a24",\r
-                "7de52130.2c5fc"\r
+                "d5045cc6.1de7a",\r
+                "2beb7d55.e9c492"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7b9ef6.7932f9",\r
+        "id": "3b5e2ea9.61d282",\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
+        "x": 1201.25,\r
+        "y": 1365.9166564941406,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "2fd5efbb.db2cd8",\r
-                "a5309500.d76bc"\r
+                "e398c832.c96cf8",\r
+                "5465b919.f201f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2fd5efbb.db2cd8",\r
+        "id": "e398c832.c96cf8",\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
+        "x": 1365.25,\r
+        "y": 1362.9167785644531,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a5309500.d76bc",\r
+        "id": "5465b919.f201f8",\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
+        "x": 1407.25,\r
+        "y": 1546.9167785644531,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "30018cf9.344a24",\r
+        "id": "d5045cc6.1de7a",\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
+        "x": 1039.699951171875,\r
+        "y": 1373.3666076660156,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "f7b9ef6.7932f9"\r
+                "3b5e2ea9.61d282"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7de52130.2c5fc",\r
+        "id": "2beb7d55.e9c492",\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
+        "x": 1016.699951171875,\r
+        "y": 1525.3666076660156,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "6461eb1d.8fedb4"\r
+                "887f6ab3.6fe378"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d7f1c2ce.8da74",\r
+        "id": "efea6422.1a8b28",\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
+        "x": 841.25,\r
+        "y": 1594.7165222167969,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "d0c11e44.eff1b8",\r
-                "ebfe8068.c9971"\r
+                "cad7c61d.e2a2d8",\r
+                "4a80a00e.4cc7a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d0c11e44.eff1b8",\r
+        "id": "cad7c61d.e2a2d8",\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
+        "x": 999.25,\r
+        "y": 1603.7165222167969,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "505e7a53.be6c6c"\r
+                "bb726b3c.e444e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "505e7a53.be6c6c",\r
+        "id": "bb726b3c.e444e8",\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
+        "x": 1139.25,\r
+        "y": 1610.7165222167969,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "2406e71c.d43e8",\r
-                "37282d8f.acde4a"\r
+                "f739490d.428058",\r
+                "b63b3bcb.e95608",\r
+                "fe0c4836.3d8508",\r
+                "58672708.482528",\r
+                "64dca83a.79a788",\r
+                "d26a3044.53ce7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2406e71c.d43e8",\r
+        "id": "f739490d.428058",\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
+        "x": 1303.25,\r
+        "y": 1610.7165222167969,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ebfe8068.c9971",\r
+        "id": "4a80a00e.4cc7a",\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
+        "x": 949.7500152587891,\r
+        "y": 1965.7165794372559,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "383c08d1.28a08"\r
+                "fa9da88e.4da0d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "383c08d1.28a08",\r
+        "id": "fa9da88e.4da0d8",\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
+        "x": 1098.750015258789,\r
+        "y": 1963.7165794372559,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "495cad00.8d5f24"\r
+                "a9697233.3edb9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "495cad00.8d5f24",\r
+        "id": "a9697233.3edb9",\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
+        "x": 1276.2500228881836,\r
+        "y": 1964.2165832519531,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "37282d8f.acde4a",\r
+        "id": "b63b3bcb.e95608",\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
+        "x": 1271.2500228881836,\r
+        "y": 1889.2165803909302,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "70ec6ec4.5ccf08",\r
+        "id": "35501454.cf543c",\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
+        "x": 1195,\r
+        "y": 1537.5165100097656,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "96d3d87a.161f98",\r
+        "id": "7df23ffd.b4b17",\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
+        "x": 719.9000244140625,\r
+        "y": 1588.5165710449219,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "d7f1c2ce.8da74"\r
+                "efea6422.1a8b28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb442d76.8c0b1",\r
+        "id": "54b2f238.cd48bc",\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
+        "x": 1361.1666259765625,\r
+        "y": 745.7832946777344,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "84c6499.61865b8"\r
+                "ba13f726.ec48a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "84c6499.61865b8",\r
+        "id": "ba13f726.ec48a8",\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
+        "x": 1607.1666259765625,\r
+        "y": 749.7832946777344,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "4427d502.6c96cc"\r
+                "7f178723.eed2f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4427d502.6c96cc",\r
+        "id": "7f178723.eed2f8",\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
+        "x": 1775.1666259765625,\r
+        "y": 751.7832946777344,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e8836a64.f81ae",\r
+        "id": "71435f69.1d588",\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
+        "x": 1382.1666259765625,\r
+        "y": 821.7832946777344,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4d169812.58b88",\r
+        "id": "a41e1354.f17a4",\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
+        "x": 1308.1666259765625,\r
+        "y": 1121.7834167480469,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "e0ea4817.5936a"\r
+                "20c8cbec.0b11d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e0ea4817.5936a",\r
+        "id": "20c8cbec.0b11d4",\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
+        "x": 1553.1666259765625,\r
+        "y": 1125.7834167480469,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "9748df16.f21cf8"\r
+                "70d195e8.9d4ccc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9748df16.f21cf8",\r
+        "id": "70d195e8.9d4ccc",\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
+        "x": 1702.1666259765625,\r
+        "y": 1129.7834167480469,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f4e881d.558318",\r
+        "id": "402c6221.29fbfc",\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
+        "x": 1311.1666259765625,\r
+        "y": 1183.7834167480469,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9e23ba6e.b8b718",\r
+        "id": "912f5144.144e7",\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
+        "x": 1402.1666717529297,\r
+        "y": 1450.7833404541016,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6461eb1d.8fedb4",\r
+        "id": "887f6ab3.6fe378",\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
+        "x": 1113.8333740234375,\r
+        "y": 1478.4498596191406,\r
+        "z": "fd6341d7.d80b3",\r
          "wires": [\r
              [\r
-                "70ec6ec4.5ccf08"\r
+                "35501454.cf543c"\r
              ]\r
          ]\r
+    },\r
+    {\r
+        "id": "fe0c4836.3d8508",\r
+        "type": "get-resource",\r
+        "name": "Get service from AAI",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\n key='customer.global-customer-id = $output.global-customer-id AND\n     service-subscription.service-type = $output.service-type AND\n     service-instance.service-instance-id = $delete-acc-svc-id' \npfx='acc-serv-dl'      local-only='false'>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1350.0000190734863,\r
+        "y": 1747.5000267028809,\r
+        "z": "fd6341d7.d80b3",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b127a64f.fc83e8",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1074.9999999999995,\r
+        "y": 1872.4999999999993,\r
+        "z": "fd6341d7.d80b3",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d26a3044.53ce7",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='link-name' value='`$acc-serv-dl.relationship-list.relationship[0].relationship-data[0].relationship-value`' />\n",\r
+        "comments": "",\r
+        "x": 1297.5000190734863,\r
+        "y": 1805.0000267028809,\r
+        "z": "fd6341d7.d80b3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "58672708.482528",\r
+        "type": "update",\r
+        "name": "update logical-link-status AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \nforce='true'\nresource='logical-link'\n     key='logical-link.link-name = $link-name '\n      local-only='false'>\n<parameter name='operational-status' value='available' />\n\n\n\n\n\n\n\n\n\n    \n    \n    \n    \n    \n    \n    \n    \n   \n    \n    \n    \n\n \n \n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1337.5,\r
+        "y": 1852.5,\r
+        "z": "fd6341d7.d80b3",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1b12f198.60face",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='domain-req' value='`$detail-db.domain-requests`' />\n<parameter name='delete-acc-svc-id' value='`$detail-db.service-instance-id`' />\n\n\n\n\n\n\n\n\n\n\n\n",\r
+        "comments": "",\r
+        "x": 1050.000015258789,\r
+        "y": 132.50000190734863,\r
+        "z": "fd6341d7.d80b3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "64dca83a.79a788",\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=\"`'domain rquest_' + $domain-requests`\"/>\n<parameter name=\"field2\" value=\"`'Access rquest_' + $as-request-id`\"/>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1525.0000228881836,\r
+        "y": 1630.0000247955322,\r
+        "z": "fd6341d7.d80b3",\r
+        "wires": [\r
+            []\r
+        ]\r
      }\r
  ]
 \ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json b/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json

index 15b2e9c..1432b74 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json
@@ -1,20 +1,20 @@
  [\r
      {\r
-        "id": "cb10d6c4.981698",\r
+        "id": "e3b61acf.d53178",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 170,\r
-        "y": 107,\r
-        "z": "477ddea1.f7699",\r
+        "x": 185,\r
+        "y": 832.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "63ae4640.f4c188"\r
+                "4e2007b8.e16458"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63ae4640.f4c188",\r
+        "id": "4e2007b8.e16458",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -22,1681 +22,1696 @@
          "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": 183,\r
-        "y": 167,\r
-        "z": "477ddea1.f7699",\r
+        "x": 198,\r
+        "y": 892.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "ccc0be9.d18f84"\r
+                "19b71169.28fe6f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ccc0be9.d18f84",\r
+        "id": "19b71169.28fe6f",\r
          "type": "method",\r
          "name": "method service-create-tapi",\r
          "xml": "<method rpc='service-create-tapi' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 203,\r
-        "y": 247,\r
-        "z": "477ddea1.f7699",\r
+        "x": 218,\r
+        "y": 972.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "9e51a7e2.c96a48"\r
+                "67e00a4.cbfd6f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e51a7e2.c96a48",\r
+        "id": "67e00a4.cbfd6f4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 412.5,\r
-        "y": 252,\r
-        "z": "477ddea1.f7699",\r
+        "x": 427.5,\r
+        "y": 977.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "3ceef95d.a94976",\r
-                "e43daa8d.210d18",\r
-                "30c153d0.f4174c",\r
-                "a085d0a9.db099",\r
-                "7cbb8085.aa09",\r
-                "b68ee0d5.ab2f1",\r
-                "ce711353.77418",\r
-                "86957885.24ae98",\r
-                "52992436.be902c",\r
-                "ff60ecd.026f51",\r
-                "ceb8b8b2.ae8198"\r
+                "6e2532e4.6a345c",\r
+                "4e62cda.756f234",\r
+                "7a87fe21.0f22f",\r
+                "e26a9e37.3f00f",\r
+                "7ff1b0d3.ad7b6",\r
+                "e17358f9.eefe38",\r
+                "cc062ea3.b0027",\r
+                "3f3fa66c.f6173a",\r
+                "b3c6d371.40d14",\r
+                "a68ab8ee.a8c128",\r
+                "583afef0.9e3f1",\r
+                "53f4928e.efb2dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ceef95d.a94976",\r
+        "id": "6e2532e4.6a345c",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside optical service create tapi\"/>\n\n\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 412,\r
-        "y": 50,\r
-        "z": "477ddea1.f7699",\r
+        "x": 427,\r
+        "y": 775.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e43daa8d.210d18",\r
+        "id": "4e62cda.756f234",\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'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 610.9999389648438,\r
-        "y": 101.99998474121094,\r
-        "z": "477ddea1.f7699",\r
+        "x": 625.9999389648438,\r
+        "y": 827.4999847412109,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "c6f3bb2.1ae1f48"\r
+                "69d89830.091358"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30c153d0.f4174c",\r
+        "id": "7a87fe21.0f22f",\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'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 631.9999389648438,\r
-        "y": 166.99996948242188,\r
-        "z": "477ddea1.f7699",\r
+        "x": 646.9999389648438,\r
+        "y": 892.4999694824219,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "5ed218c5.9a0bc8"\r
+                "4acab2b3.e0ef5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c6f3bb2.1ae1f48",\r
+        "id": "69d89830.091358",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 770.9999389648438,\r
-        "y": 103.99998474121094,\r
-        "z": "477ddea1.f7699",\r
+        "x": 785.9999389648438,\r
+        "y": 829.4999847412109,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "6a954070.e5ff5"\r
+                "df7c45e.be06eb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5ed218c5.9a0bc8",\r
+        "id": "4acab2b3.e0ef5c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 780.9999389648438,\r
-        "y": 164.99996948242188,\r
-        "z": "477ddea1.f7699",\r
+        "x": 795.9999389648438,\r
+        "y": 890.4999694824219,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "9ead2d56.36328"\r
+                "f40d9366.6d7e9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a954070.e5ff5",\r
+        "id": "df7c45e.be06eb8",\r
          "type": "set",\r
          "name": "set",\r
-        "xml": "<set>\n<parameter name='aend-node-uuid' value='`$db-aend.pnf-name`' />\n<parameter name='aend-pnf-name' value='`$db-aend.pnf-id`' />\n<parameter name='aend-cep-list' value='`$db-aend.connection-point`' />\n<parameter name='aend-nep' value='`$db-aend.interface-name`' />\n<parameter name='aend-rate' value='`$db-aend.rate`' />\n",\r
+        "xml": "<set>\n<parameter name='aend-node-uuid' value='`$db-aend.pnf-name`' />\n<parameter name='aend-pnf-name' value='`$db-aend.pnf-id`' />\n<parameter name='aend-cep-list' value='`$db-aend.connection-point`' />\n<parameter name='aend-nep' value='`$db-aend.interface-name`' />\n<parameter name='aend-rate' value='`$db-aend.rate`' />\n<parameter name='esr-id' value='`$db-aend.controller-id`' />\n",\r
          "comments": "",\r
-        "x": 936.9999389648438,\r
-        "y": 104.99996948242188,\r
-        "z": "477ddea1.f7699",\r
+        "x": 951.9999389648438,\r
+        "y": 830.4999694824219,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9ead2d56.36328",\r
+        "id": "f40d9366.6d7e9",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-node-uuid' value='`$db-zend.pnf-name`' />\n<parameter name='zend-pnf-name' value='`$db-zend.pnf-id`' />\n<parameter name='zend-cep-list' value='`$db-zend.connection-point`' />\n<parameter name='zend-nep' value='`$db-zend.interface-name`' />\n<parameter name='zend-rate' value='`$db-zend.rate`' />\n",\r
          "comments": "",\r
-        "x": 930,\r
-        "y": 164,\r
-        "z": "477ddea1.f7699",\r
+        "x": 945,\r
+        "y": 889.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a085d0a9.db099",\r
+        "id": "e26a9e37.3f00f",\r
          "type": "execute",\r
          "name": "execute: read properties",\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": 600,\r
-        "y": 56,\r
-        "z": "477ddea1.f7699",\r
+        "x": 615,\r
+        "y": 781.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7cbb8085.aa09",\r
+        "id": "7ff1b0d3.ad7b6",\r
          "type": "get-resource",\r
          "name": "find if aend is uni or nni or enni",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $aend-node-uuid AND\n     p-interface.interface-name = $aend-nep\"\npfx='aend'      local-only='false'>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 696,\r
-        "y": 248,\r
-        "z": "477ddea1.f7699",\r
+        "x": 711,\r
+        "y": 973.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b68ee0d5.ab2f1",\r
+        "id": "e17358f9.eefe38",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$aend.network-interface-type`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 611,\r
-        "y": 344,\r
-        "z": "477ddea1.f7699",\r
+        "x": 626,\r
+        "y": 1069.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "c6743c18.bbfeb",\r
-                "d6efe253.7e8f"\r
+                "e5d8d6f6.cf0a68",\r
+                "79710b28.d915f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c6743c18.bbfeb",\r
+        "id": "e5d8d6f6.cf0a68",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='UNI'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 736,\r
-        "y": 293,\r
-        "z": "477ddea1.f7699",\r
+        "x": 751,\r
+        "y": 1018.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "cdb5c5b5.9048e8"\r
+                "cc49f496.ddb3f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "131024c8.c2705b",\r
+        "id": "95d30723.5b4378",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='aend-cep' value='`$aend-cep-list`' />\n<parameter name='aend-new' value='' />\n<parameter name='aend-new-rate' value='0' />\n",\r
          "comments": "",\r
-        "x": 1111,\r
-        "y": 142,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1126,\r
+        "y": 867.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "40b15a3.dac47a4",\r
+        "id": "12ce4ec6.788011",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$aend-cep-list`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1143,\r
-        "y": 384,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1158,\r
+        "y": 1109.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "cdb5c5b5.9048e8",\r
+        "id": "cc49f496.ddb3f8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 874,\r
-        "y": 292,\r
-        "z": "477ddea1.f7699",\r
+        "x": 889,\r
+        "y": 1017.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "131024c8.c2705b",\r
-                "b290b92c.1e7b58",\r
-                "b86f369c.e3ed78"\r
+                "95d30723.5b4378",\r
+                "d4d34a7e.414498",\r
+                "76ba49d4.9adfb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2686a37.db5528",\r
+        "id": "981e7a8d.9b40d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 894,\r
-        "y": 407,\r
-        "z": "477ddea1.f7699",\r
+        "x": 909,\r
+        "y": 1132.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "40b15a3.dac47a4",\r
-                "7a067107.2ec2",\r
-                "ab1ab8d.88c2948",\r
-                "75a9a4ed.ec8d2c"\r
+                "12ce4ec6.788011",\r
+                "db706c7f.f5413",\r
+                "c523271d.c23728",\r
+                "57dafe06.e772c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4fdc9aa0.b29954",\r
+        "id": "94c3ff81.93f32",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.cep.details.url + $param-prefix[$idx]`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"aend-cep-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1229.111083984375,\r
-        "y": 460.22222900390625,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1244.111083984375,\r
+        "y": 1185.7222290039062,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "c21f9ebf.94222",\r
-                "c3ad189d.190788"\r
+                "b6ab9975.3588c8",\r
+                "1b8ebe74.b20472"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c21f9ebf.94222",\r
+        "id": "b6ab9975.3588c8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1342.77779006958,\r
-        "y": 422.0000057220459,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1357.77779006958,\r
+        "y": 1147.500005722046,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "f0cb2de3.028b2"\r
+                "3ab3912f.f30dde"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3ad189d.190788",\r
+        "id": "1b8ebe74.b20472",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1352.2221794128418,\r
-        "y": 491.7777805328369,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1367.2221794128418,\r
+        "y": 1217.277780532837,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "27f9e6a9.a5da2a"\r
+                "63b9c2ce.613ddc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f0cb2de3.028b2",\r
+        "id": "3ab3912f.f30dde",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Failed to get Aend cep details\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1500,\r
-        "y": 422,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1515,\r
+        "y": 1147.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9994476.f537bb8",\r
+        "id": "de2bd7fe.4fa488",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Sucessfully retrieved aend cep\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1639,\r
-        "y": 444,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1654,\r
+        "y": 1169.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7a067107.2ec2",\r
+        "id": "db706c7f.f5413",\r
          "type": "for",\r
          "name": "for",\r
          "xml": "<for index='idx' start='0' end='`$param-prefix_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1086,\r
-        "y": 433,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1101,\r
+        "y": 1158.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "6d62527a.1e40bc"\r
+                "589b4306.69c66c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "27f9e6a9.a5da2a",\r
+        "id": "63b9c2ce.613ddc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1490,\r
-        "y": 494,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1505,\r
+        "y": 1219.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "9994476.f537bb8",\r
-                "5de58fdb.3dc18"\r
+                "de2bd7fe.4fa488",\r
+                "b9f0b7ab.7d0788"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8b835dad.6e468",\r
+        "id": "b2429a15.648f18",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 2096.5552864074707,\r
-        "y": 543.1110572814941,\r
-        "z": "477ddea1.f7699",\r
+        "x": 2111.5552864074707,\r
+        "y": 1268.6110572814941,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f03d8eb8.9e89b",\r
+        "id": "c901f232.2c828",\r
          "type": "set",\r
          "name": "set aend-local-id",\r
          "xml": "<set>\n<parameter name='aend-local-id' value=\"`$aend-local-id + '/OTN/' + $aend-pnf-name + '/' + $aend-cep-response.sip[0].name[2].value + ':' + $aend-cep-response.sip[0].name[1].value`\" />\n<parameter name='aend-cep' value='`$param-prefix[$idx]`'/>\n\n\n",\r
          "comments": "",\r
-        "x": 2124.3332290649414,\r
-        "y": 472.1111087799072,\r
-        "z": "477ddea1.f7699",\r
+        "x": 2139.3332290649414,\r
+        "y": 1197.6111087799072,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a19a25b4.a7fc58",\r
+        "id": "137becd1.5df6d3",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1918,\r
-        "y": 509,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1933,\r
+        "y": 1234.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "f03d8eb8.9e89b",\r
-                "8b835dad.6e468"\r
+                "c901f232.2c828",\r
+                "b2429a15.648f18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6d62527a.1e40bc",\r
+        "id": "589b4306.69c66c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1095,\r
-        "y": 494,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1110,\r
+        "y": 1219.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "4fdc9aa0.b29954"\r
+                "94c3ff81.93f32"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab1ab8d.88c2948",\r
+        "id": "c523271d.c23728",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='aend-new' value='' />\n<parameter name='aend-local-id' value='' />\n\n",\r
          "comments": "",\r
-        "x": 1062,\r
-        "y": 337,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1077,\r
+        "y": 1062.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ce711353.77418",\r
+        "id": "cc062ea3.b0027",\r
          "type": "get-resource",\r
          "name": "find if zend is uni or nni or enni",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $zend-node-uuid AND\n     p-interface.interface-name = $zend-nep\"\npfx='zend'      local-only='false'>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 715,\r
-        "y": 790,\r
-        "z": "477ddea1.f7699",\r
+        "x": 730,\r
+        "y": 1515.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "86957885.24ae98",\r
+        "id": "3f3fa66c.f6173a",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$zend.network-interface-type`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 484,\r
-        "y": 1139,\r
-        "z": "477ddea1.f7699",\r
+        "x": 499,\r
+        "y": 1864.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "2dd9facb.4d9096",\r
-                "9f7e7624.f487d8"\r
+                "26907dac.2c8962",\r
+                "6b2ab5da.9e65dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2dd9facb.4d9096",\r
+        "id": "26907dac.2c8962",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='UNI'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 610,\r
-        "y": 1059,\r
-        "z": "477ddea1.f7699",\r
+        "x": 625,\r
+        "y": 1784.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "70ab075.7054cf8"\r
+                "b896134c.4d7c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cf44710.442d88",\r
+        "id": "a887b962.a85538",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-cep' value='`$zend-cep-list`' />\n<parameter name='zend-new' value='' />\n<parameter name='zend-new-rate' value='0' />\n",\r
          "comments": "",\r
-        "x": 1031,\r
-        "y": 780,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1046,\r
+        "y": 1505.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "11c54622.c031aa",\r
+        "id": "b612ac70.544c8",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$zend-cep-list`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 982,\r
-        "y": 1199,\r
-        "z": "477ddea1.f7699",\r
+        "x": 997,\r
+        "y": 1924.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "70ab075.7054cf8",\r
+        "id": "b896134c.4d7c6",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 890,\r
-        "y": 838,\r
-        "z": "477ddea1.f7699",\r
+        "x": 905,\r
+        "y": 1563.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "2cf44710.442d88",\r
-                "cee2aa19.600e38",\r
-                "7c2ba1f9.81021"\r
+                "a887b962.a85538",\r
+                "3d1b5ef9.72faf2",\r
+                "ae0f4e41.69868"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a49ef364.fd7db",\r
+        "id": "4c1c4885.e5c558",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 772,\r
-        "y": 1256,\r
-        "z": "477ddea1.f7699",\r
+        "x": 787,\r
+        "y": 1981.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "11c54622.c031aa",\r
-                "5bdbd1f1.43aa3",\r
-                "72f7503a.affea",\r
-                "54bcccf0.aad274"\r
+                "b612ac70.544c8",\r
+                "a14476ab.fb69e8",\r
+                "e1a333de.1775c",\r
+                "2e50f406.0834dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5bdbd1f1.43aa3",\r
+        "id": "a14476ab.fb69e8",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-new' value='' />\n<parameter name='zend-local-id' value='' />\n",\r
          "comments": "",\r
-        "x": 983,\r
-        "y": 1147,\r
-        "z": "477ddea1.f7699",\r
+        "x": 998,\r
+        "y": 1872.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6efe253.7e8f",\r
+        "id": "79710b28.d915f4",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 748,\r
-        "y": 409,\r
-        "z": "477ddea1.f7699",\r
+        "x": 763,\r
+        "y": 1134.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "d2686a37.db5528"\r
+                "981e7a8d.9b40d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9f7e7624.f487d8",\r
+        "id": "6b2ab5da.9e65dc",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 606,\r
-        "y": 1254,\r
-        "z": "477ddea1.f7699",\r
+        "x": 621,\r
+        "y": 1979.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "a49ef364.fd7db"\r
+                "4c1c4885.e5c558"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "52992436.be902c",\r
+        "id": "b3c6d371.40d14",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/optical-service-create-tapi.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$controller-ip + '/cxf/tapi/v2/connectivities/tapi-services'`\"/>\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"POST\"/>\n<parameter name=\"responsePrefix\" value=\"tapi-service-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 223.00006103515625,\r
-        "y": 1580,\r
-        "z": "477ddea1.f7699",\r
+        "x": 238.00006103515625,\r
+        "y": 2305.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "807d3a9b.b39f98",\r
-                "4ca35ad.57ba6a4"\r
+                "b68268dd.2641e8",\r
+                "704b92ea.ae0bfc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "807d3a9b.b39f98",\r
+        "id": "b68268dd.2641e8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 364.00006103515625,\r
-        "y": 1528,\r
-        "z": "477ddea1.f7699",\r
+        "x": 379.00006103515625,\r
+        "y": 2253.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "c9f09c9a.c5b34"\r
+                "7e73b171.f5dcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4ca35ad.57ba6a4",\r
+        "id": "704b92ea.ae0bfc",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 378.00006103515625,\r
-        "y": 1642,\r
-        "z": "477ddea1.f7699",\r
+        "x": 393.00006103515625,\r
+        "y": 2367.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "2378e9dd.60d396"\r
+                "b298b779.8e8f08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c9f09c9a.c5b34",\r
+        "id": "7e73b171.f5dcc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 529.0000610351562,\r
-        "y": 1527,\r
-        "z": "477ddea1.f7699",\r
+        "x": 544.0000610351562,\r
+        "y": 2252.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "f18f6836.1d4108"\r
+                "58e61928.c20cd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2378e9dd.60d396",\r
+        "id": "b298b779.8e8f08",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 554.0000610351562,\r
-        "y": 1642,\r
-        "z": "477ddea1.f7699",\r
+        "x": 569.0000610351562,\r
+        "y": 2367.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "70e50a50.c3ff54",\r
-                "579d26d3.591e88",\r
-                "750b8813.7e3ec8",\r
-                "438684f8.c804ec",\r
-                "b5a7e704.c626d8",\r
-                "59ec667.1ec9998"\r
+                "95903f39.6729d",\r
+                "7e480b79.0c9e94",\r
+                "e447101b.3a99d",\r
+                "ead868a6.12c838",\r
+                "766aa235.2a8e3c",\r
+                "a3841f37.73a11"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f18f6836.1d4108",\r
+        "id": "58e61928.c20cd8",\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=\"`'Service creation failed for'+ ':' + $optical-service-create-input.payload.service-name`\" />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 721.0000610351562,\r
-        "y": 1528,\r
-        "z": "477ddea1.f7699",\r
+        "x": 736.0000610351562,\r
+        "y": 2253.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "98706095.76a01",\r
+        "id": "894b6cc6.e224",\r
          "type": "call",\r
          "name": "call",\r
          "xml": "<call module='optical-service' rpc='success-aai-update-tapi' mode='sync' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1267,\r
-        "y": 2013,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1282,\r
+        "y": 2738.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ff60ecd.026f51",\r
+        "id": "a68ab8ee.a8c128",\r
          "type": "set",\r
          "name": "set",\r
-        "xml": "<set>\n<parameter name='service-name' value=\"`$optical-service-create-input.payload.service-name`\" />\n<parameter name='svc-action' value=\"CREATE\" />\n",\r
+        "xml": "<set>\n<parameter name='service-name' value=\"`$optical-service-create-input.payload.service-name +'_' + $new-esr[2]`\"/>\n<parameter name='svc-action' value=\"CREATE\" />\n",\r
          "comments": "",\r
-        "x": 323,\r
-        "y": 1382,\r
-        "z": "477ddea1.f7699",\r
+        "x": 338,\r
+        "y": 2107.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ceb8b8b2.ae8198",\r
+        "id": "583afef0.9e3f1",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A end local-id\"/>\n<parameter name=\"field2\" value=\"`$aend-local-id`\"/>\n<parameter name=\"field3\" value=\"Z end local-id\"/>\n<parameter name=\"field4\" value=\"`$zend-local-id`\"/>\n<parameter name=\"field5\" value=\"Service name\"/>\n<parameter name=\"field6\" value=\"`$service-name`\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 287,\r
-        "y": 1465,\r
-        "z": "477ddea1.f7699",\r
+        "x": 302,\r
+        "y": 2190.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a4f3d4cb.d51068",\r
+        "id": "3fc62d83.ac6362",\r
          "type": "for",\r
          "name": "for",\r
          "xml": "<for index='idl' start='0' end='`$param-prefix1_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1254,\r
-        "y": 1501,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1269,\r
+        "y": 2226.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "29ec1f.599403e2"\r
+                "b7378018.3878b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "abf6e183.cf7b",\r
+        "id": "83062bca.729078",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new + $param-prefix1[$idl]`\" />\n",\r
          "comments": "",\r
-        "x": 1706,\r
-        "y": 1432,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1721,\r
+        "y": 2157.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "29ec1f.599403e2",\r
+        "id": "b7378018.3878b",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$idl`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1389,\r
-        "y": 1502,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1404,\r
+        "y": 2227.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "7815f59.b48cf0c",\r
-                "3a3a667b.eb736a",\r
-                "31a716b1.aadeaa"\r
+                "5946864.461ea78",\r
+                "ef8534ba.5d85f8",\r
+                "b5ab7497.df0258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7815f59.b48cf0c",\r
+        "id": "5946864.461ea78",\r
          "type": "outcome",\r
          "name": "outcome",\r
          "xml": "<outcome value='`$param-prefix1_length - 1`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1569,\r
-        "y": 1434,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1584,\r
+        "y": 2159.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "abf6e183.cf7b"\r
+                "83062bca.729078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3a3a667b.eb736a",\r
+        "id": "ef8534ba.5d85f8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1576,\r
-        "y": 1509,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1591,\r
+        "y": 2234.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "53f306dd.3c4f48"\r
+                "11e469f8.d89bc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53f306dd.3c4f48",\r
+        "id": "11e469f8.d89bc6",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new + $param-prefix1[$idl] + ','`\" />\n",\r
          "comments": "",\r
-        "x": 1732,\r
-        "y": 1511,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1747,\r
+        "y": 2236.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "31a716b1.aadeaa",\r
+        "id": "b5ab7497.df0258",\r
          "type": "outcome",\r
          "name": "outcome",\r
          "xml": "<outcome value='`$idk`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1560,\r
-        "y": 1569,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1575,\r
+        "y": 2294.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "f6272db.5d44ad"\r
+                "77a66da8.5a9f24"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f6272db.5d44ad",\r
+        "id": "77a66da8.5a9f24",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-new' value='`$zend-new`' />\n",\r
          "comments": "",\r
-        "x": 1737,\r
-        "y": 1567,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1752,\r
+        "y": 2292.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "579d26d3.591e88",\r
+        "id": "7e480b79.0c9e94",\r
          "type": "save",\r
          "name": "update pinterface cep DB Zend",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'\nforce='true' pfx='save-result'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 853.2222900390625,\r
-        "y": 1708.666748046875,\r
-        "z": "477ddea1.f7699",\r
+        "x": 868.2222900390625,\r
+        "y": 2434.166748046875,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "70e50a50.c3ff54",\r
+        "id": "95903f39.6729d",\r
          "type": "save",\r
          "name": "update pinterface cep DB Aend",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $aend-new WHERE interface_name = $aend-nep'\nforce='true' pfx='save-result'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 871,\r
-        "y": 1642,\r
-        "z": "477ddea1.f7699",\r
+        "x": 886,\r
+        "y": 2367.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b290b92c.1e7b58",\r
+        "id": "d4d34a7e.414498",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Aend uni\"/>\n\n\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1114,\r
-        "y": 206,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1129,\r
+        "y": 931.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "cee2aa19.600e38",\r
+        "id": "3d1b5ef9.72faf2",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Zend uni\"/>\n\n\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1050,\r
-        "y": 827,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1065,\r
+        "y": 1552.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "750b8813.7e3ec8",\r
+        "id": "e447101b.3a99d",\r
          "type": "save",\r
          "name": "save service db",\r
          "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO REQUEST_DETAILS (request_id, controller_id, status, service_rate, service_instance_id, service_type, global_customer_id, notification_url) VALUES ( $optical-service-create-input.request-id , $controller-id , 'CREATED' , $optical-service-create-input.payload.service-rate ,  $optical-service-create-input.service-id , $optical-service-create-input.service-type , $optical-service-create-input.global-customer-id , null );\"> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 873,\r
-        "y": 1584,\r
-        "z": "477ddea1.f7699",\r
+        "x": 888,\r
+        "y": 2309.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "20d16b37.4f5834",\r
+        "id": "d97ea600.6b8a38",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1789,\r
-        "y": 477,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1804,\r
+        "y": 1202.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "a19a25b4.a7fc58"\r
+                "137becd1.5df6d3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c356252d.5683a8",\r
+        "id": "3ec46408.bcd4fc",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1818.222116470337,\r
-        "y": 604.3333568572998,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1833.222116470337,\r
+        "y": 1329.8333568572998,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "741c9f44.5e3af"\r
+                "86e280c3.297fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "741c9f44.5e3af",\r
+        "id": "86e280c3.297fa",\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='No service interface points could be found for A end ' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 1962.6666259765625,\r
-        "y": 604.3333129882812,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1977.6666259765625,\r
+        "y": 1329.8333129882812,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "438684f8.c804ec",\r
+        "id": "ead868a6.12c838",\r
          "type": "save",\r
          "name": "save service aai",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $optical-service-create-input.service-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $aend-node-uuid + '/p-interfaces/p-interface/' + $optical-service-create-input.payload.service-aend.port-id `\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$aend-node-uuid`\" /> \n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $zend-node-uuid + '/p-interfaces/p-interface/' + $optical-service-create-input.payload.service-zend.port-id `\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$zend-node-uuid`\" />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 761.9999389648438,\r
-        "y": 1829.111083984375,\r
-        "z": "477ddea1.f7699",\r
+        "x": 776.9999389648438,\r
+        "y": 2554.611083984375,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b5a7e704.c626d8",\r
+        "id": "766aa235.2a8e3c",\r
          "type": "save",\r
          "name": "save",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'  \n     key='customer.global-customer-id = $optical-service-create-input.global-customer-id AND\n     service-subscription.service-type = $optical-service-create-input.service-type AND\n     service-instance.service-instance-id = $optical-service-create-input.service-id' >\n<parameter name='service-instance-id' value='`$optical-service-create-input.service-id`' />\n<parameter name='service-instance-name' value='`$optical-service-create-input.payload.service-name`' />\n<parameter name='service-type' value='Domain-Service' />\n<parameter name='orchestration-status' value='CREATED' />\n<parameter name='service-rate' value='`$optical-service-create-input.payload.service-rate`' />\n<parameter name='service-layer' value='ODU' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 754.9999389648438,\r
-        "y": 1769,\r
-        "z": "477ddea1.f7699",\r
+        "x": 769.9999389648438,\r
+        "y": 2494.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b86f369c.e3ed78",\r
+        "id": "76ba49d4.9adfb8",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.cep.details.url + $aend-cep`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"aend-cep-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1112,\r
-        "y": 267,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1127,\r
+        "y": 992.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "112c1c.b3e563e4",\r
-                "aec0582d.cd7cc8"\r
+                "40b3b681.860668",\r
+                "75209286.ddccec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "112c1c.b3e563e4",\r
+        "id": "40b3b681.860668",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1270,\r
-        "y": 227,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1285,\r
+        "y": 952.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "c51550d7.c3d1f"\r
+                "d54f33c1.e2caf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aec0582d.cd7cc8",\r
+        "id": "75209286.ddccec",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1279.4443893432617,\r
-        "y": 296.777774810791,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1294.4443893432617,\r
+        "y": 1022.277774810791,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "4850f247.c34dcc"\r
+                "7c37bdb9.346234"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c51550d7.c3d1f",\r
+        "id": "d54f33c1.e2caf",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Failed to get Aend cep details\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1427.22220993042,\r
-        "y": 226.9999942779541,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1442.22220993042,\r
+        "y": 952.4999942779541,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4850f247.c34dcc",\r
+        "id": "7c37bdb9.346234",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1445.22216796875,\r
-        "y": 295,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1460.22216796875,\r
+        "y": 1020.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "d78c4eb5.bbc8d"\r
+                "a5c2da19.ce3ea8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d78c4eb5.bbc8d",\r
+        "id": "a5c2da19.ce3ea8",\r
          "type": "set",\r
          "name": "set aend-local-id",\r
          "xml": "<set>\n<parameter name='aend-local-id' value=\"`'/OTN/' + $aend-pnf-name + '/' + $aend-cep-response.sip[0].name[2].value + ':' + $aend-cep-response.sip[0].name[1].value`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 1639,\r
-        "y": 295,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1654,\r
+        "y": 1020.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "39a4154d.b828aa",\r
+        "id": "983ec083.ff592",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.cep.details.url + $param-prefix1[$idk]`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"zend-cep-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1337,\r
-        "y": 1253,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1352,\r
+        "y": 1978.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "d0d69a7e.2c9698",\r
-                "659dd71a.78bb68"\r
+                "d02f87db.d6d7a8",\r
+                "22c182d6.7f01de"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d0d69a7e.2c9698",\r
+        "id": "d02f87db.d6d7a8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1458,\r
-        "y": 1214,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1473,\r
+        "y": 1939.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "2cf98134.38344e"\r
+                "c252b261.b7497"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "659dd71a.78bb68",\r
+        "id": "22c182d6.7f01de",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1476,\r
-        "y": 1308,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1491,\r
+        "y": 2033.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "ad8cdb39.1a9318"\r
+                "a4023511.b433b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cf98134.38344e",\r
+        "id": "c252b261.b7497",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Failed to get zend cep details\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1606,\r
-        "y": 1211,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1621,\r
+        "y": 1936.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "431f9c15.b4bd64",\r
+        "id": "cd0d0a5b.6f8818",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Sucessfully retrieved zend cep\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1775,\r
-        "y": 1261,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1790,\r
+        "y": 1986.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "72f7503a.affea",\r
+        "id": "e1a333de.1775c",\r
          "type": "for",\r
          "name": "for",\r
          "xml": "<for index='idk' start='0' end='`$param-prefix1_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 983,\r
-        "y": 1254,\r
-        "z": "477ddea1.f7699",\r
+        "x": 998,\r
+        "y": 1979.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "b262046c.5382f8"\r
+                "b7f1e1f4.d9a4d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ad8cdb39.1a9318",\r
+        "id": "a4023511.b433b8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1631,\r
-        "y": 1311,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1646,\r
+        "y": 2036.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "431f9c15.b4bd64",\r
-                "29ec6fee.052a8"\r
+                "cd0d0a5b.6f8818",\r
+                "e9bb3958.4a7f98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "29ec6fee.052a8",\r
+        "id": "e9bb3958.4a7f98",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$zend-cep-response.sip[0].name[2].value == $optical-service-create-input.payload.service-rate`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1785,\r
-        "y": 1325,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1800,\r
+        "y": 2050.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "a5051a40.75b1d8",\r
-                "3532c7e2.141ac8"\r
+                "e42e31a4.60821",\r
+                "97ee1d35.6e5eb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b262046c.5382f8",\r
+        "id": "b7f1e1f4.d9a4d",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1135,\r
-        "y": 1256,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1150,\r
+        "y": 1981.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "39a4154d.b828aa"\r
+                "983ec083.ff592"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "416d05b6.84daac",\r
+        "id": "c52f4a5.23b30b8",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 2173,\r
-        "y": 1336,\r
-        "z": "477ddea1.f7699",\r
+        "x": 2188,\r
+        "y": 2061.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e59b1a2d.4329a8",\r
+        "id": "df4f7ec9.f91d1",\r
          "type": "set",\r
          "name": "set zend-local-id",\r
          "xml": "<set>\n<parameter name='zend-local-id' value=\"`$zend-local-id + '/OTN/' + $zend-pnf-name + '/' + $zend-cep-response.sip[0].name[2].value + ':' + $zend-cep-response.sip[0].name[1].value`\" />\n<parameter name='zend-cep' value='`$param-prefix1[$idk]`'/>\n\n\n\n",\r
          "comments": "",\r
-        "x": 2206,\r
-        "y": 1226,\r
-        "z": "477ddea1.f7699",\r
+        "x": 2221,\r
+        "y": 1951.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "60931989.6a1588",\r
+        "id": "e9430c74.d49c3",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2055,\r
-        "y": 1282,\r
-        "z": "477ddea1.f7699",\r
+        "x": 2070,\r
+        "y": 2007.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "e59b1a2d.4329a8",\r
-                "416d05b6.84daac"\r
+                "df4f7ec9.f91d1",\r
+                "c52f4a5.23b30b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a5051a40.75b1d8",\r
+        "id": "e42e31a4.60821",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1923.9998779296875,\r
-        "y": 1286.6666259765625,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1938.9998779296875,\r
+        "y": 2012.1666259765625,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "60931989.6a1588"\r
+                "e9430c74.d49c3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3532c7e2.141ac8",\r
+        "id": "97ee1d35.6e5eb",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1923.8887939453125,\r
-        "y": 1391.1109619140625,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1938.8887939453125,\r
+        "y": 2116.6109619140625,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "1671dd0d.761f93"\r
+                "bb25bd92.102bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1671dd0d.761f93",\r
+        "id": "bb25bd92.102bc",\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='No service interface points could be found for Z end ' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 2103.22216796875,\r
-        "y": 1394.111083984375,\r
-        "z": "477ddea1.f7699",\r
+        "x": 2118.22216796875,\r
+        "y": 2119.611083984375,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "54bcccf0.aad274",\r
+        "id": "2e50f406.0834dc",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$param-prefix1_length == 1`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 937,\r
-        "y": 1406,\r
-        "z": "477ddea1.f7699",\r
+        "x": 952,\r
+        "y": 2131.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "52610222.06045c",\r
-                "5efd31c6.33b2f"\r
+                "ed15bef0.d465e",\r
+                "ed35c503.0fb518"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "52610222.06045c",\r
+        "id": "ed15bef0.d465e",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1077,\r
-        "y": 1360,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1092,\r
+        "y": 2085.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "ee5535d1.239b88"\r
+                "815e3884.b4c998"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee5535d1.239b88",\r
+        "id": "815e3884.b4c998",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new`\" />\n",\r
          "comments": "",\r
-        "x": 1212,\r
-        "y": 1360,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1227,\r
+        "y": 2085.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5efd31c6.33b2f",\r
+        "id": "ed35c503.0fb518",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1079,\r
-        "y": 1500,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1094,\r
+        "y": 2225.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "a4f3d4cb.d51068"\r
+                "3fc62d83.ac6362"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5de58fdb.3dc18",\r
+        "id": "b9f0b7ab.7d0788",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$aend-cep-response.sip[0].name[2].value == $optical-service-create-input.payload.service-rate`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1648,\r
-        "y": 512,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1663,\r
+        "y": 1237.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "20d16b37.4f5834",\r
-                "c356252d.5683a8"\r
+                "d97ea600.6b8a38",\r
+                "3ec46408.bcd4fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75a9a4ed.ec8d2c",\r
+        "id": "57dafe06.e772c",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$param-prefix_length == 1`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1067,\r
-        "y": 561,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1082,\r
+        "y": 1286.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "331c057.f8ccefa",\r
-                "4b64ca6e.49b0f4"\r
+                "848a90d5.bcd26",\r
+                "40c58163.4afec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "331c057.f8ccefa",\r
+        "id": "848a90d5.bcd26",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1221,\r
-        "y": 562,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1236,\r
+        "y": 1287.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "7e9fbe10.9124"\r
+                "750a8b4d.400d94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7e9fbe10.9124",\r
+        "id": "750a8b4d.400d94",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-new`\" />\n",\r
          "comments": "",\r
-        "x": 1383,\r
-        "y": 562,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1398,\r
+        "y": 1287.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4b64ca6e.49b0f4",\r
+        "id": "40c58163.4afec",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1225,\r
-        "y": 613,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1240,\r
+        "y": 1338.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "6847867.f7a9678"\r
+                "67ad38a5.5ca3b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6847867.f7a9678",\r
+        "id": "67ad38a5.5ca3b8",\r
          "type": "for",\r
          "name": "for",\r
          "xml": "<for index='idy' start='0' end='`$param-prefix_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1349,\r
-        "y": 637,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1364,\r
+        "y": 1362.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "5a0e3964.160d08"\r
+                "71c769ba.e6ed98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ed323941.b82938",\r
+        "id": "cb465dd8.92a9",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-new + $param-prefix[$idy]`\" />\n",\r
          "comments": "",\r
-        "x": 1799,\r
-        "y": 653,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1814,\r
+        "y": 1378.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5a0e3964.160d08",\r
+        "id": "71c769ba.e6ed98",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$idy`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1514,\r
-        "y": 702,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1529,\r
+        "y": 1427.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "b4f9d607.d62178",\r
-                "d260ee79.5c8ba",\r
-                "df466256.46eeb"\r
+                "ff55a68b.aa49b8",\r
+                "b3e4787b.39fbf8",\r
+                "1fc97483.5bad7b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b4f9d607.d62178",\r
+        "id": "ff55a68b.aa49b8",\r
          "type": "outcome",\r
          "name": "outcome",\r
          "xml": "<outcome value='`$param-prefix_length - 1`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1656,\r
-        "y": 653,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1671,\r
+        "y": 1378.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "ed323941.b82938"\r
+                "cb465dd8.92a9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d260ee79.5c8ba",\r
+        "id": "b3e4787b.39fbf8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1686,\r
-        "y": 727,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1701,\r
+        "y": 1452.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "2635ec82.339914"\r
+                "e5e9e952.ca39b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2635ec82.339914",\r
+        "id": "e5e9e952.ca39b8",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-new + $param-prefix[$idy] + ','`\" />\n",\r
          "comments": "",\r
-        "x": 1803,\r
-        "y": 737,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1818,\r
+        "y": 1462.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "df466256.46eeb",\r
+        "id": "1fc97483.5bad7b",\r
          "type": "outcome",\r
          "name": "outcome",\r
          "xml": "<outcome value='`$idx`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1665,\r
-        "y": 808,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1680,\r
+        "y": 1533.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "5f13154d.62bb0c"\r
+                "914db74a.878c08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f13154d.62bb0c",\r
+        "id": "914db74a.878c08",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='aend-new' value='`$aend-new`' />\n",\r
          "comments": "",\r
-        "x": 1803,\r
-        "y": 804,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1818,\r
+        "y": 1529.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7c2ba1f9.81021",\r
+        "id": "ae0f4e41.69868",\r
          "type": "execute",\r
          "name": "execute",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.cep.details.url + $zend-cep`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"zend-cep-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1032,\r
-        "y": 913,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1047,\r
+        "y": 1638.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "aefead1b.dd11a",\r
-                "e40dc66d.cd39c8"\r
+                "a3174939.084828",\r
+                "74087af2.acedd4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aefead1b.dd11a",\r
+        "id": "a3174939.084828",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1192,\r
-        "y": 872,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1207,\r
+        "y": 1597.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "15d190bf.2feb7f"\r
+                "1b9a1599.ef016a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e40dc66d.cd39c8",\r
+        "id": "74087af2.acedd4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1201.4443893432617,\r
-        "y": 941.777774810791,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1216.4443893432617,\r
+        "y": 1667.277774810791,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "570b2f4e.56f7b"\r
+                "8f5ec5c2.09dbf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15d190bf.2feb7f",\r
+        "id": "1b9a1599.ef016a",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Failed to get Aend cep details\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1349.22220993042,\r
-        "y": 871.9999942779541,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1364.22220993042,\r
+        "y": 1597.499994277954,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "570b2f4e.56f7b",\r
+        "id": "8f5ec5c2.09dbf8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1364.22216796875,\r
-        "y": 941,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1379.22216796875,\r
+        "y": 1666.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": [\r
              [\r
-                "6187c647.5929c8"\r
+                "b7515447.744b58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6187c647.5929c8",\r
+        "id": "b7515447.744b58",\r
          "type": "set",\r
          "name": "set zend-local-id",\r
          "xml": "<set>\n<parameter name='zend-local-id' value=\"`'/OTN/' + $zend-pnf-name + '/' + $zend-cep-response.sip[0].name[2].value + ':' + $zend-cep-response.sip[0].name[1].value`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 1542,\r
-        "y": 939,\r
-        "z": "477ddea1.f7699",\r
+        "x": 1557,\r
+        "y": 1664.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
      },\r
      {\r
-        "id": "59ec667.1ec9998",\r
+        "id": "a3841f37.73a11",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='final-response-code' value=\"200\" />\n",\r
          "comments": "",\r
-        "x": 697,\r
-        "y": 1886,\r
-        "z": "477ddea1.f7699",\r
+        "x": 712,\r
+        "y": 2611.5,\r
+        "z": "eeae8fa4.7aafe",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "53f4928e.efb2dc",\r
+        "type": "execute",\r
+        "name": "execute",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$esr-id`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"new-esr\"/> ",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 370.00000762939453,\r
+        "y": 1995.0000295639038,\r
+        "z": "eeae8fa4.7aafe",\r
+        "wires": [\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

index 039d9ee..eb7a20c 100644 (file)
--- a/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
@@ -60,7 +60,10 @@
          "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
-                "4dd86cf3.942054"\r
+                "4dd86cf3.942054",\r
+                "1a3fcf2c.299b01",\r
+                "18e76f04.abb6f9",\r
+                "4f7b81dc.d4d6f"\r
              ]\r
          ]\r
      },\r
@@ -104,8 +107,8 @@
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 873.5666656494141,\r
-        "y": 276,\r
+        "x": 882.566650390625,\r
+        "y": 305,\r
          "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
@@ -121,8 +124,8 @@
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1035.566665649414,\r
-        "y": 271,\r
+        "x": 1019.566650390625,\r
+        "y": 303,\r
          "z": "27c6cdb6.f4809a",\r
          "wires": [\r
              [\r
@@ -154,8 +157,8 @@
          "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": 1203.566665649414,\r
-        "y": 268,\r
+        "x": 1266.566650390625,\r
+        "y": 276,\r
          "z": "27c6cdb6.f4809a",\r
          "wires": []\r
      },\r
@@ -317,5 +320,73 @@
          "y": 627.566650390625,\r
          "z": "27c6cdb6.f4809a",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "18e76f04.abb6f9",\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": 812.5,\r
+        "y": 162.5,\r
+        "z": "27c6cdb6.f4809a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1a3fcf2c.299b01",\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-db1'>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 765.61669921875,\r
+        "y": 90.61666870117188,\r
+        "z": "27c6cdb6.f4809a",\r
+        "wires": [\r
+            [\r
+                "7d7099fb.e2d5f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7d7099fb.e2d5f",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 987.61669921875,\r
+        "y": 58.616668701171875,\r
+        "z": "27c6cdb6.f4809a",\r
+        "wires": [\r
+            [\r
+                "cc76d0c8.367a88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cc76d0c8.367a88",\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": 1094.61669921875,\r
+        "y": 92.61666870117188,\r
+        "z": "27c6cdb6.f4809a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4f7b81dc.d4d6f",\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=\"`$service-name + $param-prefix[2]`\"/>",\r
+        "comments": "",\r
+        "x": 777.61669921875,\r
+        "y": 244.61666870117188,\r
+        "z": "27c6cdb6.f4809a",\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 587c1dd..22a1705 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
@@ -1,20 +1,20 @@
  [\r
      {\r
-        "id": "22cb0f8b.7a936",\r
+        "id": "f869c120.9a5e8",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 276,\r
-        "y": 233,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 121.5,\r
+        "y": 90,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "899fe88f.8b0f18"\r
+                "8af1dc93.0e0da"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "899fe88f.8b0f18",\r
+        "id": "8af1dc93.0e0da",\r
          "type": "service-logic",\r
          "name": "optical-service ${project.version}",\r
          "module": "optical-service",\r
@@ -22,653 +22,692 @@
          "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": 289,\r
-        "y": 293,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 134.5,\r
+        "y": 150,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "8c11d44e.febba8"\r
+                "b03df385.9b70c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c11d44e.febba8",\r
+        "id": "b03df385.9b70c",\r
          "type": "method",\r
          "name": "method service-delete-tapi",\r
          "xml": "<method rpc='service-delete-tapi' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 309,\r
-        "y": 373,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 154.5,\r
+        "y": 230,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "4251fc90.7d3354"\r
+                "dae9b3c0.70198"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4251fc90.7d3354",\r
+        "id": "dae9b3c0.70198",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 556.5,\r
-        "y": 373,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 402,\r
+        "y": 230,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "fa22a868.cbac88",\r
-                "61c8204a.2cec1",\r
-                "613af82c.220508"\r
+                "882993c6.73a42",\r
+                "9a7b4d91.dc0e5",\r
+                "fe5645b4.4896a8",\r
+                "361056c9.62d1aa",\r
+                "fcf7ae69.66bac",\r
+                "658b7b5f.7441e4",\r
+                "ca74a3e.de9376"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fa22a868.cbac88",\r
+        "id": "882993c6.73a42",\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-create-tapi.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Inside optical service delete tapi\"/>\n\n\n\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 653,\r
-        "y": 196,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 498.5,\r
+        "y": 53,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "61c8204a.2cec1",\r
+        "id": "9a7b4d91.dc0e5",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='request-id' value='`$optical-service-delete-input.request-id`' />\n",\r
          "comments": "",\r
-        "x": 729,\r
-        "y": 245,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 689.5000076293945,\r
+        "y": 37.00000190734863,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": []\r
      },\r
      {\r
-        "id": "613af82c.220508",\r
+        "id": "ca74a3e.de9376",\r
          "type": "execute",\r
          "name": "execute",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.get.services.url + $optical-service-delete-input.payload.service-name`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"services-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.get.services.url + $service-name`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"services-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 759.9999351501465,\r
-        "y": 378.8888759613037,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 575.4999465942383,\r
+        "y": 328.3888740539551,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "6682edb5.3e9d24",\r
-                "894f9664.c6abc8"\r
+                "63d373a2.41054c",\r
+                "5229271d.664468"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ddeadbca.081d98",\r
+        "id": "bfa60c53.34db1",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='aend-nep' value=\"`$services-response.service[0].end-point[0].connection-end-point[0].node-edge-point-uuid`\" />\n<parameter name='zend-nep' value=\"`$services-response.service[0].end-point[1].connection-end-point[0].node-edge-point-uuid`\" />\n<parameter name='aend-cep' value=\"`$services-response.service[0].end-point[0].connection-end-point[0].connection-end-point-uuid`\" />\n<parameter name='zend-cep' value=\"`$services-response.service[0].end-point[1].connection-end-point[0].connection-end-point-uuid`\" />\n",\r
          "comments": "",\r
-        "x": 1492.2221755981445,\r
-        "y": 305.555513381958,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1332.7221870422363,\r
+        "y": 97.55551338195801,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6682edb5.3e9d24",\r
+        "id": "63d373a2.41054c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 963.3332595825195,\r
-        "y": 353.33330249786377,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 793.8332633972168,\r
+        "y": 285.33330154418945,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "894f9664.c6abc8",\r
+        "id": "5229271d.664468",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 939.999885559082,\r
-        "y": 435.55552768707275,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 777.9998893737793,\r
+        "y": 377.55554580688477,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "dafe166a.8b36d8"\r
+                "aa57e737.b0fed8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dafe166a.8b36d8",\r
+        "id": "aa57e737.b0fed8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1135.5554733276367,\r
-        "y": 446.6666831970215,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 981.0554733276367,\r
+        "y": 303.6666831970215,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "ddeadbca.081d98",\r
-                "2801b4f8.38386c",\r
-                "3cf51d10.896032",\r
-                "a44318ce.afad08"\r
+                "bfa60c53.34db1",\r
+                "863b12fd.05227",\r
+                "b8f3f329.852df",\r
+                "dbf2f1d6.f28c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2801b4f8.38386c",\r
+        "id": "863b12fd.05227",\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 = $aend-nep'\npfx='db-aend'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1545.5556449890137,\r
-        "y": 367.77777004241943,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1363.5556869506836,\r
+        "y": 152.27777290344238,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3cf51d10.896032",\r
+        "id": "b8f3f329.852df",\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 = $zend-nep'\npfx='db-zend'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1545.555549621582,\r
-        "y": 422.2222137451172,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1366.055564880371,\r
+        "y": 209.2222318649292,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "852e3fe3.e39dd",\r
+        "id": "a6a0d931.29ae78",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='aend-new' value='`$aend-cep`' />\n",\r
          "comments": "",\r
-        "x": 1931.221923828125,\r
-        "y": 647.22216796875,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1776.721923828125,\r
+        "y": 504.22216796875,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4644be9d.89b97",\r
+        "id": "96350f11.361f",\r
          "type": "get-resource",\r
          "name": "find if aend is uni or nni or enni",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $db-aend.pnf-name AND\n     p-interface.interface-name = $aend-nep\"\npfx='aend'      local-only='false'>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1719.1107177734375,\r
-        "y": 562.8888549804688,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1564.6107177734375,\r
+        "y": 419.88885498046875,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a44318ce.afad08",\r
+        "id": "dbf2f1d6.f28c4",\r
          "type": "execute",\r
          "name": "execute",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.delete.service.url + $optical-service-delete-input.payload.service-name`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"tapi-service-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"` $controller-ip + $prop.tapi.delete.service.url + $service-name`\" />\n<parameter name=\"restapiUser\" value=\"admin\"/>  \n<parameter name=\"restapiPassword\" value=\"admin\"/>  \n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"tapi-service-response\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='format' value='json' />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks\"/>  \n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/> ",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1283.3331146240234,\r
-        "y": 514.4444074630737,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1128.8331146240234,\r
+        "y": 371.44440746307373,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "58946d75.cedfa4",\r
-                "e7cecf42.399a6"\r
+                "f321d77d.d8fcf8",\r
+                "21838287.92c3fe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "58946d75.cedfa4",\r
+        "id": "f321d77d.d8fcf8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1252.3331146240234,\r
-        "y": 656.4444074630737,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1097.8331146240234,\r
+        "y": 513.4444074630737,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "1e4a35c6.1c31ca"\r
+                "91f84772.c4f2c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1e4a35c6.1c31ca",\r
+        "id": "91f84772.c4f2c8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1406.5553512573242,\r
-        "y": 610.666627407074,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1252.0553512573242,\r
+        "y": 467.666627407074,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "4644be9d.89b97",\r
-                "29655b58.ca1ca4",\r
-                "aad55652.80ccf8",\r
-                "82da300b.4f57c",\r
-                "2082255.0c982da",\r
-                "9f9c7a46.ce0ff8",\r
-                "70a0ebe0.92bcd4",\r
-                "33fa91ea.5695ce",\r
-                "425e8f1f.07ad6",\r
-                "94aa81a4.d0a7a8"\r
+                "96350f11.361f",\r
+                "fd9b7231.073dc",\r
+                "438c73c3.1e914c",\r
+                "f0125016.faa34",\r
+                "40bc2de7.03f354",\r
+                "db818283.160ff",\r
+                "f97e22d2.872f8",\r
+                "9544eb2a.40e488",\r
+                "91c2f578.c64f58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7cecf42.399a6",\r
+        "id": "21838287.92c3fe",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1409.9998016357422,\r
-        "y": 498.88880443573,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1255.4998016357422,\r
+        "y": 355.88880443573,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "ea3eca27.8a59e8"\r
+                "77e1cb8f.bccac4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea3eca27.8a59e8",\r
+        "id": "77e1cb8f.bccac4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1576.9998016357422,\r
-        "y": 497.88880443573,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1422.4998016357422,\r
+        "y": 354.88880443573,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "e7be8bd4.b55258"\r
+                "92f8a789.a292a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7be8bd4.b55258",\r
+        "id": "92f8a789.a292a8",\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='Service Deletion failed' />\n<parameter name='ack-final-indicator' value=\"Y\" />",\r
          "comments": "",\r
-        "x": 1744.8886985778809,\r
-        "y": 496.66657543182373,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1590.3886985778809,\r
+        "y": 353.66657543182373,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": []\r
      },\r
      {\r
-        "id": "29655b58.ca1ca4",\r
+        "id": "fd9b7231.073dc",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$aend.network-interface-type`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1641.1108856201172,\r
-        "y": 665.5554914474487,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1486.6108856201172,\r
+        "y": 522.5554914474487,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "aea6fbc6.1505d8",\r
-                "2d663d56.1e55d2"\r
+                "1a5628eb.513f87",\r
+                "b8eb04be.936ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aea6fbc6.1505d8",\r
+        "id": "1a5628eb.513f87",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='UNI'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1805.888671875,\r
-        "y": 647.22216796875,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1651.388671875,\r
+        "y": 504.22216796875,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "852e3fe3.e39dd"\r
+                "a6a0d931.29ae78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2d663d56.1e55d2",\r
+        "id": "b8eb04be.936ff8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1808.1108779907227,\r
-        "y": 720.5555419921875,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1653.6108779907227,\r
+        "y": 577.5555419921875,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "af008805.61eae8"\r
+                "54b37131.ec50b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aad55652.80ccf8",\r
+        "id": "438c73c3.1e914c",\r
          "type": "save",\r
          "name": "update pinterface cep DB Aend",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $aend-new WHERE interface_name = $aend-nep'\nforce='true' pfx='save-result'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1671.1108856201172,\r
-        "y": 763.3332624435425,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1516.6108856201172,\r
+        "y": 620.3332624435425,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "82da300b.4f57c",\r
+        "id": "f0125016.faa34",\r
          "type": "get-resource",\r
          "name": "find if zend is uni or nni or enni",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"p-interface\"\n key=\"pnf.pnf-name = $db-zend.pnf-name AND\n     p-interface.interface-name = $zend-nep\"\npfx='zend'      local-only='false'>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1647.7772598266602,\r
-        "y": 846.6665992736816,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1493.2772598266602,\r
+        "y": 703.6665992736816,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2082255.0c982da",\r
+        "id": "40bc2de7.03f354",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$zend.network-interface-type`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1549.9998149871826,\r
-        "y": 915.55544090271,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1395.4998149871826,\r
+        "y": 772.55544090271,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "3a6cd376.4295ac",\r
-                "86c6217d.bed2a"\r
+                "c35140e8.3b796",\r
+                "59a847b5.312e98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3a6cd376.4295ac",\r
+        "id": "c35140e8.3b796",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='UNI'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1740.3330764770508,\r
-        "y": 903.2221584320068,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1585.8330764770508,\r
+        "y": 760.2221584320068,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "b35b94b1.940ff8"\r
+                "5f2dae98.203c3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "86c6217d.bed2a",\r
+        "id": "59a847b5.312e98",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1742.5553359985352,\r
-        "y": 970.5555419921875,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1588.0553359985352,\r
+        "y": 827.5555419921875,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "e1b5d596.201438"\r
+                "135bc522.303b8b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9f9c7a46.ce0ff8",\r
+        "id": "db818283.160ff",\r
          "type": "save",\r
          "name": "update pinterface cep DB Zend",\r
          "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \nresource='SQL' \nkey='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'\nforce='true' pfx='save-result'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1571.1112060546875,\r
-        "y": 1009.9999141693115,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1416.6112060546875,\r
+        "y": 866.9999141693115,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "74642edb.088ea",\r
+        "id": "cf13929a.a5198",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-new' value=\"`$zend-cep`\" />\n",\r
          "comments": "",\r
-        "x": 2139.999885559082,\r
-        "y": 972.2221412658691,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1985.499885559082,\r
+        "y": 829.2221412658691,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b35b94b1.940ff8",\r
+        "id": "5f2dae98.203c3",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-new' value='`$zend-cep`' />\n",\r
          "comments": "",\r
-        "x": 1866.6664352416992,\r
-        "y": 902.2221622467041,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1712.1664352416992,\r
+        "y": 759.2221622467041,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": []\r
      },\r
      {\r
-        "id": "33fa91ea.5695ce",\r
+        "id": "f97e22d2.872f8",\r
          "type": "delete",\r
          "name": "delete service instance AAI",\r
          "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\nresource=\"service-instance\"\nkey='customer.global-customer-id = $output.global-customer-id AND\nservice-subscription.service-type = $output.service-type AND\nservice-instance.service-instance-id = $output.service-instance-id'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1466.6664199829102,\r
-        "y": 1124.4443254470825,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1312.1664199829102,\r
+        "y": 981.4443254470825,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "70a0ebe0.92bcd4",\r
-        "type": "get-resource",\r
-        "name": "get service db",\r
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '\npfx='output'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n     \n \n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1487.7775344848633,\r
-        "y": 1067.7777080535889,\r
-        "z": "ecded786.86d6f8",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "e1b5d596.201438",\r
+        "id": "135bc522.303b8b",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$db-zend.connection-point`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1884.4444444444443,\r
-        "y": 973.3333333333333,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1729.9444444444443,\r
+        "y": 830.3333333333333,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "1ff79f49.8fba61",\r
-                "54376f65.aa57"\r
+                "dda38169.1a96b",\r
+                "943fd023.cc6d9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1ff79f49.8fba61",\r
+        "id": "dda38169.1a96b",\r
          "type": "outcome",\r
          "name": "outcome",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2012.2222061157227,\r
-        "y": 974.4444217681885,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1857.7222061157227,\r
+        "y": 831.4444217681885,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "74642edb.088ea"\r
+                "cf13929a.a5198"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f9bfc410.022418",\r
+        "id": "582c452e.50a00c",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='zend-new' value=\"`$db-zend.connection-point + ',' + $zend-cep`\" />\n",\r
          "comments": "",\r
-        "x": 2142.221981048584,\r
-        "y": 1038.8887939453125,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1987.721981048584,\r
+        "y": 895.8887939453125,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": []\r
      },\r
      {\r
-        "id": "54376f65.aa57",\r
+        "id": "943fd023.cc6d9",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2024.4444444444443,\r
-        "y": 1037.7777777777778,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1869.9444444444443,\r
+        "y": 894.7777777777778,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "f9bfc410.022418"\r
+                "582c452e.50a00c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "af008805.61eae8",\r
+        "id": "54b37131.ec50b",\r
          "type": "switchNode",\r
          "name": "switch",\r
          "xml": "<switch test='`$db-aend.connection-point`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1935.5554428100586,\r
-        "y": 723.3333148956299,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1781.0554428100586,\r
+        "y": 580.3333148956299,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "fdc21e7c.da331",\r
-                "ede7f03e.32c01"\r
+                "d7cb5d1f.868ba",\r
+                "b8aa01ad.10807"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ca90d2f.d086e4",\r
+        "id": "cd72b99.aafe848",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='aend-new' value=\"`$aend-cep`\" />\n",\r
          "comments": "",\r
-        "x": 2210,\r
-        "y": 712.22216796875,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 2055.5,\r
+        "y": 569.22216796875,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fdc21e7c.da331",\r
+        "id": "d7cb5d1f.868ba",\r
          "type": "outcome",\r
          "name": "outcome",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2082.2223205566406,\r
-        "y": 714.4444484710693,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1927.7223205566406,\r
+        "y": 571.4444484710693,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "6ca90d2f.d086e4"\r
+                "cd72b99.aafe848"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f35c33d.adfbfd",\r
+        "id": "b905fec4.7ac5f",\r
          "type": "set",\r
          "name": "set",\r
          "xml": "<set>\n<parameter name='aend-new' value=\"`$db-aend.connection-point + ',' + $aend-cep`\" />\n",\r
          "comments": "",\r
-        "x": 2212.222095489502,\r
-        "y": 778.8888206481934,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 2057.722095489502,\r
+        "y": 635.8888206481934,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ede7f03e.32c01",\r
+        "id": "b8aa01ad.10807",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2094.4445588853623,\r
-        "y": 777.7778044806587,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1939.9445588853623,\r
+        "y": 634.7778044806587,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              [\r
-                "f35c33d.adfbfd"\r
+                "b905fec4.7ac5f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "425e8f1f.07ad6",\r
+        "id": "9544eb2a.40e488",\r
          "type": "delete",\r
          "name": "delete from db",\r
          "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\n    resource=\"SQL\"\n    key=\"DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id\">",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1377.7776336669922,\r
-        "y": 1185.5554809570312,\r
-        "z": "ecded786.86d6f8",\r
+        "x": 1223.2776336669922,\r
+        "y": 1042.5554809570312,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "94aa81a4.d0a7a8",\r
+        "id": "91c2f578.c64f58",\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
+        "x": 1170.5,\r
+        "y": 1114,\r
+        "z": "3bd40398.0e17fc",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fe5645b4.4896a8",\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 * from REQUEST_DETAILS WHERE request_id = $request-id '\npfx='output'>\n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n    \n\n    \n    \n    \n    \n    \n    \n    \n     \n \n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 710.0000114440918,\r
+        "y": 107.50000095367432,\r
+        "z": "3bd40398.0e17fc",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "361056c9.62d1aa",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='esr-id' value='`$output.controller-id`' />\n",\r
+        "comments": "",\r
+        "x": 727.5,\r
+        "y": 152.5,\r
+        "z": "3bd40398.0e17fc",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fcf7ae69.66bac",\r
+        "type": "execute",\r
+        "name": "execute",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$esr-id`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"new-esr\"/> ",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 707.5000152587891,\r
+        "y": 207.50000190734863,\r
+        "z": "3bd40398.0e17fc",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "658b7b5f.7441e4",\r
+        "type": "set",\r
+        "name": "set",\r
+        "xml": "<set>\n<parameter name='service-name' value=\"`$optical-service-delete-input.payload.service-name +  $new-esr[2]`\" />\n",\r
+        "comments": "",\r
+        "x": 675.0000114440918,\r
+        "y": 262.50000381469727,\r
+        "z": "3bd40398.0e17fc",\r
          "wires": []\r
      }\r
  ]
 \ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml b/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml

index e11d061..c817cee 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
@@ -66,4 +66,4 @@ service-instance.service-instance-id = $output.service-instance-id'></delete>
      key="DELETE FROM REQUEST_DETAILS WHERE request_id = $request-id"></delete>\r
          </block>\r
      </method>\r
-</service-logic>\r
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml b/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml

index eb1ef93..4e712ea 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml
@@ -26,7 +26,7 @@ pfx='inter' local-only='false' >
                          <for index='ida' start='0' end='`$inter.logical-link_length`' >\r
                              <switch test='`$inter.logical-link[$ida].link-type`'>\r
                                  <outcome value='inter-domain'>\r
-                                    <switch test='`$inter.logical-link[$ida].available-capacity == 0`'>\r
+                                    <switch test='`$inter.logical-link[$ida].operational-status == occupied`'>\r
                                          <outcome value='true'></outcome>\r
                                          <outcome value='false'>\r
                                              <block atomic="true">\r
@@ -69,7 +69,7 @@ pfx='inter' local-only='false' >
                                                      <set>\r
                                                          <parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-aend`' />\r
                                                          <parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-bend`' />\r
-                                                        <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name + '_' + 'MDONS-OTN-TAPI-1'`" />\r
+                                                        <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name +  '_MDONS-OTN'`" />\r
                                                          <parameter name='domain-type' value="TAPI" />\r
                                                          <parameter name='optical-service-create-input.request-id' value="`$service1-request-id`" />\r
                                                          <parameter name='optical-service-create-input.service-id' value="`$service1-svc-instance-id`" />\r
@@ -109,7 +109,7 @@ pfx='inter' local-only='false' >
                                                      <set>\r
                                                          <parameter name='optical-service-create-input.payload.service-aend.port-id' value='`$access-cend`' />\r
                                                          <parameter name='optical-service-create-input.payload.service-zend.port-id' value='`$access-zend`' />\r
-                                                        <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name + '_' + 'MDONS-OTN-TAPI-2'`" />\r
+                                                        <parameter name='optical-service-create-input.payload.service-name' value="`$access-service-name + '_MDONS-OTN'`" />\r
                                                          <parameter name='domain-type' value="TAPI" />\r
                                                          <parameter name='optical-service-create-input.request-id' value="`$service2-request-id`" />\r
                                                          <parameter name='optical-service-create-input.service-id' value="`$service2-svc-instance-id`" />\r
@@ -161,7 +161,7 @@ force='true'
  resource='logical-link'\r
       key='logical-link.link-name = $inter.logical-link[$ida].link-name '\r
        local-only='false'>\r
-                                                    <parameter name='available-capacity' value='0' />\r
+                                                    <parameter name='operational-status' value='occupied' />\r
                                                  </update>\r
                                                  <call module='optical-service' rpc='create-service-relationship' mode='sync' ></call>\r
                                                  <return status='success'>\r
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml b/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml

index 91062b0..541e027 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_main-create.xml
@@ -57,6 +57,9 @@ pfx='db-zend'>
              <switch test='`$domain-type`'>\r
                  <outcome value='MSA'>\r
                      <block atomic='true'>\r
+                        <set>\r
+                            <parameter name='optical-service-create-input.payload.service-name' value="`$optical-service-create-input.payload.service-name + '_' + $param-prefix[2]`"/>\r
+                        </set>\r
                          <call module='optical-service' rpc='service-create-msa' mode='sync' ></call>\r
                      </block>\r
                  </outcome>\r
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 ce1937f..2bbd79e 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
@@ -15,6 +15,7 @@ pfx='detail-db'>
                  <outcome value='success'>\r
                      <set>\r
                          <parameter name='domain-req' value='`$detail-db.domain-requests`' />\r
+                        <parameter name='delete-acc-svc-id' value='`$detail-db.service-instance-id`' />\r
                      </set>\r
                  </outcome>\r
              </get-resource>\r
@@ -28,9 +29,6 @@ pfx='detail-db'>
                  <parameter name='domain-service1' value='`$param-prefix1[0]`' />\r
                  <parameter name='domain-service2' value='`$param-prefix1[1]`' />\r
              </set>\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
@@ -55,7 +53,7 @@ pfx='detail-db1'>
                                  <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
+                                <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
@@ -128,7 +126,7 @@ pfx='detail-db11'>
                                      </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='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`"/>\r
                                          <parameter name='domain-type' value='`$domain1[0]`' />\r
                                          <parameter name='controller-ip' value='`$domain1[1]`' />\r
                                      </set>\r
@@ -182,7 +180,7 @@ pfx='detail-db22'>
                                      </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='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.param[0].value + '_MDONS-OTN_'`"/>\r
                                          <parameter name='domain-type' value='`$domain2[0]`' />\r
                                          <parameter name='controller-ip' value='`$domain2[1]`' />\r
                                      </set>\r
@@ -256,6 +254,28 @@ pfx='detail-db22'>
                                      <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
+                                    <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="`'domain rquest_' + $domain-requests`"/>\r
+                                        <parameter name="field2" value="`'Access rquest_' + $as-request-id`"/>\r
+                                    </record>\r
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+resource="service-instance"\r
+ key='customer.global-customer-id = $output.global-customer-id AND\r
+     service-subscription.service-type = $output.service-type AND\r
+     service-instance.service-instance-id = $delete-acc-svc-id' \r
+pfx='acc-serv-dl'      local-only='false'></get-resource>\r
+                                    <set>\r
+                                        <parameter name='link-name' value='`$acc-serv-dl.relationship-list.relationship[0].relationship-data[0].relationship-value`' />\r
+                                    </set>\r
+                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' \r
+force='true'\r
+resource='logical-link'\r
+     key='logical-link.link-name = $link-name '\r
+      local-only='false'>\r
+                                        <parameter name='operational-status' value='available' />\r
+                                    </update>\r
                                      <return status='success'>\r
                                          <parameter name="error-code" value="200" />\r
                                          <parameter name="error-message" value="Service Deleted Successfully" />\r
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml

index 11b729e..5f87c54 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml
@@ -24,6 +24,7 @@ pfx='db-aend'>
                          <parameter name='aend-cep-list' value='`$db-aend.connection-point`' />\r
                          <parameter name='aend-nep' value='`$db-aend.interface-name`' />\r
                          <parameter name='aend-rate' value='`$db-aend.rate`' />\r
+                        <parameter name='esr-id' value='`$db-aend.controller-id`' />\r
                      </set>\r
                  </outcome>\r
              </get-resource>\r
@@ -322,8 +323,13 @@ pfx='zend'      local-only='false'></get-resource>
                      </block>\r
                  </outcome>\r
              </switch>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                <parameter name="original_string" value='`$esr-id`'/>\r
+                <parameter name="regex" value="_"/>\r
+                <parameter name="ctx_memory_result_key" value="new-esr"/>\r
+            </execute>\r
              <set>\r
-                <parameter name='service-name' value="`$optical-service-create-input.payload.service-name`" />\r
+                <parameter name='service-name' value="`$optical-service-create-input.payload.service-name +'_' + $new-esr[2]`"/>\r
                  <parameter name='svc-action' value="CREATE" />\r
              </set>\r
              <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\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

index a423317..2eb3816 100644 (file)
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
@@ -3,6 +3,28 @@
      xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>\r
      <method rpc='service-delete-msa' mode='sync'>\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="`$service-name + $param-prefix[2]`"/>\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
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 24b52fb..0d17afd 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
@@ -3,16 +3,30 @@
      xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='optical-service' version='${project.version}'>\r
      <method rpc='service-delete-tapi' mode='sync'>\r
          <block atomic="true">\r
+            <set>\r
+                <parameter name='request-id' value='`$optical-service-delete-input.request-id`' />\r
+            </set>\r
              <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
                  <parameter name="file" value="/opt/opendaylight/current/data/log/service-create-tapi.log" />\r
                  <parameter name="level" value="info" />\r
                  <parameter name="field1" value="Inside optical service delete tapi"/>\r
              </record>\r
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \r
+key='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '\r
+pfx='output'></get-resource>\r
              <set>\r
-                <parameter name='request-id' value='`$optical-service-delete-input.request-id`' />\r
+                <parameter name='esr-id' value='`$output.controller-id`' />\r
+            </set>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
+                <parameter name="original_string" value='`$esr-id`'/>\r
+                <parameter name="regex" value="_"/>\r
+                <parameter name="ctx_memory_result_key" value="new-esr"/>\r
+            </execute>\r
+            <set>\r
+                <parameter name='service-name' value="`$optical-service-delete-input.payload.service-name +  $new-esr[2]`" />\r
              </set>\r
              <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.get.services.url + $optical-service-delete-input.payload.service-name`" />\r
+                <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.get.services.url + $service-name`" />\r
                  <parameter name="restapiUser" value="admin"/>\r
                  <parameter name="restapiPassword" value="admin"/>\r
                  <parameter name="httpMethod" value="GET"/>\r
@@ -43,7 +57,7 @@ from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
  WHERE interface_name = $zend-nep'\r
  pfx='db-zend'></get-resource>\r
                          <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.delete.service.url + $optical-service-delete-input.payload.service-name`" />\r
+                            <parameter name="restapiUrl" value="` $controller-ip + $prop.tapi.delete.service.url + $service-name`" />\r
                              <parameter name="restapiUser" value="admin"/>\r
                              <parameter name="restapiPassword" value="admin"/>\r
                              <parameter name="httpMethod" value="DELETE"/>\r
@@ -125,9 +139,6 @@ pfx='zend'      local-only='false'></get-resource>
  resource='SQL' \r
  key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET connection_point = $zend-new WHERE interface_name = $zend-nep'\r
  force='true' pfx='save-result'></save>\r
-                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \r
-key='SELECT * from REQUEST_DETAILS WHERE request_id = $request-id '\r
-pfx='output'></get-resource>\r
                                      <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
  resource="service-instance"\r
  key='customer.global-customer-id = $output.global-customer-id AND\r
author	Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>
	Thu, 16 Apr 2020 15:23:14 +0000 (15:23 +0000)
committer	Mehreen Kaleem <mehreen.kaleem@us.fujitsu.com>
	Thu, 16 Apr 2020 15:23:22 +0000 (15:23 +0000)
platform-logic/optical-service/src/main/json/optical-service_aai-delete-service-handling.json		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_inter-domain-handling.json		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_main-create.json		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_optical-service-delete.json		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_service-create-tapi.json		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json		patch \| blob \| history
platform-logic/optical-service/src/main/json/optical-service_service-delete-tapi.json		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_inter-domain-handling.xml		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_main-create.xml		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_optical-service-delete.xml		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_service-create-tapi.xml		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml		patch \| blob \| history
platform-logic/optical-service/src/main/xml/optical-service_service-delete-tapi.xml		patch \| blob \| history