From 757a0758c4e5ec01b4dbe382bfa718f294b63717 Mon Sep 17 00:00:00 2001
From: Lathish <lathishbabu.ganesan@est.tech>
Date: Wed, 19 Aug 2020 22:59:03 +0100
Subject: [PATCH] Add/Modified A1 DG's

Issue-ID: CCSDK-2605
Change-Id: I0a2618e9e46f53c369b3c86a85bac8ab1bc69022
Signed-off-by: Lathish <lathishbabu.ganesan@est.tech>
---
 .../json/A1-ADAPTER-API_createPolicyInstance.json  | 1003 ------------------
 .../main/json/A1-ADAPTER-API_createPolicyType.json | 1066 --------------------
 .../main/json/A1-ADAPTER-API_deleteA1Policy.json   |  317 ++++++
 .../json/A1-ADAPTER-API_deletePolicyInstance.json  |  608 -----------
 .../main/json/A1-ADAPTER-API_deletePolicyType.json |  629 ------------
 .../src/main/json/A1-ADAPTER-API_getA1Policy.json  |  332 ++++++
 .../json/A1-ADAPTER-API_getA1PolicyStatus.json     |  332 ++++++
 .../main/json/A1-ADAPTER-API_getA1PolicyType.json  |  351 +++----
 .../main/json/A1-ADAPTER-API_getHealthCheck.json   |  591 -----------
 .../main/json/A1-ADAPTER-API_getNearRT-RICs.json   |  424 --------
 .../json/A1-ADAPTER-API_getPolicyInstance.json     |  734 --------------
 .../json/A1-ADAPTER-API_getPolicyInstances.json    |  702 -------------
 .../main/json/A1-ADAPTER-API_getPolicyTypes.json   |  657 ------------
 .../src/main/json/A1-ADAPTER-API_getStatus.json    |  608 -----------
 ...-ADAPTER-API_notifyPolicyEnforcementUpdate.json |  300 ------
 .../src/main/json/A1-ADAPTER-API_putA1Policy.json  |  273 +++++
 .../src/main/resources/graph.versions              |   15 +-
 .../xml/A1-ADAPTER-API_createPolicyInstance.xml    |  470 ---------
 .../main/xml/A1-ADAPTER-API_createPolicyType.xml   |  534 ----------
 .../src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml |   78 ++
 .../xml/A1-ADAPTER-API_deletePolicyInstance.xml    |  268 -----
 .../main/xml/A1-ADAPTER-API_deletePolicyType.xml   |  257 -----
 .../src/main/xml/A1-ADAPTER-API_getA1Policy.xml    |   84 ++
 .../main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml  |   84 ++
 .../main/xml/A1-ADAPTER-API_getA1PolicyType.xml    |   18 +-
 .../src/main/xml/A1-ADAPTER-API_getHealthCheck.xml |  245 -----
 .../src/main/xml/A1-ADAPTER-API_getNearRT-RICs.xml |  158 ---
 .../main/xml/A1-ADAPTER-API_getPolicyInstance.xml  |  297 ------
 .../main/xml/A1-ADAPTER-API_getPolicyInstances.xml |  292 ------
 .../src/main/xml/A1-ADAPTER-API_getPolicyTypes.xml |  272 -----
 .../src/main/xml/A1-ADAPTER-API_getStatus.xml      |  268 -----
 ...1-ADAPTER-API_notifyPolicyEnforcementUpdate.xml |   95 --
 .../src/main/xml/A1-ADAPTER-API_putA1Policy.xml    |   68 ++
 33 files changed, 1696 insertions(+), 10734 deletions(-)
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_createPolicyInstance.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_createPolicyType.json
 create mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deletePolicyInstance.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deletePolicyType.json
 create mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1Policy.json
 create mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getHealthCheck.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getNearRT-RICs.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyInstance.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyInstances.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyTypes.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getStatus.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_notifyPolicyEnforcementUpdate.json
 create mode 100644 platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_createPolicyInstance.xml
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_createPolicyType.xml
 create mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deletePolicyInstance.xml
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deletePolicyType.xml
 create mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1Policy.xml
 create mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getHealthCheck.xml
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getNearRT-RICs.xml
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstance.xml
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstances.xml
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyTypes.xml
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getStatus.xml
 delete mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_notifyPolicyEnforcementUpdate.xml
 create mode 100644 platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml

diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_createPolicyInstance.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_createPolicyInstance.json
deleted file mode 100644
index 2c7c272d..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_createPolicyInstance.json
+++ /dev/null
@@ -1,1003 +0,0 @@
-[
-    {
-        "id": "9236469b.e33218",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 173,
-        "y": 99,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "c9f1cc58.c62c7"
-            ]
-        ]
-    },
-    {
-        "id": "c9f1cc58.c62c7",
-        "type": "method",
-        "name": "method createPolicyInstance",
-        "xml": "<method rpc='createPolicyInstance' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 160,
-        "y": 168,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "4499058e.f4c35c"
-            ]
-        ]
-    },
-    {
-        "id": "42dffa26.a86494",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Adapter Create Policy Instance. RPC Parms:\"/>\n<parameter name=\"field2\" value=\"`$create-policy-instance-input.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$create-policy-instance-input.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$create-policy-instance-input.policy-instance-id`\"/>\n<parameter name=\"field5\" value=\"A1 Adapter Create Policy Instance. Number of Policy Properties\"/>\n<parameter name=\"field6\" value=\"`$create-policy-instance-input.properties_length`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 482,
-        "y": 31,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4499058e.f4c35c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 121,
-        "y": 305,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "42dffa26.a86494",
-                "4f39d57e.ecab2c",
-                "4e33f9e8.999d18",
-                "73cdcbde.870b64",
-                "db58a7cd.71bd78",
-                "62562bdc.8b71e4",
-                "4e5b3350.571f7c"
-            ]
-        ]
-    },
-    {
-        "id": "1f803634.6e151a",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 Adapter is healthy'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 231.99999618530273,
-        "y": 1232.0000381469727,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "b6def1db.d900e",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 101,
-        "y": 37,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "9236469b.e33218"
-            ]
-        ]
-    },
-    {
-        "id": "4f39d57e.ecab2c",
-        "type": "for",
-        "name": "for 0..properties_length",
-        "xml": "<for index='idx' start='0' end='`$create-policy-instance-input.properties_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 535,
-        "y": 157,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "49ad936d.7f52ec"
-            ]
-        ]
-    },
-    {
-        "id": "49ad936d.7f52ec",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Adapter Create Policy Instance. Properties Name and Value\"/>\n<parameter name=\"field2\" value=\"`$idx`\"/>\n<parameter name=\"field3\" value=\"`$create-policy-instance-input.properties[$idx].property-name`\"/>\n<parameter name=\"field4\" value=\"`$create-policy-instance-input.properties[$idx].property-value`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 744,
-        "y": 120,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2f3b7d7.b79a582",
-        "type": "execute",
-        "name": "execute TemplateNode",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.template.TemplateNode\" method=\"evaluateTemplate\" >\n    <parameter name='templatePath' value='a1-policy-instance-property-payload-template.vtl' />\n    <parameter name='output' value='restapi-payload' />\n    <parameter name='prefix' value='a1-mediator' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1221.0000381469727,
-        "y": 148,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "c3edaac2.76c898",
-                "a000a8ec.f02a08"
-            ]
-        ]
-    },
-    {
-        "id": "c3edaac2.76c898",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1546.0000381469727,
-        "y": 88,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "c4887e0b.677ec"
-            ]
-        ]
-    },
-    {
-        "id": "c4887e0b.677ec",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1737.0000381469727,
-        "y": 86,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "59d852be.21338c"
-            ]
-        ]
-    },
-    {
-        "id": "59d852be.21338c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred A1 Mediator RestAPI payload template as a string\"/>\n<parameter name='field3' value='`$a1-mediator.restapi-payload`' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1916.0000381469727,
-        "y": 86,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9b6aac0c.da315",
-        "type": "execute",
-        "name": "remove new lines",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1-mediator.restapi-payload`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.payload\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1167.5000534057617,
-        "y": 356.00000619888306,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "1409ce40.d198e2",
-                "fcccb2fe.5b568"
-            ]
-        ]
-    },
-    {
-        "id": "cfa3b21a.52b7f",
-        "type": "execute",
-        "name": "remove tabs",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$tmp.a1-mediator-restapi.payload`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.payload\"/>\n    <parameter name=\"target\" value=\"\\t\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1087.0000534057617,
-        "y": 540.9999980926514,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "9936f19c.6654c",
-                "f7c3147.26a20e8"
-            ]
-        ]
-    },
-    {
-        "id": "9936f19c.6654c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1258.5000534057617,
-        "y": 553.9999980926514,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "9a0a6599.a41078"
-            ]
-        ]
-    },
-    {
-        "id": "9a0a6599.a41078",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1435.5000534057617,
-        "y": 558.9999980926514,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "91f17f26.09e3b"
-            ]
-        ]
-    },
-    {
-        "id": "91f17f26.09e3b",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template with tabs removed \\r\"/>\n<parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1589.5000076293945,
-        "y": 544.0000076293945,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1409ce40.d198e2",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1324.0001602172852,
-        "y": 272.00000953674316,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "15aa0921.904b77"
-            ]
-        ]
-    },
-    {
-        "id": "15aa0921.904b77",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1459.0003128051758,
-        "y": 342.0000419616699,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "c3e2df84.be4db"
-            ]
-        ]
-    },
-    {
-        "id": "c3e2df84.be4db",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template with lines removed \\r\"/>\n<parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1531.0002517700195,
-        "y": 261.00000381469727,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a000a8ec.f02a08",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1528.0000381469727,
-        "y": 190,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "1a33b2f4.89b4cd"
-            ]
-        ]
-    },
-    {
-        "id": "1a33b2f4.89b4cd",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1706.9999160766602,
-        "y": 197,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "99d35048.265b3",
-                "2fa6b57e.29105a",
-                "5f556c15.ff9d34"
-            ]
-        ]
-    },
-    {
-        "id": "99d35048.265b3",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error creating A1 Mediatory Rest API payload string. Aborting A1 Policy Instance creation\" />",
-        "comments": "",
-        "x": 1705.9996719360352,
-        "y": 292.00000762939453,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "fcccb2fe.5b568",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1334.000129699707,
-        "y": 432.0000444948673,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "bde42de.77475d"
-            ]
-        ]
-    },
-    {
-        "id": "bde42de.77475d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1486.9999771118164,
-        "y": 408.00003719329834,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "a7b92aa1.af88e8",
-                "47758778.282278",
-                "5f556c15.ff9d34"
-            ]
-        ]
-    },
-    {
-        "id": "a7b92aa1.af88e8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error removing lines from A1 Mediator Rest API payload string. Aborting A1 Policy creation\" />",
-        "comments": "",
-        "x": 1527.9996719360352,
-        "y": 494.00003242492676,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "f7c3147.26a20e8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1263.0000534057617,
-        "y": 622.9999980926514,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "a84e0601.6e44f8"
-            ]
-        ]
-    },
-    {
-        "id": "a84e0601.6e44f8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1438.999885559082,
-        "y": 640.9999923706055,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "6ec35f94.73b36",
-                "aefc7d8c.affb7",
-                "5f556c15.ff9d34"
-            ]
-        ]
-    },
-    {
-        "id": "6ec35f94.73b36",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error removing tabs from A1 Mediator Rest API payload string. Aborting A1 Policy creation\" />",
-        "comments": "",
-        "x": 1442.999641418457,
-        "y": 742.0000476837158,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "d303102b.4952b",
-        "type": "block",
-        "name": "A1 Mediator Payload Generation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 897.0000152587891,
-        "y": 271.9999952316284,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "2f3b7d7.b79a582",
-                "9b6aac0c.da315",
-                "cfa3b21a.52b7f"
-            ]
-        ]
-    },
-    {
-        "id": "4e33f9e8.999d18",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 526,
-        "y": 110,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "73cdcbde.870b64",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Properties read .. A1 Mediator Target\"/>\n<parameter name=\"field2\" value=\"`$prop.oofpcipoc.patch.pci.target`\"/>\n<parameter name=\"field3\" value=\"`$prop.controller.user`\"/>\n<parameter name=\"field4\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"field5\" value=\"`$prop.controller.url`\"/>\n<parameter name=\"field6\" value=\"A1 Mediator deployed (true/false): \"/>\n<parameter name=\"field7\" value=\"`$prop.ric-plt-A1Mediator-deployed`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 491,
-        "y": 203,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "db58a7cd.71bd78",
-        "type": "switchNode",
-        "name": "A1 Mediator Deployed",
-        "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 359,
-        "y": 317,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "bab09024.90a",
-                "2146fa82.3cb466"
-            ]
-        ]
-    },
-    {
-        "id": "bab09024.90a",
-        "type": "outcome",
-        "name": "Not Deployed",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 286.99999809265137,
-        "y": 896.0001878738403,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "2177b708.4ad0a8"
-            ]
-        ]
-    },
-    {
-        "id": "2146fa82.3cb466",
-        "type": "outcome",
-        "name": "Deployed",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 542,
-        "y": 253.00006103515625,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "627cb5ca.b4b61c"
-            ]
-        ]
-    },
-    {
-        "id": "627cb5ca.b4b61c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 607,
-        "y": 327,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "d303102b.4952b",
-                "7ef43213.fd1b9c"
-            ]
-        ]
-    },
-    {
-        "id": "a4ba83eb.986d9",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"A1 Mediator Not Deployed. Aborting A1 Policy creation\" />",
-        "comments": "",
-        "x": 491.9997615814209,
-        "y": 1043.0000467300415,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "47269c5f.7a43c4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1026.0000915527344,
-        "y": 809.000039100647,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "ac7bcc09.16f6"
-            ]
-        ]
-    },
-    {
-        "id": "facedb43.cc1068",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1032.0002746582031,
-        "y": 894.0000238418579,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "149c17e5.9ed988"
-            ]
-        ]
-    },
-    {
-        "id": "149c17e5.9ed988",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1174.9999084472656,
-        "y": 874.000039100647,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "b8e1ec8.114761"
-            ]
-        ]
-    },
-    {
-        "id": "ef7f2ae9.007da8",
-        "type": "set",
-        "name": "set tmp variables for input RPC parms",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$create-policy-instance-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.policy-type-id\" value=\"`$create-policy-instance-input.policy-type-id`\"/>\n<parameter name=\"tmp.policy-instance-id\" value=\"`$create-policy-instance-input.policy-instance-id`\"/>",
-        "comments": "",
-        "x": 824.0010070800781,
-        "y": 601.8891229629517,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "c27de345.6a706",
-        "type": "execute",
-        "name": "Create A1 Policy Instance",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.a1Mediator.url + '/' + $tmp.restapi.policy-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"PUT\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"requestBody\" value=\"`$tmp.a1-mediator-restapi.payload`\"/>\n<parameter name=\"convertResponse\" value=\"false\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 810.0004577636719,
-        "y": 853.0103998184204,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "47269c5f.7a43c4",
-                "facedb43.cc1068"
-            ]
-        ]
-    },
-    {
-        "id": "b537ed30.b52c6",
-        "type": "execute",
-        "name": "generate A1 Mediator URL 1",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.policy`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policy-url\"/>\n    <parameter name=\"target\" value=\"{policy_type_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-type-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 805.0001525878906,
-        "y": 659.0105218887329,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7ef43213.fd1b9c",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 498.00002670288086,
-        "y": 753.0000476837158,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "a3943e2e.44bd3",
-                "ef7f2ae9.007da8",
-                "b537ed30.b52c6",
-                "cb947e00.e3f53",
-                "c27de345.6a706"
-            ]
-        ]
-    },
-    {
-        "id": "cb947e00.e3f53",
-        "type": "execute",
-        "name": "generate A1 Mediator URL 2",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.restapi.policy-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policy-url\"/>\n    <parameter name=\"target\" value=\"{policy_instance_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-instance-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 819.0000305175781,
-        "y": 699.0000238418579,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a3943e2e.44bd3",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Create Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.policy-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$tmp.restapi.policy-url`\"/>\n<parameter name=\"field6\" value=\"`$a1-mediator.restapi-payload`\"/>\n<parameter name=\"field7\" value=\"Temporary A1 Mediatory Payload\"/>\n<parameter name=\"field8\" value=\"`$tmp.a1-mediator-restapi.payload`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 763.0000305175781,
-        "y": 796.0000238418579,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b8e1ec8.114761",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Policy Instance Accepted.\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1344.0000305175781,
-        "y": 875.000039100647,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ac7bcc09.16f6",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error creating A1 Policy Instance. Aborting A1 Policy creation\" />",
-        "comments": "",
-        "x": 1211.0000305175781,
-        "y": 796.0000238418579,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "703f6dc7.f6caf4",
-        "type": "set",
-        "name": "set A1Mediator payload manually",
-        "xml": "<set>\n<parameter name=\"tmp.a1-mediator-restapi.payload\" value='{\"blocking_rate\": 20,\"enforce\": true,\"trigger_threshold\": 10,\"window_length\": 10}'/>",
-        "comments": "",
-        "x": 841.0000305175781,
-        "y": 747.0000238418579,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "62562bdc.8b71e4",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Successful execution of createPolicyInstance RPC' />",
-        "comments": "",
-        "x": 537,
-        "y": 69,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "5f556c15.ff9d34",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2103.7540016174316,
-        "y": 1027.003918170929,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "ffd3de0b.e57d8",
-                "a5746792.21f028",
-                "426e2627.47e6e8"
-            ]
-        ]
-    },
-    {
-        "id": "a5746792.21f028",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2405.7541694641113,
-        "y": 994.0032835006714,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "7cd8c84d.81e0a8",
-                "5ffd4dba.8c3774"
-            ]
-        ]
-    },
-    {
-        "id": "ffd3de0b.e57d8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyInstance'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value=\"None\" />",
-        "comments": "",
-        "x": 2386.4209175109863,
-        "y": 708.0038166046143,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "7cd8c84d.81e0a8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2640.2541122436523,
-        "y": 904.9206104278564,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "ab106710.c0d658"
-            ]
-        ]
-    },
-    {
-        "id": "5ffd4dba.8c3774",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2644.2540321350098,
-        "y": 1043.9204530715942,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "f35b2f30.6d906"
-            ]
-        ]
-    },
-    {
-        "id": "ab106710.c0d658",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2800.2539463043213,
-        "y": 906.9206113815308,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "c07b0869.6c3628"
-            ]
-        ]
-    },
-    {
-        "id": "c07b0869.6c3628",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 2986.2539825439453,
-        "y": 899.9208135604858,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "f35b2f30.6d906",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2827.2536754608154,
-        "y": 1036.9205617904663,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "a2700b22.fdfb98"
-            ]
-        ]
-    },
-    {
-        "id": "a2700b22.fdfb98",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 3015.253875732422,
-        "y": 1025.92085647583,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "426e2627.47e6e8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload Not Required\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2413.2540168762207,
-        "y": 861.458818435669,
-        "z": "778ff71f.21c948",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2177b708.4ad0a8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 365.9999828338623,
-        "y": 972.0001077651978,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "a4ba83eb.986d9",
-                "d3648067.22567",
-                "5f556c15.ff9d34"
-            ]
-        ]
-    },
-    {
-        "id": "d3648067.22567",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Deployed'/>\n",
-        "comments": "",
-        "x": 477.00389671325684,
-        "y": 834.5039262771606,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "2fa6b57e.29105a",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Error creating A1 Mediator Rest API payload string. Aborting A1 Policy Instance creation'/>",
-        "comments": "",
-        "x": 1899.0039443969727,
-        "y": 166.00390911102295,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "47758778.282278",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name=\"response-message\" value=\"Error removing lines from A1 Mediator Rest API payload string. Aborting A1 Policy Instance creation\" />",
-        "comments": "",
-        "x": 1668.5038223266602,
-        "y": 364.0039048194885,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "aefc7d8c.affb7",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name=\"response-message\" value=\"Error removing tabs from A1 Mediator Rest API payload string. Aborting A1 Policy Instance creation\" />",
-        "comments": "",
-        "x": 1613.5036697387695,
-        "y": 611.0039205551147,
-        "z": "778ff71f.21c948",
-        "wires": []
-    },
-    {
-        "id": "4e5b3350.571f7c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 131.00390243530273,
-        "y": 1138.004020690918,
-        "z": "778ff71f.21c948",
-        "wires": [
-            [
-                "1f803634.6e151a",
-                "5f556c15.ff9d34"
-            ]
-        ]
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_createPolicyType.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_createPolicyType.json
deleted file mode 100644
index f604546f..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_createPolicyType.json
+++ /dev/null
@@ -1,1066 +0,0 @@
-[
-    {
-        "id": "da1c0256.907d3",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 175,
-        "y": 107,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "c3842e54.d19ba"
-            ]
-        ]
-    },
-    {
-        "id": "c3842e54.d19ba",
-        "type": "method",
-        "name": "method createPolicyType",
-        "xml": "<method rpc='createPolicyType' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 162,
-        "y": 176,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "829b6d78.3af18"
-            ]
-        ]
-    },
-    {
-        "id": "fac199c6.b8b0d8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Adapter Create Policy Type. RPC Parms:\"/>\n<parameter name=\"field2\" value=\"`$create-policy-type-input.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$create-policy-type-input.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$create-policy-type-input.description`\"/>\n<parameter name=\"field5\" value=\"A1 Adapter Create Policy Type Name:\"/>\n<parameter name=\"field6\" value=\"`$create-policy-type-input.name`\"/>\n<parameter name=\"field7\" value=\"A1 Adapter Create Policy Type. Number of Policy Type Properties\"/>\n<parameter name=\"field8\" value=\"`$create-policy-type-input.properties_length`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 479,
-        "y": 32,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "829b6d78.3af18",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 123,
-        "y": 313,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "fac199c6.b8b0d8",
-                "5390a4d8.c9c1bc",
-                "81f255bc.c262f8",
-                "e07f2f41.f873d",
-                "6562fc0a.7a0914",
-                "113f146b.e7fc1c",
-                "f777d20f.cea71"
-            ]
-        ]
-    },
-    {
-        "id": "c869b560.9e91f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 Adapter is healthy'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 725.0000114440918,
-        "y": 1393.000054359436,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "f7f7a77a.12bc98",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 103,
-        "y": 45,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "da1c0256.907d3"
-            ]
-        ]
-    },
-    {
-        "id": "5390a4d8.c9c1bc",
-        "type": "for",
-        "name": "for 0..properties_length",
-        "xml": "<for index='idx1' start='0' end='`$create-policy-type-input.properties_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 518,
-        "y": 178,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "3fcd8058.1cbb1"
-            ]
-        ]
-    },
-    {
-        "id": "b35175f.9958988",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Adapter Create Policy Type. Properties Number, Name and Number of Policy Statements\"/>\n<parameter name=\"field2\" value=\"`$idx1`\"/>\n<parameter name=\"field3\" value=\"`$create-policy-type-input.properties[$idx1].property-name`\"/>\n<parameter name=\"field4\" value=\"`$create-policy-type-input.properties[$idx1].policy-statements_length`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 890,
-        "y": 20,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e4c6a778.e1aaa8",
-        "type": "execute",
-        "name": "execute TemplateNode",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.template.TemplateNode\" method=\"evaluateTemplate\" >\n    <parameter name='templatePath' value='a1-policy-type-create-schema-property-payload-template.vtl' />\n    <parameter name='output' value='restapi-payload' />\n    <parameter name='prefix' value='a1-mediator' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1099,
-        "y": 92,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "87f254d0.7b3408",
-                "7ed6ebcf.0591e4"
-            ]
-        ]
-    },
-    {
-        "id": "87f254d0.7b3408",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1424,
-        "y": 32,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "80e6a7c8.23e4f8"
-            ]
-        ]
-    },
-    {
-        "id": "80e6a7c8.23e4f8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1615,
-        "y": 30,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "e8793dde.f3218"
-            ]
-        ]
-    },
-    {
-        "id": "e8793dde.f3218",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred A1 Mediator RestAPI payload template as a string\"/>\n<parameter name='field3' value='`$a1-mediator.restapi-payload`' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1794,
-        "y": 30,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4e0cfa4d.d89b44",
-        "type": "execute",
-        "name": "remove new lines",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1-mediator.restapi-payload`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.payload\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1139.500114440918,
-        "y": 248.99999523162842,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "dc9245c2.4db508",
-                "2b40c422.72833c"
-            ]
-        ]
-    },
-    {
-        "id": "a8217c1d.01afc",
-        "type": "execute",
-        "name": "remove tabs",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$tmp.a1-mediator-restapi.payload`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.payload\"/>\n    <parameter name=\"target\" value=\"\\t\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 970.0001373291016,
-        "y": 414.0000100135803,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "7d2d3d36.846374",
-                "a731343e.eb8138"
-            ]
-        ]
-    },
-    {
-        "id": "7d2d3d36.846374",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1138.5001602172852,
-        "y": 374.00002098083496,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "dffd4016.02da"
-            ]
-        ]
-    },
-    {
-        "id": "dffd4016.02da",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1301.500129699707,
-        "y": 370.0000219345093,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "e27a3881.71afb8"
-            ]
-        ]
-    },
-    {
-        "id": "e27a3881.71afb8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template with tabs removed \\r\"/>\n<parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1471.5001602172852,
-        "y": 364.00001335144043,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dc9245c2.4db508",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1330.000129699707,
-        "y": 211.99999523162842,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "c7f75df2.76888"
-            ]
-        ]
-    },
-    {
-        "id": "c7f75df2.76888",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1489.000129699707,
-        "y": 213.00001049041748,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "5e63ce8a.af52a"
-            ]
-        ]
-    },
-    {
-        "id": "5e63ce8a.af52a",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template with lines removed \\r\"/>\n<parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1647.0001602172852,
-        "y": 210.0000023841858,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7ed6ebcf.0591e4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1406,
-        "y": 134,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "81458744.601ef8"
-            ]
-        ]
-    },
-    {
-        "id": "81458744.601ef8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1799.9999389648438,
-        "y": 120.99999904632568,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "bacbbc8a.f6941",
-                "995c6b22.95ff88",
-                "dc754e34.18b86"
-            ]
-        ]
-    },
-    {
-        "id": "bacbbc8a.f6941",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name='response-message' value='Error creating A1 Mediator Rest API payload string. Aborting A1 Policy Type creation'/>",
-        "comments": "",
-        "x": 1776.9998474121094,
-        "y": 175.0000057220459,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "2b40c422.72833c",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1337.000114440918,
-        "y": 297.9999952316284,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "9a83fc16.7714e"
-            ]
-        ]
-    },
-    {
-        "id": "9a83fc16.7714e",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1591.0000686645508,
-        "y": 289.99999475479126,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "22fbcd27.4e5fd2",
-                "548d546b.d9cedc",
-                "dc754e34.18b86"
-            ]
-        ]
-    },
-    {
-        "id": "22fbcd27.4e5fd2",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error removing lines from A1 Mediator Rest API payload string. Aborting A1 Policy creation\" />",
-        "comments": "",
-        "x": 1628.9997940063477,
-        "y": 362.0000219345093,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "a731343e.eb8138",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1148.0001373291016,
-        "y": 464.99999952316284,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "d4189ca3.d0364"
-            ]
-        ]
-    },
-    {
-        "id": "d4189ca3.d0364",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1528.000129699707,
-        "y": 469.00002098083496,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "9eb173db.93145",
-                "32ec5dff.471c32",
-                "dc754e34.18b86"
-            ]
-        ]
-    },
-    {
-        "id": "9eb173db.93145",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error removing tabs from A1 Mediator Rest API payload string. Aborting A1 Policy creation\" />",
-        "comments": "",
-        "x": 1482.000099182129,
-        "y": 556.0000219345093,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "c1612317.d0711",
-        "type": "block",
-        "name": "A1 Mediator Payload Generation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 791,
-        "y": 197,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "e4c6a778.e1aaa8",
-                "4e0cfa4d.d89b44",
-                "a8217c1d.01afc"
-            ]
-        ]
-    },
-    {
-        "id": "81f255bc.c262f8",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 516,
-        "y": 127,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e07f2f41.f873d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Properties read .. A1 Mediator Target\"/>\n<parameter name=\"field2\" value=\"`$prop.oofpcipoc.patch.pci.target`\"/>\n<parameter name=\"field3\" value=\"`$prop.controller.user`\"/>\n<parameter name=\"field4\" value=\"`$prop.controller.pwd`\"/>\n<parameter name=\"field5\" value=\"`$prop.controller.url`\"/>\n<parameter name=\"field6\" value=\"A1 Mediator deployed (true/false): \"/>\n<parameter name=\"field7\" value=\"`$prop.ric-plt-A1Mediator-deployed`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 493,
-        "y": 211,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6562fc0a.7a0914",
-        "type": "switchNode",
-        "name": "A1 Mediator Deployed",
-        "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 360,
-        "y": 322,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "9c23b632.e02c18",
-                "b1e5fe91.97aa5"
-            ]
-        ]
-    },
-    {
-        "id": "9c23b632.e02c18",
-        "type": "outcome",
-        "name": "Not Deployed",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 576.0000076293945,
-        "y": 1002.0001735687256,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "273be5b.9b1061a"
-            ]
-        ]
-    },
-    {
-        "id": "b1e5fe91.97aa5",
-        "type": "outcome",
-        "name": "Deployed",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 543,
-        "y": 258.00006103515625,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "9ed89566.9ebd78"
-            ]
-        ]
-    },
-    {
-        "id": "9ed89566.9ebd78",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 608,
-        "y": 334,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "c1612317.d0711",
-                "56d9853f.f02f6c"
-            ]
-        ]
-    },
-    {
-        "id": "273be5b.9b1061a",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 720.9999961853027,
-        "y": 1080.9999904632568,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "735341e0.7cf62",
-                "f00de33f.958a3",
-                "dc754e34.18b86"
-            ]
-        ]
-    },
-    {
-        "id": "735341e0.7cf62",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"A1 Mediator Not Deployed. Aborting A1 Policy creation\" />\n",
-        "comments": "",
-        "x": 756.9997673034668,
-        "y": 1214.000012397766,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "822e4be6.9aeb88",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1217.0000915527344,
-        "y": 742.0000071525574,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "dcbc720c.e12ad"
-            ]
-        ]
-    },
-    {
-        "id": "cbddba75.75b3e8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1223.0002746582031,
-        "y": 826.9999918937683,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "5402f03c.8e47d"
-            ]
-        ]
-    },
-    {
-        "id": "5402f03c.8e47d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1367.9999084472656,
-        "y": 809.0000071525574,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "bf840c18.42a18"
-            ]
-        ]
-    },
-    {
-        "id": "1ad8db0a.f4e495",
-        "type": "set",
-        "name": "set tmp variables for input RPC parms",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$create-policy-type-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.policy-type-id\" value=\"`$create-policy-type-input.policy-type-id`\"/>\n<parameter name=\"tmp.name\" value=\"`$create-policy-type-input.name`\"/>\n<parameter name=\"tmp.description\" value=\"`$create-policy-type-input.description`\"/>",
-        "comments": "",
-        "x": 1017.0010070800781,
-        "y": 539.8890910148621,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "762f3a72.743d14",
-        "type": "execute",
-        "name": "Create A1 Policy Type",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.a1Mediator.url + '/' + $tmp.restapi.policytype-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"PUT\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"requestBody\" value=\"`$tmp.a1-mediator-restapi.payload`\"/>\n<parameter name=\"convertResponse\" value=\"false\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1000.0004577636719,
-        "y": 785.0103678703308,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "822e4be6.9aeb88",
-                "cbddba75.75b3e8"
-            ]
-        ]
-    },
-    {
-        "id": "bf555fa7.85bc1",
-        "type": "execute",
-        "name": "generate A1 Mediator URL",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.policytype`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policytype-url\"/>\n    <parameter name=\"target\" value=\"{policy_type_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-type-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 996.0001525878906,
-        "y": 596.0104899406433,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "56d9853f.f02f6c",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 696.0000305175781,
-        "y": 622.9999918937683,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "309907cb.88b8b8",
-                "1ad8db0a.f4e495",
-                "bf555fa7.85bc1",
-                "762f3a72.743d14"
-            ]
-        ]
-    },
-    {
-        "id": "309907cb.88b8b8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Create Policy Type.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.name`\"/>\n<parameter name=\"field5\" value=\"`$tmp.restapi.policytype-url`\"/>\n<parameter name=\"field6\" value=\"`$a1-mediator.restapi-payload`\"/>\n<parameter name=\"field7\" value=\"Temporary A1 Mediatory Payload\"/>\n<parameter name=\"field8\" value=\"`$tmp.a1-mediator-restapi.payload`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 972.0000305175781,
-        "y": 712.9999918937683,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bf840c18.42a18",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Policy Type Accepted.\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1538.0000305175781,
-        "y": 810.9999918937683,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1d14eb24.f639b5",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error creating A1 Policy Policy. Aborting A1 Policy Type creation\" />",
-        "comments": "",
-        "x": 1422.0001602172852,
-        "y": 740.0000019073486,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "ed6f54ef.6ff228",
-        "type": "set",
-        "name": "set A1Mediator payload manually",
-        "xml": "<set>\n<parameter name=\"tmp.a1-mediator-restapi.payload\" value='{\"blocking_rate\": 20,\"enforce\": true,\"trigger_threshold\": 10,\"window_length\": 10}'/>",
-        "comments": "",
-        "x": 1019.0000305175781,
-        "y": 655.9999918937683,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "3fcd8058.1cbb1",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 714,
-        "y": 24,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "b35175f.9958988",
-                "cf4806a1.1d1598"
-            ]
-        ]
-    },
-    {
-        "id": "cf4806a1.1d1598",
-        "type": "for",
-        "name": "for 0..policy-statements_length",
-        "xml": "<for index='idx2' start='0' end='`$create-policy-type-input.properties[$idx1].policy-statements_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 803,
-        "y": 110,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "4675b56e.9a221c"
-            ]
-        ]
-    },
-    {
-        "id": "4675b56e.9a221c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Adapter Create Policy Type. Policy Statements for policy statement # \"/>\n<parameter name=\"field2\" value=\"`$idx2`\"/>\n<parameter name=\"field3\" value=\"`$create-policy-type-input.properties[$idx1].policy-statements[$idx2].policy-statement`\"/>\n<parameter name=\"field4\" value=\"`$create-policy-type-input.properties[$idx1].policy-statements[$idx2].policy-statement-value`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1020,
-        "y": 38,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "113f146b.e7fc1c",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Successful execution of createPolicyType RPC' />",
-        "comments": "",
-        "x": 518,
-        "y": 81,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "dc754e34.18b86",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2218.5039672851562,
-        "y": 818.004011631012,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "5784d302.e1710c",
-                "aed8c8e.3c55c38",
-                "98b8cae1.792f68"
-            ]
-        ]
-    },
-    {
-        "id": "aed8c8e.3c55c38",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2490.504165649414,
-        "y": 960.0033769607544,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "93cfbb9d.b9c5a8",
-                "d2616a2c.825ff8"
-            ]
-        ]
-    },
-    {
-        "id": "5784d302.e1710c",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyType'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value=\"None\" />",
-        "comments": "",
-        "x": 2471.170913696289,
-        "y": 674.0039100646973,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "93cfbb9d.b9c5a8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2725.004108428955,
-        "y": 870.9207038879395,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "15bde2a9.106a0d"
-            ]
-        ]
-    },
-    {
-        "id": "d2616a2c.825ff8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2729.0040283203125,
-        "y": 1009.9205465316772,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "801c250c.9459d8"
-            ]
-        ]
-    },
-    {
-        "id": "15bde2a9.106a0d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2885.003942489624,
-        "y": 872.9207048416138,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "13abffa9.da7d8"
-            ]
-        ]
-    },
-    {
-        "id": "13abffa9.da7d8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 3067.003673553467,
-        "y": 863.9207806587219,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "801c250c.9459d8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2912.003671646118,
-        "y": 1002.9206552505493,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "682c6ff7.cfcce"
-            ]
-        ]
-    },
-    {
-        "id": "682c6ff7.cfcce",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 3100.0038719177246,
-        "y": 991.9209499359131,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "98b8cae1.792f68",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload Not Required\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2498.0040130615234,
-        "y": 827.458911895752,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f777d20f.cea71",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 602.0039024353027,
-        "y": 1318.753975868225,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "c869b560.9e91f8",
-                "dc754e34.18b86"
-            ]
-        ]
-    },
-    {
-        "id": "f00de33f.958a3",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Deployed'/>\n",
-        "comments": "",
-        "x": 813.00390625,
-        "y": 948.7540035247803,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "995c6b22.95ff88",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Error creating A1 Mediator Rest API payload string. Aborting A1 Policy Type creation'/>",
-        "comments": "",
-        "x": 1981.7541809082031,
-        "y": 51.00389862060547,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "548d546b.d9cedc",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name=\"response-message\" value=\"Error removing lines from A1 Mediator Rest API payload string. Aborting A1 Policy creation\" />",
-        "comments": "",
-        "x": 1766.25390625,
-        "y": 264.00390625,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "32ec5dff.471c32",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name=\"response-message\" value=\"Error removing tabs from A1 Mediator Rest API payload string. Aborting A1 Policy creation\" />",
-        "comments": "",
-        "x": 1675.25390625,
-        "y": 430.00390625,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "e80eb11c.f708b",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name=\"response-message\" value=\"Error creating A1 Policy Policy. Aborting A1 Policy Type creation\" />",
-        "comments": "",
-        "x": 1644.2539749145508,
-        "y": 600.7539310455322,
-        "z": "33d2d73b.2b05a8",
-        "wires": []
-    },
-    {
-        "id": "dcbc720c.e12ad",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1358.25390625,
-        "y": 670.75390625,
-        "z": "33d2d73b.2b05a8",
-        "wires": [
-            [
-                "1d14eb24.f639b5",
-                "e80eb11c.f708b",
-                "dc754e34.18b86"
-            ]
-        ]
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json
new file mode 100644
index 00000000..89c14a88
--- /dev/null
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json
@@ -0,0 +1,317 @@
+[
+    {
+        "id": "7c435ae3.69565c",
+        "type": "service-logic",
+        "name": "A1-ADAPTER-API ${project.version}",
+        "module": "A1-ADAPTER-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 188,
+        "y": 153,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "710b1a71.cbae84"
+            ]
+        ]
+    },
+    {
+        "id": "710b1a71.cbae84",
+        "type": "method",
+        "name": "method deleteA1Policy",
+        "xml": "<method rpc='deleteA1Policy' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 248,
+        "y": 273,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "4378a18e.7f739"
+            ]
+        ]
+    },
+    {
+        "id": "6ce20bdf.ad9a1c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete Policy:\"/>\n<parameter name=\"field2\" value=\"`$delete-a1-policy-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 712,
+        "y": 87,
+        "z": "cb244f73.c06648",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4378a18e.7f739",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 453,
+        "y": 227,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "6ce20bdf.ad9a1c",
+                "e5238148.fd374",
+                "bdf5754e.9b53f8",
+                "7e804e03.9c90b",
+                "fb64d04f.8f7d68"
+            ]
+        ]
+    },
+    {
+        "id": "ee4edddb.f32858",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 120,
+        "y": 89,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "7c435ae3.69565c"
+            ]
+        ]
+    },
+    {
+        "id": "e5238148.fd374",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicy executed successfully' />",
+        "comments": "",
+        "x": 753.0000610351562,
+        "y": 142,
+        "z": "cb244f73.c06648",
+        "wires": []
+    },
+    {
+        "id": "bdf5754e.9b53f8",
+        "type": "execute",
+        "name": "execute Properties",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 752,
+        "y": 195,
+        "z": "cb244f73.c06648",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fb64d04f.8f7d68",
+        "type": "block",
+        "name": "A1 Mediator RestAPI Invocation",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 782.0001220703125,
+        "y": 279,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "3f182409.0c3914",
+                "e320e99b.0be3e",
+                "a9c27d26.b87628"
+            ]
+        ]
+    },
+    {
+        "id": "e320e99b.0be3e",
+        "type": "set",
+        "name": "set tmp variables for A1 Mediator REST API call",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$delete-a1-policy-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "x": 1144.00146484375,
+        "y": 171.88912963867188,
+        "z": "cb244f73.c06648",
+        "wires": []
+    },
+    {
+        "id": "3f182409.0c3914",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Delete Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1032.0001220703125,
+        "y": 261,
+        "z": "cb244f73.c06648",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a9c27d26.b87628",
+        "type": "execute",
+        "name": "Delete Policy Instance",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"false\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1077.0006103515625,
+        "y": 343.0104064941406,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "17d809ef.941376",
+                "c9c13643.42fb78"
+            ]
+        ]
+    },
+    {
+        "id": "17d809ef.941376",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1304,
+        "y": 412.0001220703125,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "8a649ed7.63deb"
+            ]
+        ]
+    },
+    {
+        "id": "c9c13643.42fb78",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1294.000244140625,
+        "y": 257.0000305175781,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "d953eb99.f4fcc"
+            ]
+        ]
+    },
+    {
+        "id": "cafd39a2.e592f",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error in Deleting A1 Policy Instance. Aborting\" />",
+        "comments": "",
+        "x": 1627.0006103515625,
+        "y": 467.00006103515625,
+        "z": "cb244f73.c06648",
+        "wires": []
+    },
+    {
+        "id": "d953eb99.f4fcc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1467.9998779296875,
+        "y": 257.00006103515625,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "b7919ed2.bc4b8",
+                "76b0ec4a.812af4"
+            ]
+        ]
+    },
+    {
+        "id": "b7919ed2.bc4b8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Delete Policy Information \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp.httpResponse`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1625,
+        "y": 203,
+        "z": "cb244f73.c06648",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2d7fa547.79bee2",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
+        "comments": "",
+        "x": 1600.75390625,
+        "y": 360.00390625,
+        "z": "cb244f73.c06648",
+        "wires": []
+    },
+    {
+        "id": "7e804e03.9c90b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 715.75390625,
+        "y": 451.00390625,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "23ec5862.ce8f7"
+            ]
+        ]
+    },
+    {
+        "id": "23ec5862.ce8f7",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicyInstance executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
+        "comments": "",
+        "x": 876.7539672851562,
+        "y": 451.00396728515625,
+        "z": "cb244f73.c06648",
+        "wires": []
+    },
+    {
+        "id": "8a649ed7.63deb",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1459.00390625,
+        "y": 411.0039367675781,
+        "z": "cb244f73.c06648",
+        "wires": [
+            [
+                "2d7fa547.79bee2",
+                "cafd39a2.e592f"
+            ]
+        ]
+    },
+    {
+        "id": "76b0ec4a.812af4",
+        "type": "execute",
+        "name": "set",
+        "xml": "<set>\n<parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1631,
+        "y": 307,
+        "z": "cb244f73.c06648",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deletePolicyInstance.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deletePolicyInstance.json
deleted file mode 100644
index 849dd431..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deletePolicyInstance.json
+++ /dev/null
@@ -1,608 +0,0 @@
-[
-    {
-        "id": "b3dee81c.fd9fe8",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 192.00390625,
-        "y": 97.00390625,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "7531c732.0898e8"
-            ]
-        ]
-    },
-    {
-        "id": "7531c732.0898e8",
-        "type": "method",
-        "name": "method deletePolicyInstance",
-        "xml": "<method rpc='deletePolicyInstance' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 253.00390625,
-        "y": 217.00390625,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "72c936dc.603938"
-            ]
-        ]
-    },
-    {
-        "id": "6a117f5a.9254b",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete Policy Instance  associated with Near RT RIC ID and Policy Type ID\"/>\n<parameter name=\"field2\" value=\"`$delete-policy-instance-input.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$delete-policy-instance-input.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$delete-policy-instance-input.policy-instance-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 717.00390625,
-        "y": 32.00390625,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "72c936dc.603938",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 458.00390625,
-        "y": 171.00390625,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "6a117f5a.9254b",
-                "ecd8c4ad.08ac98",
-                "458ad2c3.2d487c",
-                "baafc628.405a18",
-                "e08e23bc.b70f2"
-            ]
-        ]
-    },
-    {
-        "id": "c86b6da1.9de53",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 125.00390625,
-        "y": 33.00390625,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "b3dee81c.fd9fe8"
-            ]
-        ]
-    },
-    {
-        "id": "ecd8c4ad.08ac98",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicyInstance executed successfully' />",
-        "comments": "",
-        "x": 757.0039520263672,
-        "y": 86.00390720367432,
-        "z": "5e51bc9d.e46964",
-        "wires": []
-    },
-    {
-        "id": "458ad2c3.2d487c",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 757.00390625,
-        "y": 139.00390625,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "baafc628.405a18",
-        "type": "switchNode",
-        "name": "A1 Mediator Deployed",
-        "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 707.00390625,
-        "y": 195.00390625,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "42bb6a38.fa2904",
-                "ad7b68a5.0e8c88"
-            ]
-        ]
-    },
-    {
-        "id": "ad7b68a5.0e8c88",
-        "type": "outcome",
-        "name": "Deployed",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 991.0039520263672,
-        "y": 55.003971576690674,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "f3de5fc8.2216b"
-            ]
-        ]
-    },
-    {
-        "id": "f3de5fc8.2216b",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 968.0040016174316,
-        "y": 201.00392389297485,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "3f0f3f98.816a2"
-            ]
-        ]
-    },
-    {
-        "id": "42bb6a38.fa2904",
-        "type": "outcome",
-        "name": "Not Deployed",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 944.0039749145508,
-        "y": 490.0039677619934,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "a58a5c2a.38d89"
-            ]
-        ]
-    },
-    {
-        "id": "a58a5c2a.38d89",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1159.0040130615234,
-        "y": 619.0039205551147,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "5165256d.575c6c",
-                "bb41aaa6.4825a8",
-                "8e65316c.ffc44"
-            ]
-        ]
-    },
-    {
-        "id": "5165256d.575c6c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in Deleting A1 Policy Instance. Aborting\" />",
-        "comments": "",
-        "x": 1289.0038299560547,
-        "y": 700.0039048194885,
-        "z": "5e51bc9d.e46964",
-        "wires": []
-    },
-    {
-        "id": "3f0f3f98.816a2",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1162.0040130615234,
-        "y": 312.00391072034836,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "79579072.27faa",
-                "7e882622.458f98",
-                "908f8d2f.0fe18",
-                "4294725c.c0125c",
-                "e8970148.2dc5a",
-                "c07e70d5.3a2f8"
-            ]
-        ]
-    },
-    {
-        "id": "7e882622.458f98",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$delete-policy-instance-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.policy-type-id\" value=\"`$delete-policy-instance-input.policy-type-id`\"/>\n<parameter name=\"tmp.policy-instance-id\" value=\"`$delete-policy-instance-input.policy-instance-id`\"/>\n",
-        "comments": "",
-        "x": 1500.00537109375,
-        "y": 109.89303684234619,
-        "z": "5e51bc9d.e46964",
-        "wires": []
-    },
-    {
-        "id": "79579072.27faa",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Delete Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.policy-instance-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1421.0040016174316,
-        "y": 163.00390911102295,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "908f8d2f.0fe18",
-        "type": "execute",
-        "name": "Delete Policy Instance",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.a1Mediator.url + '/' + $tmp.restapi.policyinstance-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"false\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1439.0045166015625,
-        "y": 366.0143041610718,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "d810ec63.b8faf",
-                "3bf068e7.a26b38"
-            ]
-        ]
-    },
-    {
-        "id": "d810ec63.b8faf",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1415.0039367675781,
-        "y": 463.00401973724365,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "e087b19.28e325"
-            ]
-        ]
-    },
-    {
-        "id": "3bf068e7.a26b38",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1659.0041809082031,
-        "y": 334.0039281845093,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "52049fa8.37edd"
-            ]
-        ]
-    },
-    {
-        "id": "ba304eb3.e7474",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in Deleting A1 Policy Instance. Aborting\" />",
-        "comments": "",
-        "x": 1575.0045166015625,
-        "y": 570.0039892196655,
-        "z": "5e51bc9d.e46964",
-        "wires": []
-    },
-    {
-        "id": "52049fa8.37edd",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1809.0037860870361,
-        "y": 298.00395822525024,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "ba44f2a5.266a8"
-            ]
-        ]
-    },
-    {
-        "id": "ba44f2a5.266a8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details of A1 Policy Instance \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1989.0039100646973,
-        "y": 272.00390911102295,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bb41aaa6.4825a8",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1945.0040283203125,
-        "y": 667.0040578842163,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "2bd93f6c.4a183",
-                "25222249.29d39e",
-                "a02a20c9.bb14d"
-            ]
-        ]
-    },
-    {
-        "id": "25222249.29d39e",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2294.0042266845703,
-        "y": 845.0034625530243,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "77c16af2.fd1fd4",
-                "231b7cfe.e2f364"
-            ]
-        ]
-    },
-    {
-        "id": "2bd93f6c.4a183",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='deletePolicyInstance'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value=\"Working On it\" />",
-        "comments": "",
-        "x": 2283.670944213867,
-        "y": 636.0040187835693,
-        "z": "5e51bc9d.e46964",
-        "wires": []
-    },
-    {
-        "id": "77c16af2.fd1fd4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2509.5041122436523,
-        "y": 767.9207663536072,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "72d0fe4c.a2b34"
-            ]
-        ]
-    },
-    {
-        "id": "231b7cfe.e2f364",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2513.5040321350098,
-        "y": 906.920608997345,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "5c8fc4f2.ab84fc"
-            ]
-        ]
-    },
-    {
-        "id": "72d0fe4c.a2b34",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2669.5039463043213,
-        "y": 769.9207673072815,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "575b220d.c9b55c"
-            ]
-        ]
-    },
-    {
-        "id": "575b220d.c9b55c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 2851.503677368164,
-        "y": 760.9208431243896,
-        "z": "5e51bc9d.e46964",
-        "wires": []
-    },
-    {
-        "id": "5c8fc4f2.ab84fc",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2696.5036754608154,
-        "y": 899.920717716217,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "98081928.21ec28"
-            ]
-        ]
-    },
-    {
-        "id": "98081928.21ec28",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2882.5038299560547,
-        "y": 887.9210414886475,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a02a20c9.bb14d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2292.504165649414,
-        "y": 727.4589986801147,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8e65316c.ffc44",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Deployed'/>\n",
-        "comments": "",
-        "x": 1339.0041160583496,
-        "y": 553.0038986206055,
-        "z": "5e51bc9d.e46964",
-        "wires": []
-    },
-    {
-        "id": "b0a0c33e.2eea7",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
-        "comments": "",
-        "x": 1734.757869720459,
-        "y": 399.00780391693115,
-        "z": "5e51bc9d.e46964",
-        "wires": []
-    },
-    {
-        "id": "e08e23bc.b70f2",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 700.7578010559082,
-        "y": 809.0078420639038,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "629d6c66.04ac24",
-                "bb41aaa6.4825a8"
-            ]
-        ]
-    },
-    {
-        "id": "629d6c66.04ac24",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicyInstance executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 855.7578887939453,
-        "y": 893.0078468322754,
-        "z": "5e51bc9d.e46964",
-        "wires": []
-    },
-    {
-        "id": "e087b19.28e325",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1561.0077781677246,
-        "y": 466.0078344345093,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            [
-                "b0a0c33e.2eea7",
-                "bb41aaa6.4825a8",
-                "ba304eb3.e7474"
-            ]
-        ]
-    },
-    {
-        "id": "4294725c.c0125c",
-        "type": "execute",
-        "name": "generate A1 Mediator URL 1",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.policy`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policyinstance-url\"/>\n    <parameter name=\"target\" value=\"{policy_type_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-type-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1497.0044250488281,
-        "y": 211.00390911102295,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e8970148.2dc5a",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Delete Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.policy-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$tmp.restapi.policyinstance-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1437.0046348571777,
-        "y": 302.88250637054443,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c07e70d5.3a2f8",
-        "type": "execute",
-        "name": "generate A1 Mediator URL 2",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.restapi.policyinstance-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policyinstance-url\"/>\n    <parameter name=\"target\" value=\"{policy_instance_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-instance-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1496.2538757324219,
-        "y": 261.00391244888306,
-        "z": "5e51bc9d.e46964",
-        "wires": [
-            []
-        ]
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deletePolicyType.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deletePolicyType.json
deleted file mode 100644
index 91f210c9..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deletePolicyType.json
+++ /dev/null
@@ -1,629 +0,0 @@
-[
-    {
-        "id": "528161c6.ca5cc",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 222.00390625,
-        "y": 126.00390625,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "570dbd6.b447044"
-            ]
-        ]
-    },
-    {
-        "id": "570dbd6.b447044",
-        "type": "method",
-        "name": "method deletePolicyType",
-        "xml": "<method rpc='deletePolicyType' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 285.00391387939453,
-        "y": 249.00391578674316,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "a960170a.25ddb8"
-            ]
-        ]
-    },
-    {
-        "id": "28f744fe.e4b2dc",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete Policy Type from Near RT RIC ID\"/>\n<parameter name=\"field2\" value=\"`$delete-policy-type-input.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$delete-policy-type-input.policy-type-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 748.0039215087891,
-        "y": 64.00390481948853,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a960170a.25ddb8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 488.00390625,
-        "y": 200.00390625,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "28f744fe.e4b2dc",
-                "bef5d8a0.98d8d8",
-                "886fc2e2.c002c",
-                "213c6c30.2b9d94",
-                "e9d83a7c.da03c8"
-            ]
-        ]
-    },
-    {
-        "id": "47be5f8d.0adad",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 155.00390625,
-        "y": 62.00390625,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "528161c6.ca5cc"
-            ]
-        ]
-    },
-    {
-        "id": "bef5d8a0.98d8d8",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicyType executed successfully' />",
-        "comments": "",
-        "x": 787.0040130615234,
-        "y": 115.00390434265137,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "886fc2e2.c002c",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 787.00390625,
-        "y": 168.00390625,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "213c6c30.2b9d94",
-        "type": "switchNode",
-        "name": "A1 Mediator Deployed",
-        "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 737.00390625,
-        "y": 224.00390625,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "e51fb4c1.a78c38",
-                "e80e3882.d37798"
-            ]
-        ]
-    },
-    {
-        "id": "e80e3882.d37798",
-        "type": "outcome",
-        "name": "Deployed",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1021.0039520263672,
-        "y": 84.00397157669067,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "6dd79b4a.5d7ee4"
-            ]
-        ]
-    },
-    {
-        "id": "6dd79b4a.5d7ee4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 998.0040016174316,
-        "y": 230.00392389297485,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "abbff9fc.ef6df8"
-            ]
-        ]
-    },
-    {
-        "id": "e51fb4c1.a78c38",
-        "type": "outcome",
-        "name": "Not Deployed",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 974.0039749145508,
-        "y": 519.0039677619934,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "d5da56ba.4ea078"
-            ]
-        ]
-    },
-    {
-        "id": "d5da56ba.4ea078",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1189.0040130615234,
-        "y": 648.0039205551147,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "80281362.5baa8",
-                "a218740b.e03078",
-                "44ff6d07.0fa8a4"
-            ]
-        ]
-    },
-    {
-        "id": "80281362.5baa8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"A1 Mediator Not Deployed. Aborting Policy Delete\" />",
-        "comments": "",
-        "x": 1314.0037689208984,
-        "y": 729.0039050579071,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "abbff9fc.ef6df8",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1192.0040130615234,
-        "y": 341.00391072034836,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "76c6cf0a.1a173",
-                "59b120e4.f40e1",
-                "c40bc3d7.346b7",
-                "960ee141.dd015",
-                "903b4506.e4f458"
-            ]
-        ]
-    },
-    {
-        "id": "59b120e4.f40e1",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$delete-policy-type-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.policy-type-id\" value=\"`$delete-policy-type-input.policy-type-id`\"/>",
-        "comments": "",
-        "x": 1539.0054321289062,
-        "y": 179.8930459022522,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "76c6cf0a.1a173",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Delete Policy Type.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.restapi.policytype-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1454.0040550231934,
-        "y": 333.0039167404175,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c40bc3d7.346b7",
-        "type": "execute",
-        "name": "Delete  Policy Type",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.a1Mediator.url + '/' + $tmp.restapi.policytype-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"false\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1482.0045776367188,
-        "y": 405.01428031921387,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "1d585b60.0cc545",
-                "359283da.4d5d6c"
-            ]
-        ]
-    },
-    {
-        "id": "1d585b60.0cc545",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1445.0039367675781,
-        "y": 492.00401973724365,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "c2e429d5.e069b8"
-            ]
-        ]
-    },
-    {
-        "id": "359283da.4d5d6c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1689.0041809082031,
-        "y": 363.0039281845093,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "42c902a9.e4df7c"
-            ]
-        ]
-    },
-    {
-        "id": "23c85e16.e15d92",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error in Delete Policy. Aborting\" />",
-        "comments": "",
-        "x": 1605.0045166015625,
-        "y": 599.0039892196655,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "42c902a9.e4df7c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1839.0037860870361,
-        "y": 327.00395822525024,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "e5100108.3dca4"
-            ]
-        ]
-    },
-    {
-        "id": "e5100108.3dca4",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete policy type operation executed against A1 Mediator \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2026.0040035247803,
-        "y": 318.0039052963257,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a218740b.e03078",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1975.0040283203125,
-        "y": 696.0040578842163,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "8220447b.8289d8",
-                "1dba3ab6.471df5",
-                "942029f7.65a818"
-            ]
-        ]
-    },
-    {
-        "id": "1dba3ab6.471df5",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2324.0042266845703,
-        "y": 874.0034625530243,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "b33ac859.8eb828",
-                "b9c18111.fc69a"
-            ]
-        ]
-    },
-    {
-        "id": "8220447b.8289d8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='deletePolicyType'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value=\"Working On it\" />",
-        "comments": "",
-        "x": 2318.670913696289,
-        "y": 670.004056930542,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "b33ac859.8eb828",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2539.5041122436523,
-        "y": 796.9207663536072,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "625161a.b68eea"
-            ]
-        ]
-    },
-    {
-        "id": "b9c18111.fc69a",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2543.5040321350098,
-        "y": 935.920608997345,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "3ca9895c.5c6906"
-            ]
-        ]
-    },
-    {
-        "id": "625161a.b68eea",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2699.5039463043213,
-        "y": 798.9207673072815,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "f57ce8d7.112bf8"
-            ]
-        ]
-    },
-    {
-        "id": "f57ce8d7.112bf8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 2881.503677368164,
-        "y": 789.9208431243896,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "3ca9895c.5c6906",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2726.5036754608154,
-        "y": 928.920717716217,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "53f57334.ecf73c"
-            ]
-        ]
-    },
-    {
-        "id": "53f57334.ecf73c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2913.5039825439453,
-        "y": 918.9210071563721,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "942029f7.65a818",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2322.504165649414,
-        "y": 756.4589986801147,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "44ff6d07.0fa8a4",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Deployed'/>\n",
-        "comments": "",
-        "x": 1394.004238128662,
-        "y": 585.0038967132568,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "9346d287.a0b54",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
-        "comments": "",
-        "x": 1770.7577896118164,
-        "y": 438.00782680511475,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "e9d83a7c.da03c8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 730.7578010559082,
-        "y": 838.0078420639038,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "c1eda177.24fc5",
-                "a218740b.e03078"
-            ]
-        ]
-    },
-    {
-        "id": "c1eda177.24fc5",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 Adapter is healthy'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 880.7578449249268,
-        "y": 920.0078115463257,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "c2e429d5.e069b8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1591.0077781677246,
-        "y": 495.0078344345093,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            [
-                "9346d287.a0b54",
-                "a218740b.e03078",
-                "23c85e16.e15d92"
-            ]
-        ]
-    },
-    {
-        "id": "f4535bee.c15298",
-        "type": "set",
-        "name": "set tmp variables for input RPC parms",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$create-policy-type-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.policy-type-id\" value=\"`$create-policy-type-input.policy-type-id`\"/>\n<parameter name=\"tmp.name\" value=\"`$create-policy-type-input.name`\"/>\n<parameter name=\"tmp.description\" value=\"`$create-policy-type-input.description`\"/>",
-        "comments": "",
-        "x": 214.00390625,
-        "y": 491.00390625,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "960ee141.dd015",
-        "type": "execute",
-        "name": "generate A1 Mediator URL",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.policytype`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policytype-url\"/>\n    <parameter name=\"target\" value=\"{policy_type_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-type-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1522.0032653808594,
-        "y": 282.12531089782715,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "46b5244a.8aaaac",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Create Policy Type.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.name`\"/>\n<parameter name=\"field5\" value=\"`$tmp.restapi.policytype-url`\"/>\n<parameter name=\"field6\" value=\"`$a1-mediator.restapi-payload`\"/>\n<parameter name=\"field7\" value=\"Temporary A1 Mediatory Payload\"/>\n<parameter name=\"field8\" value=\"`$tmp.a1-mediator-restapi.payload`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 169.0029296875,
-        "y": 664.1148071289062,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "55b4ff0a.c8ef9",
-        "type": "set",
-        "name": "set A1Mediator payload manually",
-        "xml": "<set>\n<parameter name=\"tmp.a1-mediator-restapi.payload\" value='{\"blocking_rate\": 20,\"enforce\": true,\"trigger_threshold\": 10,\"window_length\": 10}'/>",
-        "comments": "",
-        "x": 216.0029296875,
-        "y": 607.1148071289062,
-        "z": "bd2d1622.7875d8",
-        "wires": []
-    },
-    {
-        "id": "903b4506.e4f458",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Delete Policy Type.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1458.0038719177246,
-        "y": 231.00391292572021,
-        "z": "bd2d1622.7875d8",
-        "wires": [
-            []
-        ]
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1Policy.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1Policy.json
new file mode 100644
index 00000000..65f97d08
--- /dev/null
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1Policy.json
@@ -0,0 +1,332 @@
+[
+    {
+        "id": "9623ac21.784518",
+        "type": "service-logic",
+        "name": "A1-ADAPTER-API ${project.version}",
+        "module": "A1-ADAPTER-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 168,
+        "y": 142,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "ccd84436.04e408"
+            ]
+        ]
+    },
+    {
+        "id": "ccd84436.04e408",
+        "type": "method",
+        "name": "method getA1Policy",
+        "xml": "<method rpc='getA1Policy' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 227,
+        "y": 263,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "c915f152.8fae9"
+            ]
+        ]
+    },
+    {
+        "id": "7b756479.f5b4c4",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 691,
+        "y": 77,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c915f152.8fae9",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 432,
+        "y": 217,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "7b756479.f5b4c4",
+                "ecf93800.1c6098",
+                "50c242ff.949c04",
+                "91f0150f.12ce4",
+                "63a848d9.da34b"
+            ]
+        ]
+    },
+    {
+        "id": "9209420.b905c4",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 99,
+        "y": 79,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "9623ac21.784518"
+            ]
+        ]
+    },
+    {
+        "id": "ecf93800.1c6098",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get A1 Policy executed successfully' />",
+        "comments": "",
+        "x": 732.0000610351562,
+        "y": 132,
+        "z": "e064bcd1.68ce88",
+        "wires": []
+    },
+    {
+        "id": "50c242ff.949c04",
+        "type": "execute",
+        "name": "execute Properties",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 731,
+        "y": 185,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "63a848d9.da34b",
+        "type": "block",
+        "name": "A1 Mediator RestAPI Invocation",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 761.0001220703125,
+        "y": 269,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "291f2c44.cafa94",
+                "91d29dbf.a6a538",
+                "81af0899.ed949"
+            ]
+        ]
+    },
+    {
+        "id": "91d29dbf.a6a538",
+        "type": "set",
+        "name": "set tmp variables for A1 Mediator REST API call",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$get-a1-policy-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "x": 1123.00146484375,
+        "y": 161.88912963867188,
+        "z": "e064bcd1.68ce88",
+        "wires": []
+    },
+    {
+        "id": "291f2c44.cafa94",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1011.0001220703125,
+        "y": 251,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "81af0899.ed949",
+        "type": "execute",
+        "name": "Get Policy Instance",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"false\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1056.0006103515625,
+        "y": 333.0104064941406,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "13d8386c.8ddea8",
+                "af0b89cf.ac16e8"
+            ]
+        ]
+    },
+    {
+        "id": "13d8386c.8ddea8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1283,
+        "y": 402.0001220703125,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "bf13d67e.e0cbb"
+            ]
+        ]
+    },
+    {
+        "id": "af0b89cf.ac16e8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1274.000244140625,
+        "y": 246.00003051757812,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "98798a19.a969a"
+            ]
+        ]
+    },
+    {
+        "id": "508b9b05.e13d4c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in Getting A1 Policy Instance. Aborting\" />",
+        "comments": "",
+        "x": 1606.0006103515625,
+        "y": 456.00006103515625,
+        "z": "e064bcd1.68ce88",
+        "wires": []
+    },
+    {
+        "id": "98798a19.a969a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1446.9998779296875,
+        "y": 247.00006103515625,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "c4d70fbd.f8a89",
+                "efe59c04.f94ff",
+                "7d3fa61b.39674"
+            ]
+        ]
+    },
+    {
+        "id": "c4d70fbd.f8a89",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information \"/>\n<parameter name=\"field2\" value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1615,
+        "y": 219,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3864588e.e52d2",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
+        "comments": "",
+        "x": 1579.75390625,
+        "y": 349.00390625,
+        "z": "e064bcd1.68ce88",
+        "wires": []
+    },
+    {
+        "id": "91f0150f.12ce4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 694.75390625,
+        "y": 441.00390625,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "a170f7d2.fa1e18"
+            ]
+        ]
+    },
+    {
+        "id": "a170f7d2.fa1e18",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get PolicyInstance executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
+        "comments": "",
+        "x": 855.7539672851562,
+        "y": 441.00396728515625,
+        "z": "e064bcd1.68ce88",
+        "wires": []
+    },
+    {
+        "id": "bf13d67e.e0cbb",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1438.00390625,
+        "y": 401.0039367675781,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            [
+                "3864588e.e52d2",
+                "508b9b05.e13d4c"
+            ]
+        ]
+    },
+    {
+        "id": "efe59c04.f94ff",
+        "type": "execute",
+        "name": "set",
+        "xml": "<set>\n<parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1611,
+        "y": 297,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7d3fa61b.39674",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1614,
+        "y": 152,
+        "z": "e064bcd1.68ce88",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json
new file mode 100644
index 00000000..14b08a80
--- /dev/null
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json
@@ -0,0 +1,332 @@
+[
+    {
+        "id": "792b8892.64457",
+        "type": "service-logic",
+        "name": "A1-ADAPTER-API ${project.version}",
+        "module": "A1-ADAPTER-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 167,
+        "y": 179,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "11f7d7b8.1b7cb8"
+            ]
+        ]
+    },
+    {
+        "id": "11f7d7b8.1b7cb8",
+        "type": "method",
+        "name": "method getA1PolicyStatus",
+        "xml": "<method rpc='getA1PolicyStatus' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 226,
+        "y": 300,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "ea8cdc1c.7ad76"
+            ]
+        ]
+    },
+    {
+        "id": "606404ab.821cbc",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-status-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 690,
+        "y": 114,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ea8cdc1c.7ad76",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 431,
+        "y": 254,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "606404ab.821cbc",
+                "722eabeb.6d1a7c",
+                "1786ef85.c617a8",
+                "9795ae5f.c333",
+                "1c69a7a7.5059e"
+            ]
+        ]
+    },
+    {
+        "id": "90a09247.4437",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 98,
+        "y": 116,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "792b8892.64457"
+            ]
+        ]
+    },
+    {
+        "id": "722eabeb.6d1a7c",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get A1 Policy executed successfully' />",
+        "comments": "",
+        "x": 731.0000610351562,
+        "y": 169,
+        "z": "6c2cfe41.61b868",
+        "wires": []
+    },
+    {
+        "id": "1786ef85.c617a8",
+        "type": "execute",
+        "name": "execute Properties",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 730,
+        "y": 222,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1c69a7a7.5059e",
+        "type": "block",
+        "name": "A1 Mediator RestAPI Invocation",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 760.0001220703125,
+        "y": 306,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "350bef62.ead7a",
+                "42b67c54.7a5fc4",
+                "3c854250.ea03ce"
+            ]
+        ]
+    },
+    {
+        "id": "42b67c54.7a5fc4",
+        "type": "set",
+        "name": "set tmp variables for A1 Mediator REST API call",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$get-a1-policy-status-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "x": 1122.00146484375,
+        "y": 198.88912963867188,
+        "z": "6c2cfe41.61b868",
+        "wires": []
+    },
+    {
+        "id": "350bef62.ead7a",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Status.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1009.0001220703125,
+        "y": 289,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3c854250.ea03ce",
+        "type": "execute",
+        "name": "Get Policy Instance Status",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1055.0006103515625,
+        "y": 370.0104064941406,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "db967cfd.662b5",
+                "f7373336.a9f2d8"
+            ]
+        ]
+    },
+    {
+        "id": "db967cfd.662b5",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1282,
+        "y": 439.0001220703125,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "e83b2b7e.0baf9"
+            ]
+        ]
+    },
+    {
+        "id": "f7373336.a9f2d8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1273.000244140625,
+        "y": 283.0000305175781,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "ff2d7ebe.e41298"
+            ]
+        ]
+    },
+    {
+        "id": "9eba774e.8b338",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error in Getting A1 Policy Status. Aborting\" />",
+        "comments": "",
+        "x": 1605.0006103515625,
+        "y": 493.00006103515625,
+        "z": "6c2cfe41.61b868",
+        "wires": []
+    },
+    {
+        "id": "ff2d7ebe.e41298",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1445.9998779296875,
+        "y": 284.00006103515625,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "a55d0be.aa42678",
+                "73d80df5.3d29b4",
+                "49aaac04.dffde4"
+            ]
+        ]
+    },
+    {
+        "id": "a55d0be.aa42678",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Status \"/>\n<parameter name=\"field2\" value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1604,
+        "y": 230,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1979a6a.06a3759",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
+        "comments": "",
+        "x": 1578.75390625,
+        "y": 386.00390625,
+        "z": "6c2cfe41.61b868",
+        "wires": []
+    },
+    {
+        "id": "9795ae5f.c333",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 693.75390625,
+        "y": 478.00390625,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "d253316a.832ce"
+            ]
+        ]
+    },
+    {
+        "id": "d253316a.832ce",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get Policy Status executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
+        "comments": "",
+        "x": 854.7539672851562,
+        "y": 478.00396728515625,
+        "z": "6c2cfe41.61b868",
+        "wires": []
+    },
+    {
+        "id": "e83b2b7e.0baf9",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1437.00390625,
+        "y": 438.0039367675781,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            [
+                "1979a6a.06a3759",
+                "9eba774e.8b338"
+            ]
+        ]
+    },
+    {
+        "id": "73d80df5.3d29b4",
+        "type": "execute",
+        "name": "set",
+        "xml": "<set>\n<parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1609,
+        "y": 334,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "49aaac04.dffde4",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1602,
+        "y": 155,
+        "z": "6c2cfe41.61b868",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json
index dbe473f6..c797668a 100644
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": "c219d1cd.b24c6",
+        "id": "5a3c07ae.e366b8",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,446 +8,323 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 160,
-        "y": 193.0000033378601,
-        "z": "db67b85c.6b1fb8",
+        "x": 175,
+        "y": 157.00000095367432,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "9062821.e79448"
+                "b7bd1ba7.d04778"
             ]
         ]
     },
     {
-        "id": "9062821.e79448",
+        "id": "b7bd1ba7.d04778",
         "type": "method",
         "name": "method getA1PolicyType",
         "xml": "<method rpc='getA1PolicyType' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 223.00000762939453,
-        "y": 316.00001287460327,
-        "z": "db67b85c.6b1fb8",
+        "x": 238.00000762939453,
+        "y": 280.0000104904175,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "b06c71a4.a1c38"
+                "3f32665d.c1c8ba"
             ]
         ]
     },
     {
-        "id": "6b437f41.4e82c",
+        "id": "f83e0069.d60a28",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get Policy Type:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-type-input.near-rt-ric-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 688.0000267028809,
-        "y": 129.0000023841858,
-        "z": "db67b85c.6b1fb8",
+        "x": 703.0000267028809,
+        "y": 93,
+        "z": "4a015e5c.e4da6",
         "wires": [
             []
         ]
     },
     {
-        "id": "b06c71a4.a1c38",
+        "id": "3f32665d.c1c8ba",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 426,
-        "y": 267.0000033378601,
-        "z": "db67b85c.6b1fb8",
+        "x": 441,
+        "y": 231.00000095367432,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "6b437f41.4e82c",
-                "b3ae1bd6.d9e298",
-                "5e269c0a.ba2164",
-                "10718683.4eee19",
-                "7cdd0fec.392c7"
+                "f83e0069.d60a28",
+                "ece1263.0cc9bd8",
+                "c4f19376.cb13b",
+                "644e8ac.a2fb1f4",
+                "479ab38c.15d78c"
             ]
         ]
     },
     {
-        "id": "e8848e67.6f55e",
+        "id": "e311365b.05491",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 93,
-        "y": 129.0000033378601,
-        "z": "db67b85c.6b1fb8",
+        "x": 108,
+        "y": 93.00000095367432,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "c219d1cd.b24c6"
+                "5a3c07ae.e366b8"
             ]
         ]
     },
     {
-        "id": "b3ae1bd6.d9e298",
+        "id": "ece1263.0cc9bd8",
         "type": "set",
         "name": "set default status value",
         "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getA1PolicyType executed successfully' />",
         "comments": "",
-        "x": 725.0001068115234,
-        "y": 182.00000143051147,
-        "z": "db67b85c.6b1fb8",
+        "x": 740.0001068115234,
+        "y": 145.99999904632568,
+        "z": "4a015e5c.e4da6",
         "wires": []
     },
     {
-        "id": "5e269c0a.ba2164",
+        "id": "c4f19376.cb13b",
         "type": "execute",
         "name": "execute Properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 725,
-        "y": 235.0000033378601,
-        "z": "db67b85c.6b1fb8",
+        "x": 740,
+        "y": 199.00000095367432,
+        "z": "4a015e5c.e4da6",
         "wires": [
             []
         ]
     },
     {
-        "id": "7cdd0fec.392c7",
+        "id": "479ab38c.15d78c",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 749.0001525878906,
-        "y": 320.99999713897705,
-        "z": "db67b85c.6b1fb8",
+        "x": 764.0001525878906,
+        "y": 284.99999475479126,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "b1799881.cfcac8",
-                "b226a8f0.348128",
-                "8754f00.41fc21"
+                "72ae0a37.799b94",
+                "56399f4b.cae578",
+                "40012c04.89442c"
             ]
         ]
     },
     {
-        "id": "b1799881.cfcac8",
+        "id": "72ae0a37.799b94",
         "type": "set",
         "name": "set tmp variables for A1 Mediator REST API call",
         "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$get-a1-policy-type-input.near-rt-ric-url`\"/>",
         "comments": "",
-        "x": 1199.00146484375,
-        "y": 253.88914489746094,
-        "z": "db67b85c.6b1fb8",
+        "x": 1214.00146484375,
+        "y": 217.88914251327515,
+        "z": "4a015e5c.e4da6",
         "wires": []
     },
     {
-        "id": "b226a8f0.348128",
+        "id": "56399f4b.cae578",
         "type": "execute",
         "name": "Get Policy Types",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1006.000602722168,
-        "y": 382.01037979125977,
-        "z": "db67b85c.6b1fb8",
+        "x": 1021.000602722168,
+        "y": 346.010377407074,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "37dbc1e3.6a3a5e",
-                "debfb4b6.a67ed8"
+                "90458ba.4afa9f8",
+                "901d354.b45acc8"
             ]
         ]
     },
     {
-        "id": "37dbc1e3.6a3a5e",
+        "id": "90458ba.4afa9f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1110.0000610351562,
-        "y": 467.0001220703125,
-        "z": "db67b85c.6b1fb8",
+        "x": 1125.0000610351562,
+        "y": 431.0001196861267,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "4eefe752.1c7e88"
+                "774aa433.0336b4"
             ]
         ]
     },
     {
-        "id": "debfb4b6.a67ed8",
+        "id": "901d354.b45acc8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1286.000244140625,
-        "y": 378.0000305175781,
-        "z": "db67b85c.6b1fb8",
+        "x": 1257.000244140625,
+        "y": 330.0000305175781,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "9ab3dc21.fe41a"
+                "45b9b49f.441fbc"
             ]
         ]
     },
     {
-        "id": "54c0577b.f3ecf8",
+        "id": "69c58cb1.928354",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error in Getting A1 Policy Type. Aborting\" />",
         "comments": "",
-        "x": 1382.0006103515625,
-        "y": 520.0001220703125,
-        "z": "db67b85c.6b1fb8",
+        "x": 1397.0006103515625,
+        "y": 484.0001196861267,
+        "z": "4a015e5c.e4da6",
         "wires": []
     },
     {
-        "id": "9ab3dc21.fe41a",
+        "id": "45b9b49f.441fbc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1405.9999084472656,
-        "y": 340.00007581710815,
-        "z": "db67b85c.6b1fb8",
+        "x": 1420.9999084472656,
+        "y": 304.00007343292236,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "a9c5eacf.c24728",
-                "82bcac96.18a1",
-                "c00428bd.5a7f58"
+                "3592b1c6.fc7b6e",
+                "6af8fc5a.b2bd5c",
+                "2c18e75d.32018"
             ]
         ]
     },
     {
-        "id": "a9c5eacf.c24728",
+        "id": "3592b1c6.fc7b6e",
         "type": "record",
         "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Policy Type Information \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp.httpResponse`\"/>",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Policy Type Information \"/>\n<parameter name=\"field2\" value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1644,
-        "y": 249.00000524520874,
-        "z": "db67b85c.6b1fb8",
+        "x": 1660,
+        "y": 212,
+        "z": "4a015e5c.e4da6",
         "wires": [
             []
         ]
     },
     {
-        "id": "1ba71083.247e6f",
+        "id": "a14ef7ef.d0bba8",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
         "comments": "",
-        "x": 1364.7539672851562,
-        "y": 418.0039367675781,
-        "z": "db67b85c.6b1fb8",
+        "x": 1378.75390625,
+        "y": 382.0039367675781,
+        "z": "4a015e5c.e4da6",
         "wires": []
     },
     {
-        "id": "10718683.4eee19",
+        "id": "644e8ac.a2fb1f4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 686.7539405822754,
-        "y": 443.0039978027344,
-        "z": "db67b85c.6b1fb8",
+        "x": 701.7539405822754,
+        "y": 407.0039954185486,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "f62ba5fc.044078"
+                "17123f41.a49541"
             ]
         ]
     },
     {
-        "id": "f62ba5fc.044078",
+        "id": "17123f41.a49541",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 Adapter is healthy'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>\n",
         "comments": "",
-        "x": 901.7540321350098,
-        "y": 443.0039367675781,
-        "z": "db67b85c.6b1fb8",
+        "x": 916.7540321350098,
+        "y": 407.00393438339233,
+        "z": "4a015e5c.e4da6",
         "wires": []
     },
     {
-        "id": "4eefe752.1c7e88",
+        "id": "774aa433.0336b4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1238.0039367675781,
-        "y": 469.00392150878906,
-        "z": "db67b85c.6b1fb8",
+        "x": 1253.0039367675781,
+        "y": 433.00391912460327,
+        "z": "4a015e5c.e4da6",
         "wires": [
             [
-                "54c0577b.f3ecf8",
-                "1ba71083.247e6f"
+                "69c58cb1.928354",
+                "a14ef7ef.d0bba8"
             ]
         ]
     },
     {
-        "id": "8754f00.41fc21",
+        "id": "40012c04.89442c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Type.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1129.9999351501465,
-        "y": 304.0000157356262,
-        "z": "db67b85c.6b1fb8",
+        "x": 1144.9999351501465,
+        "y": 268.00001335144043,
+        "z": "4a015e5c.e4da6",
         "wires": [
             []
         ]
     },
     {
-        "id": "c00428bd.5a7f58",
+        "id": "6af8fc5a.b2bd5c",
         "type": "execute",
-        "name": "Object to string - ctxSetAttribute",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='ctxSetAttribute'>\n\t<parameter name='object' value=\t\"`$a1MediatorRsp.httpResponse`\" />\n\t<parameter name='key' value='a1PolicyTypeResponse' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1718.0001220703125,
-        "y": 366.00001287460327,
-        "z": "db67b85c.6b1fb8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "82bcac96.18a1",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/opt/opendaylight/current/data/log/A1-Adapter-getPolicytype-specific-context.log' />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1672.0000038146973,
-        "y": 425.00000524520874,
-        "z": "db67b85c.6b1fb8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c2524ba6.93b3f8",
-        "type": "execute",
-        "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='a1MediatorRsp.httpResponse' />\n\t<parameter name='outputPath' value='a1MediatorgetPolicyType' />\n\t<parameter name='isEscaped' value='false' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1694.0001220703125,
-        "y": 318.00001287460327,
-        "z": "db67b85c.6b1fb8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4d5a07cf.0a3ee8",
-        "type": "execute",
-        "name": "remove new lines",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.payload\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2497.0001525878906,
-        "y": 457.0000305175781,
-        "z": "db67b85c.6b1fb8",
-        "wires": [
-            [
-                "4a30bb8b.273024",
-                "8c2e4d0d.9cbb2"
-            ]
-        ]
-    },
-    {
-        "id": "4a30bb8b.273024",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2804.5001831054688,
-        "y": 418.00004386901855,
-        "z": "db67b85c.6b1fb8",
-        "wires": [
-            [
-                "3483ac68.9da354"
-            ]
-        ]
-    },
-    {
-        "id": "3483ac68.9da354",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2939.5003356933594,
-        "y": 488.0000762939453,
-        "z": "db67b85c.6b1fb8",
-        "wires": [
-            [
-                "3e399081.d736e"
-            ]
-        ]
-    },
-    {
-        "id": "3e399081.d736e",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template with lines removed \\r\"/>\n<parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 3122.500473022461,
-        "y": 491.0000686645508,
-        "z": "db67b85c.6b1fb8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8c2e4d0d.9cbb2",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2814.5001525878906,
-        "y": 578.0000788271427,
-        "z": "db67b85c.6b1fb8",
-        "wires": [
-            [
-                "ee8be8b9.4a4c48"
-            ]
-        ]
-    },
-    {
-        "id": "ee8be8b9.4a4c48",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "name": "set",
+        "xml": "<set>\n<parameter name='responseBody' value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2967.5,
-        "y": 554.0000715255737,
-        "z": "db67b85c.6b1fb8",
+        "x": 1709.0001220703125,
+        "y": 282.0000104904175,
+        "z": "4a015e5c.e4da6",
         "wires": [
             []
         ]
     },
     {
-        "id": "22994ac1.2145d6",
+        "id": "2c18e75d.32018",
         "type": "execute",
-        "name": "Unescape http response",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='unescapeJsonString'>\n\t<parameter name='source' value=\t\"`$a1MediatorRsp.httpResponse`\" />\n\t<parameter name='target' value='a1MediatorRsp.unescaped.httpResponse' />",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2517,
-        "y": 393.0000023841858,
-        "z": "db67b85c.6b1fb8",
+        "x": 1663,
+        "y": 163,
+        "z": "4a015e5c.e4da6",
         "wires": [
             []
         ]
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getHealthCheck.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getHealthCheck.json
deleted file mode 100644
index 7445c2e5..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getHealthCheck.json
+++ /dev/null
@@ -1,591 +0,0 @@
-[
-    {
-        "id": "f70577cd.2332b8",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 166,
-        "y": 89,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "51320529.8c13fc"
-            ]
-        ]
-    },
-    {
-        "id": "51320529.8c13fc",
-        "type": "method",
-        "name": "method getHealthCheck",
-        "xml": "<method rpc='getHealthCheck' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 227,
-        "y": 209,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "50c04d9d.eb06a4"
-            ]
-        ]
-    },
-    {
-        "id": "cf6fe4d2.e21a88",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Adapter Health Check. Near RT RIC ID\"/>\n<parameter name=\"field2\" value=\"`$get-health-check-input.near-rt-ric-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 691,
-        "y": 24,
-        "z": "71073541.7e954c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "50c04d9d.eb06a4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 432,
-        "y": 163,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "cf6fe4d2.e21a88",
-                "9b09eba5.e4dfa8",
-                "fad38a44.2dff58",
-                "da55f177.44ea9",
-                "fe7bfe5c.0b58a"
-            ]
-        ]
-    },
-    {
-        "id": "fdb9f2a9.d1099",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 99,
-        "y": 25,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "f70577cd.2332b8"
-            ]
-        ]
-    },
-    {
-        "id": "9b09eba5.e4dfa8",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 is Healthy' />",
-        "comments": "",
-        "x": 742,
-        "y": 90,
-        "z": "71073541.7e954c",
-        "wires": []
-    },
-    {
-        "id": "fad38a44.2dff58",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 731,
-        "y": 131,
-        "z": "71073541.7e954c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "da55f177.44ea9",
-        "type": "switchNode",
-        "name": "A1 Mediator Deployed",
-        "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 681,
-        "y": 187,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "1b90a5eb.8a64ea",
-                "df3dcdff.980fa"
-            ]
-        ]
-    },
-    {
-        "id": "df3dcdff.980fa",
-        "type": "outcome",
-        "name": "Deployed",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 965.0000457763672,
-        "y": 47.000065326690674,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "d65603a6.a6255"
-            ]
-        ]
-    },
-    {
-        "id": "d65603a6.a6255",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 968.0000152587891,
-        "y": 237.00000953674316,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "fad8a7e7.6c01c8"
-            ]
-        ]
-    },
-    {
-        "id": "fad8a7e7.6c01c8",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1144.0000305175781,
-        "y": 157.0000023841858,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "239aaf9f.539e4"
-            ]
-        ]
-    },
-    {
-        "id": "1b90a5eb.8a64ea",
-        "type": "outcome",
-        "name": "Not Deployed",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 918.0000686645508,
-        "y": 482.0000615119934,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "d91da8b7.4c9cd8"
-            ]
-        ]
-    },
-    {
-        "id": "d91da8b7.4c9cd8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1133.0001068115234,
-        "y": 611.0000143051147,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "373e75ec.2ef50a",
-                "ad639178.ea45b",
-                "1d8bf60c.0ab74a"
-            ]
-        ]
-    },
-    {
-        "id": "373e75ec.2ef50a",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"A1 Mediator Not Deployed. Aborting Health Check\" />",
-        "comments": "",
-        "x": 1257.9998626708984,
-        "y": 691.9999988079071,
-        "z": "71073541.7e954c",
-        "wires": []
-    },
-    {
-        "id": "db9f306b.9d952",
-        "type": "comment",
-        "name": "No DMAAP Response Payload",
-        "info": "",
-        "comments": "",
-        "x": 1436,
-        "y": 98,
-        "z": "71073541.7e954c",
-        "wires": []
-    },
-    {
-        "id": "239aaf9f.539e4",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1115,
-        "y": 327.0000139772892,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "a401c326.c2be8",
-                "34de0f9a.82fab",
-                "742ba549.33a0fc"
-            ]
-        ]
-    },
-    {
-        "id": "34de0f9a.82fab",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$get-health-check-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.restapi.healthcheck-url\" value=\"`$prop.restapi.healthcheck`\"/>",
-        "comments": "",
-        "x": 1503.0010681152344,
-        "y": 232.8890978693962,
-        "z": "71073541.7e954c",
-        "wires": []
-    },
-    {
-        "id": "a401c326.c2be8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Health Check.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.restapi.healthcheck-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1395.0000305175781,
-        "y": 292.00000286102295,
-        "z": "71073541.7e954c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "742ba549.33a0fc",
-        "type": "execute",
-        "name": "Check A1 Mediator Health",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.a1Mediator.url + '/' + $tmp.restapi.healthcheck-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"false\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1428.00048828125,
-        "y": 372.0103898048401,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "54a96509.b22d6c",
-                "5a29f4f5.fc1fcc"
-            ]
-        ]
-    },
-    {
-        "id": "54a96509.b22d6c",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1389.0000305175781,
-        "y": 455.00011348724365,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "fc4e3c1b.c7139"
-            ]
-        ]
-    },
-    {
-        "id": "5a29f4f5.fc1fcc",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1633.0002746582031,
-        "y": 326.0000219345093,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "10397796.f90e08"
-            ]
-        ]
-    },
-    {
-        "id": "81144d1f.a8a31",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error in A1 Mediator Health Check. Aborting A1 Health Check\" />",
-        "comments": "",
-        "x": 1549.0006103515625,
-        "y": 562.0000829696655,
-        "z": "71073541.7e954c",
-        "wires": []
-    },
-    {
-        "id": "10397796.f90e08",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1782.9998798370361,
-        "y": 290.00005197525024,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "acc2e27c.325de"
-            ]
-        ]
-    },
-    {
-        "id": "acc2e27c.325de",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Mediator is Healthy.\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1960.0000305175781,
-        "y": 262.9999990463257,
-        "z": "71073541.7e954c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ad639178.ea45b",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1919.0001220703125,
-        "y": 659.0001516342163,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "52a8bbd0.8d15e4",
-                "1824af45.7c4c31",
-                "d55641b9.0d8a"
-            ]
-        ]
-    },
-    {
-        "id": "1824af45.7c4c31",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2268.0003204345703,
-        "y": 836.9995563030243,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "b67eb7fa.2e8d88",
-                "b7c6de0.48aae2"
-            ]
-        ]
-    },
-    {
-        "id": "52a8bbd0.8d15e4",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='getHealthCheck'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value=\"None\" />",
-        "comments": "",
-        "x": 2256.667091369629,
-        "y": 627.0001363754272,
-        "z": "71073541.7e954c",
-        "wires": []
-    },
-    {
-        "id": "b67eb7fa.2e8d88",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2483.5002059936523,
-        "y": 759.9168601036072,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "5004b5da.bc5e3c"
-            ]
-        ]
-    },
-    {
-        "id": "b7c6de0.48aae2",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2487.5001258850098,
-        "y": 898.916702747345,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "c46eaf10.81be1"
-            ]
-        ]
-    },
-    {
-        "id": "5004b5da.bc5e3c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2643.5000400543213,
-        "y": 761.9168610572815,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "1c492a8f.477515"
-            ]
-        ]
-    },
-    {
-        "id": "1c492a8f.477515",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 2825.499771118164,
-        "y": 752.9169368743896,
-        "z": "71073541.7e954c",
-        "wires": []
-    },
-    {
-        "id": "c46eaf10.81be1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2670.4997692108154,
-        "y": 891.916811466217,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "cd499a2b.0f9d88"
-            ]
-        ]
-    },
-    {
-        "id": "cd499a2b.0f9d88",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2856.4999237060547,
-        "y": 879.9171352386475,
-        "z": "71073541.7e954c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d55641b9.0d8a",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload Not Required\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2264.5002517700195,
-        "y": 713.4550609588623,
-        "z": "71073541.7e954c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1d8bf60c.0ab74a",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Deployed'/>\n",
-        "comments": "",
-        "x": 1334.0001525878906,
-        "y": 544.0000214576721,
-        "z": "71073541.7e954c",
-        "wires": []
-    },
-    {
-        "id": "cdf48a0a.84bf18",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Healthy'/>\n",
-        "comments": "",
-        "x": 1708.753963470459,
-        "y": 391.00389766693115,
-        "z": "71073541.7e954c",
-        "wires": []
-    },
-    {
-        "id": "fe7bfe5c.0b58a",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 674.7538948059082,
-        "y": 801.0039358139038,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "fd40a79.a6fb958",
-                "ad639178.ea45b"
-            ]
-        ]
-    },
-    {
-        "id": "fd40a79.a6fb958",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 Adapter is healthy'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 824.7539386749268,
-        "y": 883.0039052963257,
-        "z": "71073541.7e954c",
-        "wires": []
-    },
-    {
-        "id": "fc4e3c1b.c7139",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1535.0038719177246,
-        "y": 458.0039281845093,
-        "z": "71073541.7e954c",
-        "wires": [
-            [
-                "cdf48a0a.84bf18",
-                "ad639178.ea45b",
-                "81144d1f.a8a31"
-            ]
-        ]
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getNearRT-RICs.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getNearRT-RICs.json
deleted file mode 100644
index 2f8c2038..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getNearRT-RICs.json
+++ /dev/null
@@ -1,424 +0,0 @@
-[
-    {
-        "id": "ebd5e816.eb6c78",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 193,
-        "y": 88,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "456b8690.81ad48"
-            ]
-        ]
-    },
-    {
-        "id": "456b8690.81ad48",
-        "type": "method",
-        "name": "method getNearRT-RICs",
-        "xml": "<method rpc='getNearRT-RICs' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 271,
-        "y": 221,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "39b7c428.fbd3fc"
-            ]
-        ]
-    },
-    {
-        "id": "68c6918d.888a2",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Adapter - get near-RT RIC Info\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 718,
-        "y": 23,
-        "z": "e95de38b.bff39",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "39b7c428.fbd3fc",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 459,
-        "y": 162,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "68c6918d.888a2",
-                "97009951.c95b78",
-                "43ca47a6.582ba8",
-                "c0535382.92e3b",
-                "bd60c8d3.9797d8"
-            ]
-        ]
-    },
-    {
-        "id": "6076caf.e61c034",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 126,
-        "y": 24,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "ebd5e816.eb6c78"
-            ]
-        ]
-    },
-    {
-        "id": "97009951.c95b78",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 Mediator RIC ID available' />",
-        "comments": "",
-        "x": 769,
-        "y": 78,
-        "z": "e95de38b.bff39",
-        "wires": []
-    },
-    {
-        "id": "43ca47a6.582ba8",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 755,
-        "y": 122,
-        "z": "e95de38b.bff39",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bd60c8d3.9797d8",
-        "type": "switchNode",
-        "name": "A1 Mediator Deployed",
-        "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 743,
-        "y": 254,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "7e402958.8360a8",
-                "bf086c83.8630a"
-            ]
-        ]
-    },
-    {
-        "id": "bf086c83.8630a",
-        "type": "outcome",
-        "name": "Deployed",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 992.0000457763672,
-        "y": 46.000065326690674,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "71655ae6.aa99f4"
-            ]
-        ]
-    },
-    {
-        "id": "71655ae6.aa99f4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1048,
-        "y": 160.00001525878906,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "4643c1e7.c59be",
-                "b912cf6.9ffe93"
-            ]
-        ]
-    },
-    {
-        "id": "7e402958.8360a8",
-        "type": "outcome",
-        "name": "Not Deployed",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 982.0000610351562,
-        "y": 354.00006103515625,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "db47880c.68c2b8"
-            ]
-        ]
-    },
-    {
-        "id": "db47880c.68c2b8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1160.0001068115234,
-        "y": 610.0000143051147,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "5f1c2ff4.d89bf",
-                "f5d19daf.0a21a",
-                "813bd649.ab9798"
-            ]
-        ]
-    },
-    {
-        "id": "5f1c2ff4.d89bf",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"A1 Mediator Not Deployed. Aborting Health Check\" />",
-        "comments": "",
-        "x": 1284.9998626708984,
-        "y": 690.9999988079071,
-        "z": "e95de38b.bff39",
-        "wires": []
-    },
-    {
-        "id": "4643c1e7.c59be",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"SNear-RT RIC ID\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1231,
-        "y": 216,
-        "z": "e95de38b.bff39",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f5d19daf.0a21a",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1946.0001220703125,
-        "y": 658.0001516342163,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "e0c69688.bf48b8",
-                "51475ed3.5e72a",
-                "6ac72c6d.c43284"
-            ]
-        ]
-    },
-    {
-        "id": "51475ed3.5e72a",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2295.0003204345703,
-        "y": 835.9995563030243,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "81c3b061.027dd",
-                "ad5fd599.0827c8"
-            ]
-        ]
-    },
-    {
-        "id": "e0c69688.bf48b8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='getNearRT-RICs'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value=\"`$tmp.near-rt-ric-id`\" />",
-        "comments": "",
-        "x": 2284.6669921875,
-        "y": 627.0001220703125,
-        "z": "e95de38b.bff39",
-        "wires": []
-    },
-    {
-        "id": "81c3b061.027dd",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2510.5002059936523,
-        "y": 758.9168601036072,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "984b4d6a.16329"
-            ]
-        ]
-    },
-    {
-        "id": "ad5fd599.0827c8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2514.5001258850098,
-        "y": 897.916702747345,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "933abff8.99ceb"
-            ]
-        ]
-    },
-    {
-        "id": "984b4d6a.16329",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2670.5000400543213,
-        "y": 760.9168610572815,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "f7674184.f0207"
-            ]
-        ]
-    },
-    {
-        "id": "f7674184.f0207",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 2852.499771118164,
-        "y": 751.9169368743896,
-        "z": "e95de38b.bff39",
-        "wires": []
-    },
-    {
-        "id": "933abff8.99ceb",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2697.4997692108154,
-        "y": 890.916811466217,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "cf6ac156.9eaf8"
-            ]
-        ]
-    },
-    {
-        "id": "cf6ac156.9eaf8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2885.5,
-        "y": 881.9171142578125,
-        "z": "e95de38b.bff39",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6ac72c6d.c43284",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2291.5002517700195,
-        "y": 712.4550609588623,
-        "z": "e95de38b.bff39",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "813bd649.ab9798",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Deployed'/>\n",
-        "comments": "",
-        "x": 1320.0001220703125,
-        "y": 540,
-        "z": "e95de38b.bff39",
-        "wires": []
-    },
-    {
-        "id": "c0535382.92e3b",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 701.7538948059082,
-        "y": 800.0039358139038,
-        "z": "e95de38b.bff39",
-        "wires": [
-            [
-                "197cd6b3.c3fad9",
-                "f5d19daf.0a21a"
-            ]
-        ]
-    },
-    {
-        "id": "197cd6b3.c3fad9",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 Mediatpor is available'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 853.7539672851562,
-        "y": 885.00390625,
-        "z": "e95de38b.bff39",
-        "wires": []
-    },
-    {
-        "id": "b912cf6.9ffe93",
-        "type": "set",
-        "name": "set tmp variables for Near RT RIC ID",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$prop.near-rt-ric-id`\"/>\n",
-        "comments": "",
-        "x": 1279,
-        "y": 89,
-        "z": "e95de38b.bff39",
-        "wires": []
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyInstance.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyInstance.json
deleted file mode 100644
index 5e0db035..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyInstance.json
+++ /dev/null
@@ -1,734 +0,0 @@
-[
-    {
-        "id": "97b83863.1e9f28",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 193,
-        "y": 90,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "2c1bb19d.1f605e"
-            ]
-        ]
-    },
-    {
-        "id": "2c1bb19d.1f605e",
-        "type": "method",
-        "name": "method getPolicyInstance",
-        "xml": "<method rpc='getPolicyInstance' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 254,
-        "y": 210,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "b5f6b2ec.ef41b"
-            ]
-        ]
-    },
-    {
-        "id": "efbffea8.48951",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get Policy Instance details associated with Near RT RIC ID and Policy Type ID\"/>\n<parameter name=\"field2\" value=\"`$get-policy-instance-input.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$get-policy-instance-input.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$get-policy-instance-input.policy-instance-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 718,
-        "y": 25,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b5f6b2ec.ef41b",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 459,
-        "y": 164,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "efbffea8.48951",
-                "148e2110.a4834f",
-                "18026c55.380af4",
-                "39a10e6b.20e9d2",
-                "27fa4f62.a357e"
-            ]
-        ]
-    },
-    {
-        "id": "26a452fa.b3c30e",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 126,
-        "y": 26,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "97b83863.1e9f28"
-            ]
-        ]
-    },
-    {
-        "id": "148e2110.a4834f",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getPolicyInstance executed successfully' />",
-        "comments": "",
-        "x": 758.0000457763672,
-        "y": 79.00000095367432,
-        "z": "758646cf.8567e8",
-        "wires": []
-    },
-    {
-        "id": "18026c55.380af4",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 758,
-        "y": 132,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "39a10e6b.20e9d2",
-        "type": "switchNode",
-        "name": "A1 Mediator Deployed",
-        "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 708,
-        "y": 188,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "98ca2153.5878",
-                "6d44289a.6170c8"
-            ]
-        ]
-    },
-    {
-        "id": "6d44289a.6170c8",
-        "type": "outcome",
-        "name": "Deployed",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 992.0000457763672,
-        "y": 48.000065326690674,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "5cf6b010.ca826"
-            ]
-        ]
-    },
-    {
-        "id": "5cf6b010.ca826",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 969.0000953674316,
-        "y": 194.00001764297485,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "2aab41ec.e46f5e"
-            ]
-        ]
-    },
-    {
-        "id": "98ca2153.5878",
-        "type": "outcome",
-        "name": "Not Deployed",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 945.0000686645508,
-        "y": 483.0000615119934,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "f07c3468.9111e8"
-            ]
-        ]
-    },
-    {
-        "id": "f07c3468.9111e8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1160.0001068115234,
-        "y": 612.0000143051147,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "2cd09689.a09f0a",
-                "6164d8bd.4d3918",
-                "d08cdaa2.2497e8"
-            ]
-        ]
-    },
-    {
-        "id": "2cd09689.a09f0a",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in Getting A1 Policy Instance. Aborting\" />",
-        "comments": "",
-        "x": 1289.9999237060547,
-        "y": 692.9999985694885,
-        "z": "758646cf.8567e8",
-        "wires": []
-    },
-    {
-        "id": "2aab41ec.e46f5e",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1163.0001068115234,
-        "y": 305.00000447034836,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "c4334ddb.ffe25",
-                "37a120b.00129e",
-                "f4688866.4effb8",
-                "da836929.9c5f78",
-                "c1d4adc6.62ca2",
-                "ebc97fe1.51a3a"
-            ]
-        ]
-    },
-    {
-        "id": "37a120b.00129e",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$get-policy-instance-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.policy-type-id\" value=\"`$get-policy-instance-input.policy-type-id`\"/>\n<parameter name=\"tmp.policy-instance-id\" value=\"`$get-policy-instance-input.policy-instance-id`\"/>\n",
-        "comments": "",
-        "x": 1501.00146484375,
-        "y": 102.88913059234619,
-        "z": "758646cf.8567e8",
-        "wires": []
-    },
-    {
-        "id": "c4334ddb.ffe25",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.policy-instance-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1422.0000953674316,
-        "y": 156.00000286102295,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f4688866.4effb8",
-        "type": "execute",
-        "name": "Get Policy Instances",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.a1Mediator.url + '/' + $tmp.restapi.policyinstance-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1440.0006103515625,
-        "y": 359.0103979110718,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "b526d90b.44e268",
-                "b94ea3f0.48558"
-            ]
-        ]
-    },
-    {
-        "id": "b526d90b.44e268",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1416.0000305175781,
-        "y": 456.00011348724365,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "f8459ad3.8c2c48"
-            ]
-        ]
-    },
-    {
-        "id": "b94ea3f0.48558",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1660.0002746582031,
-        "y": 327.0000219345093,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "6285d3a5.ab56dc"
-            ]
-        ]
-    },
-    {
-        "id": "94dc60b.42280a",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in Getting A1 Policy Instances. Aborting\" />",
-        "comments": "",
-        "x": 1576.0006103515625,
-        "y": 563.0000829696655,
-        "z": "758646cf.8567e8",
-        "wires": []
-    },
-    {
-        "id": "6285d3a5.ab56dc",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1809.9998798370361,
-        "y": 291.00005197525024,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "5db65a6d.9f3e14",
-                "ca2d2c79.f3d44",
-                "3c595f87.c89d7",
-                "f44c6a04.7c7928"
-            ]
-        ]
-    },
-    {
-        "id": "5db65a6d.9f3e14",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Details of A1 Policy Instance \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp.httpResponse`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1976,
-        "y": 158,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6164d8bd.4d3918",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1946.0001220703125,
-        "y": 660.0001516342163,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "e185025b.25cad",
-                "ad621b23.b3ace8",
-                "3610d471.52412c"
-            ]
-        ]
-    },
-    {
-        "id": "ad621b23.b3ace8",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2295.0003204345703,
-        "y": 837.9995563030243,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "b4fb73f0.839e1",
-                "44c81024.27ce2"
-            ]
-        ]
-    },
-    {
-        "id": "e185025b.25cad",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyInstance'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$tmp.a1-mediator-restapi.payload`' />",
-        "comments": "",
-        "x": 2284.667037963867,
-        "y": 629.0001125335693,
-        "z": "758646cf.8567e8",
-        "wires": []
-    },
-    {
-        "id": "b4fb73f0.839e1",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2510.5002059936523,
-        "y": 760.9168601036072,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "8e7ce8fd.116958"
-            ]
-        ]
-    },
-    {
-        "id": "44c81024.27ce2",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2514.5001258850098,
-        "y": 899.916702747345,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "b83226f6.1f4ac8"
-            ]
-        ]
-    },
-    {
-        "id": "8e7ce8fd.116958",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2670.5000400543213,
-        "y": 762.9168610572815,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "4ca5110c.d6744"
-            ]
-        ]
-    },
-    {
-        "id": "4ca5110c.d6744",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 2852.499771118164,
-        "y": 753.9169368743896,
-        "z": "758646cf.8567e8",
-        "wires": []
-    },
-    {
-        "id": "b83226f6.1f4ac8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2697.4997692108154,
-        "y": 892.916811466217,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "b666dc86.2cbb5"
-            ]
-        ]
-    },
-    {
-        "id": "b666dc86.2cbb5",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2883.4999237060547,
-        "y": 880.9171352386475,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3610d471.52412c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2293.500259399414,
-        "y": 720.4550924301147,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d08cdaa2.2497e8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Deployed'/>\n",
-        "comments": "",
-        "x": 1361.0001525878906,
-        "y": 545.0000214576721,
-        "z": "758646cf.8567e8",
-        "wires": []
-    },
-    {
-        "id": "47937742.d68258",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
-        "comments": "",
-        "x": 1735.753963470459,
-        "y": 392.00389766693115,
-        "z": "758646cf.8567e8",
-        "wires": []
-    },
-    {
-        "id": "27fa4f62.a357e",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 701.7538948059082,
-        "y": 802.0039358139038,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "b67da5ac.72ddb8",
-                "6164d8bd.4d3918"
-            ]
-        ]
-    },
-    {
-        "id": "b67da5ac.72ddb8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getPolicyInstance executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 851.7539386749268,
-        "y": 884.0039052963257,
-        "z": "758646cf.8567e8",
-        "wires": []
-    },
-    {
-        "id": "f8459ad3.8c2c48",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1562.0038719177246,
-        "y": 459.0039281845093,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "47937742.d68258",
-                "6164d8bd.4d3918",
-                "94dc60b.42280a"
-            ]
-        ]
-    },
-    {
-        "id": "da836929.9c5f78",
-        "type": "execute",
-        "name": "generate A1 Mediator URL 1",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.policy`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policyinstance-url\"/>\n    <parameter name=\"target\" value=\"{policy_type_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-type-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1491.0003356933594,
-        "y": 205.9999988079071,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c1d4adc6.62ca2",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.policy-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$tmp.restapi.policyinstance-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1438.0007286071777,
-        "y": 295.87860012054443,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ebc97fe1.51a3a",
-        "type": "execute",
-        "name": "generate A1 Mediator URL 2",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.restapi.policyinstance-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policyinstance-url\"/>\n    <parameter name=\"target\" value=\"{policy_instance_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-instance-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1497.2499694824219,
-        "y": 254.00000619888306,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bb49c2bd.dc0af",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2249.500244140625,
-        "y": 261.99993896484375,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "fbebe673.4fde58"
-            ]
-        ]
-    },
-    {
-        "id": "fbebe673.4fde58",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2413.50048828125,
-        "y": 252.99996948242188,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "eda3df5a.16141"
-            ]
-        ]
-    },
-    {
-        "id": "eda3df5a.16141",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Redndred template with lines removed \\r\"/>\n<parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2566.500244140625,
-        "y": 253.99993896484375,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "52187a89.4e78f4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2234.500244140625,
-        "y": 357.9999694824219,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "c30420f9.bcb1a"
-            ]
-        ]
-    },
-    {
-        "id": "c30420f9.bcb1a",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2398.5,
-        "y": 357.9999694824219,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ca2d2c79.f3d44",
-        "type": "execute",
-        "name": "remove new lines",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.payload\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2021,
-        "y": 233,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3c595f87.c89d7",
-        "type": "execute",
-        "name": "remove tabs",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$tmp.a1-mediator-restapi.payload`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.payload\"/>\n    <parameter name=\"target\" value=\"\\t\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2025,
-        "y": 295,
-        "z": "758646cf.8567e8",
-        "wires": [
-            [
-                "bb49c2bd.dc0af",
-                "52187a89.4e78f4"
-            ]
-        ]
-    },
-    {
-        "id": "f44c6a04.7c7928",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/opt/opendaylight/current/data/log/A1-Adapter-getPolicyInstance-specific-context.log' />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1974,
-        "y": 359,
-        "z": "758646cf.8567e8",
-        "wires": [
-            []
-        ]
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyInstances.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyInstances.json
deleted file mode 100644
index 4a2df73b..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyInstances.json
+++ /dev/null
@@ -1,702 +0,0 @@
-[
-    {
-        "id": "2ef2c73.a74c138",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 207,
-        "y": 97,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "9c18f2.85c8071"
-            ]
-        ]
-    },
-    {
-        "id": "9c18f2.85c8071",
-        "type": "method",
-        "name": "method getPolicyInstances",
-        "xml": "<method rpc='getPolicyInstances' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 268,
-        "y": 217,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "322607d6.ede268"
-            ]
-        ]
-    },
-    {
-        "id": "d9aa77b7.d8d998",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get All Policy Instance from Near RT RIC ID and Policy Type ID\"/>\n<parameter name=\"field2\" value=\"`$get-policy-instances-input.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$get-policy-instances-input.policy-type-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 732,
-        "y": 32,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "322607d6.ede268",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 473,
-        "y": 171,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "d9aa77b7.d8d998",
-                "c08be395.f405a",
-                "17f931de.f2160e",
-                "62f4ed6b.a9b444",
-                "e2373e18.e3f52"
-            ]
-        ]
-    },
-    {
-        "id": "3877a9a8.bee066",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 140,
-        "y": 33,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "2ef2c73.a74c138"
-            ]
-        ]
-    },
-    {
-        "id": "c08be395.f405a",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getPolicyInstances executed successfully' />",
-        "comments": "",
-        "x": 772.0000457763672,
-        "y": 86.00000095367432,
-        "z": "7ab03abd.cfb3d4",
-        "wires": []
-    },
-    {
-        "id": "17f931de.f2160e",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 772,
-        "y": 139,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "62f4ed6b.a9b444",
-        "type": "switchNode",
-        "name": "A1 Mediator Deployed",
-        "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 722,
-        "y": 195,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "6ee8b33f.55947c",
-                "4038226b.2b505c"
-            ]
-        ]
-    },
-    {
-        "id": "4038226b.2b505c",
-        "type": "outcome",
-        "name": "Deployed",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1006.0000457763672,
-        "y": 55.000065326690674,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "b1b2d727.4a5fc8"
-            ]
-        ]
-    },
-    {
-        "id": "b1b2d727.4a5fc8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 983.0000953674316,
-        "y": 201.00001764297485,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "e2a4df1a.855f6"
-            ]
-        ]
-    },
-    {
-        "id": "6ee8b33f.55947c",
-        "type": "outcome",
-        "name": "Not Deployed",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 959.0000686645508,
-        "y": 490.0000615119934,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "c2f215d2.1cb368"
-            ]
-        ]
-    },
-    {
-        "id": "c2f215d2.1cb368",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1174.0001068115234,
-        "y": 619.0000143051147,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "ad62ff09.05a02",
-                "55e0d36.689052c",
-                "91cd032.df9ff"
-            ]
-        ]
-    },
-    {
-        "id": "ad62ff09.05a02",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in Getting A1 Policy Instances. Aborting\" />",
-        "comments": "",
-        "x": 1298.9998626708984,
-        "y": 699.9999988079071,
-        "z": "7ab03abd.cfb3d4",
-        "wires": []
-    },
-    {
-        "id": "e2a4df1a.855f6",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1177.0001068115234,
-        "y": 312.00000447034836,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "fef9cb64.204608",
-                "ae52adc3.7b016",
-                "d64ef10d.f5309",
-                "f8cb76ee.b9e368",
-                "e5e2e791.7e4778"
-            ]
-        ]
-    },
-    {
-        "id": "ae52adc3.7b016",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$get-policy-instances-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.policy-type-id\" value=\"`$get-policy-instances-input.policy-type-id`\"/>",
-        "comments": "",
-        "x": 1514.0014343261719,
-        "y": 138.88912868499756,
-        "z": "7ab03abd.cfb3d4",
-        "wires": []
-    },
-    {
-        "id": "fef9cb64.204608",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Instances.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1440.0000915527344,
-        "y": 185.9999942779541,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d64ef10d.f5309",
-        "type": "execute",
-        "name": "Get Policy Instances",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.a1Mediator.url + '/' + $tmp.restapi.policyinstances-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1454.0006103515625,
-        "y": 366.0103979110718,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "d71e51ff.7be1a",
-                "d4d5f1ab.35cd9"
-            ]
-        ]
-    },
-    {
-        "id": "d71e51ff.7be1a",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1430.0000305175781,
-        "y": 463.00011348724365,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "d59b92db.746d5"
-            ]
-        ]
-    },
-    {
-        "id": "d4d5f1ab.35cd9",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1674.0002746582031,
-        "y": 334.0000219345093,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "b5885e67.58f09"
-            ]
-        ]
-    },
-    {
-        "id": "52dad0a2.d0077",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in Getting A1 Policy Instances. Aborting\" />",
-        "comments": "",
-        "x": 1590.0006103515625,
-        "y": 570.0000829696655,
-        "z": "7ab03abd.cfb3d4",
-        "wires": []
-    },
-    {
-        "id": "b5885e67.58f09",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1823.9998798370361,
-        "y": 298.00005197525024,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "2a60eb9b.39ccc4",
-                "e3ef35fd.a96518",
-                "e055c0d1.c51e3",
-                "78e8b370.a1c68c",
-                "52acbf94.d0542"
-            ]
-        ]
-    },
-    {
-        "id": "2a60eb9b.39ccc4",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"List of A1 Policy Instances: \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2020,
-        "y": 230,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "55e0d36.689052c",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1960.0001220703125,
-        "y": 667.0001516342163,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "39c58f15.87c84",
-                "b6fb1d33.d4dce",
-                "68afbda6.b2da84"
-            ]
-        ]
-    },
-    {
-        "id": "b6fb1d33.d4dce",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2309.0003204345703,
-        "y": 844.9995563030243,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "18afe330.09bd4d",
-                "730fd2a5.584c7c"
-            ]
-        ]
-    },
-    {
-        "id": "39c58f15.87c84",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyInstances'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$a1-mediator.policyInstancesList`' />",
-        "comments": "",
-        "x": 2304.6669921875,
-        "y": 640.0001220703125,
-        "z": "7ab03abd.cfb3d4",
-        "wires": []
-    },
-    {
-        "id": "18afe330.09bd4d",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2524.5002059936523,
-        "y": 767.9168601036072,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "ddc3776c.e922d8"
-            ]
-        ]
-    },
-    {
-        "id": "730fd2a5.584c7c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2528.5001258850098,
-        "y": 906.916702747345,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "c2e51e51.ce11"
-            ]
-        ]
-    },
-    {
-        "id": "ddc3776c.e922d8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2684.5000400543213,
-        "y": 769.9168610572815,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "37ee6733.0d3ce8"
-            ]
-        ]
-    },
-    {
-        "id": "37ee6733.0d3ce8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 2866.499771118164,
-        "y": 760.9169368743896,
-        "z": "7ab03abd.cfb3d4",
-        "wires": []
-    },
-    {
-        "id": "c2e51e51.ce11",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2711.4997692108154,
-        "y": 899.916811466217,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "79473b19.1f2a54"
-            ]
-        ]
-    },
-    {
-        "id": "79473b19.1f2a54",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2897.4999237060547,
-        "y": 887.9171352386475,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "68afbda6.b2da84",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2307.500259399414,
-        "y": 727.4550924301147,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "91cd032.df9ff",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Deployed'/>\n",
-        "comments": "",
-        "x": 1375.0001525878906,
-        "y": 552.0000214576721,
-        "z": "7ab03abd.cfb3d4",
-        "wires": []
-    },
-    {
-        "id": "e7488f0e.105bf",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
-        "comments": "",
-        "x": 1749.753963470459,
-        "y": 399.00389766693115,
-        "z": "7ab03abd.cfb3d4",
-        "wires": []
-    },
-    {
-        "id": "e2373e18.e3f52",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 715.7538948059082,
-        "y": 809.0039358139038,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "5a09f4bf.92845c",
-                "55e0d36.689052c"
-            ]
-        ]
-    },
-    {
-        "id": "5a09f4bf.92845c",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getPolicyInstances executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 865.7539386749268,
-        "y": 891.0039052963257,
-        "z": "7ab03abd.cfb3d4",
-        "wires": []
-    },
-    {
-        "id": "d59b92db.746d5",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1576.0038719177246,
-        "y": 466.0039281845093,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "e7488f0e.105bf",
-                "55e0d36.689052c",
-                "52dad0a2.d0077"
-            ]
-        ]
-    },
-    {
-        "id": "f8cb76ee.b9e368",
-        "type": "execute",
-        "name": "generate A1 Mediator URL",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.policies`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policyinstances-url\"/>\n    <parameter name=\"target\" value=\"{policy_type_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-type-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1503.0002136230469,
-        "y": 242.00000619888306,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e5e2e791.7e4778",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Instances.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.restapi.policyinstances-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1452.0007286071777,
-        "y": 302.87860012054443,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e3ef35fd.a96518",
-        "type": "execute",
-        "name": "execute TemplateNode",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.template.TemplateNode\" method=\"evaluateTemplate\" >\n    <parameter name='templatePath' value='a1Mediator-get-policy-instances.vtl' />\n    <parameter name='output' value='policyInstancesList' />\n    <parameter name='prefix' value='a1-mediator' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2048,
-        "y": 295,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "21769c4f.d52394"
-            ]
-        ]
-    },
-    {
-        "id": "21769c4f.d52394",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2236,
-        "y": 294,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "1c25c1be.5becce"
-            ]
-        ]
-    },
-    {
-        "id": "1c25c1be.5becce",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2412,
-        "y": 290,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            [
-                "7866876.a2cfe78"
-            ]
-        ]
-    },
-    {
-        "id": "7866876.a2cfe78",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"A1 Policiy Instances List\"/>\n<parameter name='field3' value='`$a1-mediator.policyInstancesList`' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2592,
-        "y": 290,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e055c0d1.c51e3",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/opt/opendaylight/current/data/log/A1-Adapter-getPolicyInstances-context.log' />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2038,
-        "y": 374,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "78e8b370.a1c68c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"List of A1 Policy Types: \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp._length`\"/>\n<parameter name=\"field3\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n<parameter name=\"field4\" value=\"`$a1MediatorRsp.response-code`\"/>\n<parameter name=\"field5\" value='`$a1MediatorRsp._length`' />\n<parameter name=\"field6\" value='`$a1-mediator.policyInstancesList`' />\n\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1975,
-        "y": 457,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "52acbf94.d0542",
-        "type": "execute",
-        "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='a1MediatorRsp.httpResponse' />\n\t<parameter name='outputPath' value='a1MediatorPolicyInstancesList' />\n\t<parameter name='isEscaped' value='false' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2040,
-        "y": 154,
-        "z": "7ab03abd.cfb3d4",
-        "wires": [
-            []
-        ]
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyTypes.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyTypes.json
deleted file mode 100644
index a5378e5e..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyTypes.json
+++ /dev/null
@@ -1,657 +0,0 @@
-[
-    {
-        "id": "6067cd4e.304ae4",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 185,
-        "y": 89,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "70ed549c.b5d70c"
-            ]
-        ]
-    },
-    {
-        "id": "70ed549c.b5d70c",
-        "type": "method",
-        "name": "method getPolicyTypes",
-        "xml": "<method rpc='getPolicyTypes' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 246,
-        "y": 209,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "91bd15a2.424a98"
-            ]
-        ]
-    },
-    {
-        "id": "31ba6243.302d2e",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get All Policy Types from Near RT RIC ID\"/>\n<parameter name=\"field2\" value=\"`$get-policy-types-input.near-rt-ric-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 710,
-        "y": 24,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "91bd15a2.424a98",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 451,
-        "y": 163,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "31ba6243.302d2e",
-                "31915871.748968",
-                "58b6b3e3.593f7c",
-                "19d73ae2.c7f4a5",
-                "673d4b76.d5ea84"
-            ]
-        ]
-    },
-    {
-        "id": "987f4471.584818",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 118,
-        "y": 25,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "6067cd4e.304ae4"
-            ]
-        ]
-    },
-    {
-        "id": "31915871.748968",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getPolicyTypes executed successfully' />",
-        "comments": "",
-        "x": 751.0000610351562,
-        "y": 79,
-        "z": "5e99e485.2d389c",
-        "wires": []
-    },
-    {
-        "id": "58b6b3e3.593f7c",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 750,
-        "y": 131,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "19d73ae2.c7f4a5",
-        "type": "switchNode",
-        "name": "A1 Mediator Deployed",
-        "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 700,
-        "y": 187,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "19811b4a.acaa95",
-                "fc6bbd7a.17bdd"
-            ]
-        ]
-    },
-    {
-        "id": "fc6bbd7a.17bdd",
-        "type": "outcome",
-        "name": "Deployed",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 984.0000457763672,
-        "y": 47.000065326690674,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "4109ed4a.292674"
-            ]
-        ]
-    },
-    {
-        "id": "4109ed4a.292674",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 961.0000953674316,
-        "y": 193.00001764297485,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "86b25e24.27ef5"
-            ]
-        ]
-    },
-    {
-        "id": "19811b4a.acaa95",
-        "type": "outcome",
-        "name": "Not Deployed",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 937.0000686645508,
-        "y": 482.0000615119934,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "6d6ae46c.57116c"
-            ]
-        ]
-    },
-    {
-        "id": "6d6ae46c.57116c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1152.0001068115234,
-        "y": 611.0000143051147,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "fa0fa11d.ceb9",
-                "4fef8f1a.599d4",
-                "287f4673.477b1a"
-            ]
-        ]
-    },
-    {
-        "id": "fa0fa11d.ceb9",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in Getting A1 Policy Types. Aborting\" />",
-        "comments": "",
-        "x": 1276.9998626708984,
-        "y": 691.9999988079071,
-        "z": "5e99e485.2d389c",
-        "wires": []
-    },
-    {
-        "id": "86b25e24.27ef5",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1156.0001220703125,
-        "y": 305,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "f9fbf240.fa61f",
-                "5f33ee47.bd2a1",
-                "609ca78d.4934f8"
-            ]
-        ]
-    },
-    {
-        "id": "5f33ee47.bd2a1",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$get-policy-types-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.restapi.getPolicyTypes-url\" value=\"`$prop.restapi.policytypes`\"/>",
-        "comments": "",
-        "x": 1525.001377105713,
-        "y": 238.88912391662598,
-        "z": "5e99e485.2d389c",
-        "wires": []
-    },
-    {
-        "id": "f9fbf240.fa61f",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Types.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.restapi.getPolicyTypes-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1414.0000305175781,
-        "y": 292.00000286102295,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "609ca78d.4934f8",
-        "type": "execute",
-        "name": "Get Policy Types",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.a1Mediator.url + '/' + $tmp.restapi.getPolicyTypes-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1453.0006103515625,
-        "y": 377.0103759765625,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "bdaa1249.dc6c4",
-                "9810268a.b5ebc8"
-            ]
-        ]
-    },
-    {
-        "id": "bdaa1249.dc6c4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1408.0000305175781,
-        "y": 455.00011348724365,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "b9f104a6.8bd438"
-            ]
-        ]
-    },
-    {
-        "id": "9810268a.b5ebc8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1652.0002746582031,
-        "y": 326.0000219345093,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "31d1df15.23aae"
-            ]
-        ]
-    },
-    {
-        "id": "23eb1a0d.7e8d46",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in Getting A1 Policy Types. Aborting\" />",
-        "comments": "",
-        "x": 1568.0006103515625,
-        "y": 562.0000829696655,
-        "z": "5e99e485.2d389c",
-        "wires": []
-    },
-    {
-        "id": "31d1df15.23aae",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1801.9998798370361,
-        "y": 290.00005197525024,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "f2eaf7c1.ad8c98",
-                "87eb9f5d.78ef7",
-                "2c6137d1.211508",
-                "3ff97da4.fc2632"
-            ]
-        ]
-    },
-    {
-        "id": "f2eaf7c1.ad8c98",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"List of A1 Policy Types: \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp._length`\"/>\n<parameter name=\"field3\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n<parameter name=\"field4\" value=\"`$a1MediatorRsp.response-code`\"/>\n<parameter name=\"field5\" value='`$a1MediatorRsp._length`' />\n<parameter name=\"field6\" value='`$a1-mediator.policiesList`' />\n\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1980,
-        "y": 283,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4fef8f1a.599d4",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1938.0001220703125,
-        "y": 659.0001516342163,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "a2679af6.639ab8",
-                "968b7857.8630b8",
-                "be33abf4.cf9ec8"
-            ]
-        ]
-    },
-    {
-        "id": "968b7857.8630b8",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2295.000244140625,
-        "y": 843.9995727539062,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "83072b70.549ff8",
-                "649a948c.8fd06c"
-            ]
-        ]
-    },
-    {
-        "id": "a2679af6.639ab8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyTypes'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$a1-mediator.policiesList`'  />",
-        "comments": "",
-        "x": 2276.6669921875,
-        "y": 629.0001220703125,
-        "z": "5e99e485.2d389c",
-        "wires": []
-    },
-    {
-        "id": "83072b70.549ff8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2502.5002059936523,
-        "y": 759.9168601036072,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "c3f33449.19fdb8"
-            ]
-        ]
-    },
-    {
-        "id": "649a948c.8fd06c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2506.5001258850098,
-        "y": 898.916702747345,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "eb0e78e3.be81d8"
-            ]
-        ]
-    },
-    {
-        "id": "c3f33449.19fdb8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2662.5000400543213,
-        "y": 761.9168610572815,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "5929c9fd.274ba8"
-            ]
-        ]
-    },
-    {
-        "id": "5929c9fd.274ba8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 2844.499771118164,
-        "y": 752.9169368743896,
-        "z": "5e99e485.2d389c",
-        "wires": []
-    },
-    {
-        "id": "eb0e78e3.be81d8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2689.4997692108154,
-        "y": 891.916811466217,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "af7b183b.0a64f8"
-            ]
-        ]
-    },
-    {
-        "id": "af7b183b.0a64f8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2875.4999237060547,
-        "y": 879.9171352386475,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "be33abf4.cf9ec8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2286.500244140625,
-        "y": 721.455078125,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "287f4673.477b1a",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Deployed'/>\n",
-        "comments": "",
-        "x": 1353.0001525878906,
-        "y": 544.0000214576721,
-        "z": "5e99e485.2d389c",
-        "wires": []
-    },
-    {
-        "id": "f45cf0c4.2c4fe",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
-        "comments": "",
-        "x": 1727.753963470459,
-        "y": 391.00389766693115,
-        "z": "5e99e485.2d389c",
-        "wires": []
-    },
-    {
-        "id": "673d4b76.d5ea84",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 693.7538948059082,
-        "y": 801.0039358139038,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "8deed83d.906568",
-                "4fef8f1a.599d4"
-            ]
-        ]
-    },
-    {
-        "id": "8deed83d.906568",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 Adapter is healthy'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 845.7539672851562,
-        "y": 885.00390625,
-        "z": "5e99e485.2d389c",
-        "wires": []
-    },
-    {
-        "id": "b9f104a6.8bd438",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1554.0038719177246,
-        "y": 458.0039281845093,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "f45cf0c4.2c4fe",
-                "4fef8f1a.599d4",
-                "23eb1a0d.7e8d46"
-            ]
-        ]
-    },
-    {
-        "id": "87eb9f5d.78ef7",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/opt/opendaylight/current/data/log/A1-Adapter-getPolicytype-context.log' />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2006,
-        "y": 219,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2c6137d1.211508",
-        "type": "execute",
-        "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='a1MediatorRsp.httpResponse' />\n\t<parameter name='outputPath' value='a1MediatorList' />\n\t<parameter name='isEscaped' value='false' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1956,
-        "y": 111,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3ff97da4.fc2632",
-        "type": "execute",
-        "name": "execute TemplateNode",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.template.TemplateNode\" method=\"evaluateTemplate\" >\n    <parameter name='templatePath' value='a1Mediator-get-policies.vtl' />\n    <parameter name='output' value='policiesList' />\n    <parameter name='prefix' value='a1-mediator' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2008,
-        "y": 164,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "4f1ae297.8f552c"
-            ]
-        ]
-    },
-    {
-        "id": "4f1ae297.8f552c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2249,
-        "y": 170,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "200dc8d5.ba2168"
-            ]
-        ]
-    },
-    {
-        "id": "200dc8d5.ba2168",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2428,
-        "y": 176,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            [
-                "a127ad59.e337"
-            ]
-        ]
-    },
-    {
-        "id": "a127ad59.e337",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"A1 Policies List\"/>\n<parameter name='field3' value='`$a1-mediator.policiesList`' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2617,
-        "y": 179,
-        "z": "5e99e485.2d389c",
-        "wires": [
-            []
-        ]
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getStatus.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getStatus.json
deleted file mode 100644
index 300868d0..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getStatus.json
+++ /dev/null
@@ -1,608 +0,0 @@
-[
-    {
-        "id": "3c3a2ad2.f07166",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 197.00390625,
-        "y": 119.00390625,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "74ad4fbc.157c"
-            ]
-        ]
-    },
-    {
-        "id": "74ad4fbc.157c",
-        "type": "method",
-        "name": "method getStatus",
-        "xml": "<method rpc='getStatus' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 258.00390625,
-        "y": 239.00390625,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "c0d4359e.2a6258"
-            ]
-        ]
-    },
-    {
-        "id": "7a8ce664.bcc1c8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get status of Policy Instance  associated with Near RT RIC ID and Policy Type ID\"/>\n<parameter name=\"field2\" value=\"`$get-status-input.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$get-status-input.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$get-status-input.policy-instance-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 722.00390625,
-        "y": 54.00390625,
-        "z": "9552257b.e12f18",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c0d4359e.2a6258",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 463.00390625,
-        "y": 193.00390625,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "7a8ce664.bcc1c8",
-                "dc6fba67.8ffaa8",
-                "37a3fd8a.4c4282",
-                "a8ad4a87.1a43b8",
-                "1adcc935.c5c347"
-            ]
-        ]
-    },
-    {
-        "id": "2f0dcd2b.7b79c2",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 130.00390625,
-        "y": 55.00390625,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "3c3a2ad2.f07166"
-            ]
-        ]
-    },
-    {
-        "id": "dc6fba67.8ffaa8",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getStatus executed successfully' />",
-        "comments": "",
-        "x": 762.0039520263672,
-        "y": 108.00390720367432,
-        "z": "9552257b.e12f18",
-        "wires": []
-    },
-    {
-        "id": "37a3fd8a.4c4282",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 762.00390625,
-        "y": 161.00390625,
-        "z": "9552257b.e12f18",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a8ad4a87.1a43b8",
-        "type": "switchNode",
-        "name": "A1 Mediator Deployed",
-        "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 712.00390625,
-        "y": 217.00390625,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "f7c78ac8.3c1058",
-                "c469f2b7.09aa3"
-            ]
-        ]
-    },
-    {
-        "id": "c469f2b7.09aa3",
-        "type": "outcome",
-        "name": "Deployed",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 996.0039520263672,
-        "y": 77.00397157669067,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "57b7da77.8ef044"
-            ]
-        ]
-    },
-    {
-        "id": "57b7da77.8ef044",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 973.0040016174316,
-        "y": 223.00392389297485,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "6b5593ee.2a34bc"
-            ]
-        ]
-    },
-    {
-        "id": "f7c78ac8.3c1058",
-        "type": "outcome",
-        "name": "Not Deployed",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 949.0039749145508,
-        "y": 512.0039677619934,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "c641e0cc.9d7f"
-            ]
-        ]
-    },
-    {
-        "id": "c641e0cc.9d7f",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1164.0040130615234,
-        "y": 641.0039205551147,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "5bdef8d5.553548",
-                "15cefea7.d2def1",
-                "6dfd6f84.cc9c8"
-            ]
-        ]
-    },
-    {
-        "id": "5bdef8d5.553548",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in getting status for A1 Policy Instance. Aborting\" />",
-        "comments": "",
-        "x": 1294.0038299560547,
-        "y": 722.0039048194885,
-        "z": "9552257b.e12f18",
-        "wires": []
-    },
-    {
-        "id": "6b5593ee.2a34bc",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1167.0040130615234,
-        "y": 334.00391072034836,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "c2d8e6b5.f504d8",
-                "f356d787.c7f2e8",
-                "c564e7c.a479218",
-                "655080be.208e2",
-                "4e461392.18bdfc",
-                "6030c496.ec537c"
-            ]
-        ]
-    },
-    {
-        "id": "f356d787.c7f2e8",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$get-status-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.policy-type-id\" value=\"`$get-status-input.policy-type-id`\"/>\n<parameter name=\"tmp.policy-instance-id\" value=\"`$get-status-input.policy-instance-id`\"/>\n",
-        "comments": "",
-        "x": 1505.00537109375,
-        "y": 131.8930368423462,
-        "z": "9552257b.e12f18",
-        "wires": []
-    },
-    {
-        "id": "c2d8e6b5.f504d8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Getting status for Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.policy-instance-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1426.0040016174316,
-        "y": 185.00390911102295,
-        "z": "9552257b.e12f18",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c564e7c.a479218",
-        "type": "execute",
-        "name": "Get status for Policy Instance",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.a1Mediator.url + '/' + $tmp.restapi.policyinstance-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"false\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1444.0045166015625,
-        "y": 388.0143041610718,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "ccced85.7777228",
-                "f2c317e4.c0a588"
-            ]
-        ]
-    },
-    {
-        "id": "ccced85.7777228",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1420.0039367675781,
-        "y": 485.00401973724365,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "e3a55242.ba0f8"
-            ]
-        ]
-    },
-    {
-        "id": "f2c317e4.c0a588",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1664.0041809082031,
-        "y": 356.0039281845093,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "58943e05.6cd2c"
-            ]
-        ]
-    },
-    {
-        "id": "68c4a72e.2d8038",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error in Getting status for A1 Policy Instance. Aborting\" />",
-        "comments": "",
-        "x": 1580.0045166015625,
-        "y": 592.0039892196655,
-        "z": "9552257b.e12f18",
-        "wires": []
-    },
-    {
-        "id": "58943e05.6cd2c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1814.0037860870361,
-        "y": 320.00395822525024,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "1e2eb507.6b9d3b"
-            ]
-        ]
-    },
-    {
-        "id": "1e2eb507.6b9d3b",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Status of A1 Policy Instance \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1994.0039100646973,
-        "y": 294.00390911102295,
-        "z": "9552257b.e12f18",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "15cefea7.d2def1",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1950.0040283203125,
-        "y": 689.0040578842163,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "c4c2287c.45f668",
-                "ef09f7c9.e46938",
-                "ea077f87.6cf36"
-            ]
-        ]
-    },
-    {
-        "id": "ef09f7c9.e46938",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2299.0042266845703,
-        "y": 867.0034625530243,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "56d4b2fa.e81c7c",
-                "4e9872e.f9bfd8c"
-            ]
-        ]
-    },
-    {
-        "id": "c4c2287c.45f668",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='getStatus'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value=\"Working On it\" />",
-        "comments": "",
-        "x": 2288.670944213867,
-        "y": 658.0040187835693,
-        "z": "9552257b.e12f18",
-        "wires": []
-    },
-    {
-        "id": "56d4b2fa.e81c7c",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2514.5041122436523,
-        "y": 789.9207663536072,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "5d41321f.9b1c6c"
-            ]
-        ]
-    },
-    {
-        "id": "4e9872e.f9bfd8c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2518.5040321350098,
-        "y": 928.920608997345,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "6c4b1d08.1e7724"
-            ]
-        ]
-    },
-    {
-        "id": "5d41321f.9b1c6c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2674.5039463043213,
-        "y": 791.9207673072815,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "b2cf39d7.1c7108"
-            ]
-        ]
-    },
-    {
-        "id": "b2cf39d7.1c7108",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 2856.503677368164,
-        "y": 782.9208431243896,
-        "z": "9552257b.e12f18",
-        "wires": []
-    },
-    {
-        "id": "6c4b1d08.1e7724",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2701.5036754608154,
-        "y": 921.920717716217,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "45e70b37.809a64"
-            ]
-        ]
-    },
-    {
-        "id": "45e70b37.809a64",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2887.5038299560547,
-        "y": 909.9210414886475,
-        "z": "9552257b.e12f18",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ea077f87.6cf36",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2297.504165649414,
-        "y": 749.4589986801147,
-        "z": "9552257b.e12f18",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6dfd6f84.cc9c8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='A1 Mediator Not Deployed'/>\n",
-        "comments": "",
-        "x": 1344.0041160583496,
-        "y": 575.0038986206055,
-        "z": "9552257b.e12f18",
-        "wires": []
-    },
-    {
-        "id": "ed51b6d5.6a78a8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
-        "comments": "",
-        "x": 1739.757869720459,
-        "y": 421.00780391693115,
-        "z": "9552257b.e12f18",
-        "wires": []
-    },
-    {
-        "id": "1adcc935.c5c347",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 705.7578010559082,
-        "y": 831.0078420639038,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "d837205f.9c11d",
-                "15cefea7.d2def1"
-            ]
-        ]
-    },
-    {
-        "id": "d837205f.9c11d",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getStatus executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 860.7578887939453,
-        "y": 915.0078468322754,
-        "z": "9552257b.e12f18",
-        "wires": []
-    },
-    {
-        "id": "e3a55242.ba0f8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1566.0077781677246,
-        "y": 488.0078344345093,
-        "z": "9552257b.e12f18",
-        "wires": [
-            [
-                "ed51b6d5.6a78a8",
-                "15cefea7.d2def1",
-                "68c4a72e.2d8038"
-            ]
-        ]
-    },
-    {
-        "id": "655080be.208e2",
-        "type": "execute",
-        "name": "generate A1 Mediator URL 1",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.policystatus`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policyinstance-url\"/>\n    <parameter name=\"target\" value=\"{policy_type_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-type-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1502.0044250488281,
-        "y": 233.00390911102295,
-        "z": "9552257b.e12f18",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4e461392.18bdfc",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter getting status for Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.policy-instance-id`\"/>\n<parameter name=\"field5\" value=\"`$tmp.restapi.policyinstance-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1442.0046348571777,
-        "y": 324.88250637054443,
-        "z": "9552257b.e12f18",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6030c496.ec537c",
-        "type": "execute",
-        "name": "generate A1 Mediator URL 2",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.restapi.policyinstance-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.restapi.policyinstance-url\"/>\n    <parameter name=\"target\" value=\"{policy_instance_id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.policy-instance-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1501.2538757324219,
-        "y": 283.00391244888306,
-        "z": "9552257b.e12f18",
-        "wires": [
-            []
-        ]
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_notifyPolicyEnforcementUpdate.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_notifyPolicyEnforcementUpdate.json
deleted file mode 100644
index fc7288dc..00000000
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_notifyPolicyEnforcementUpdate.json
+++ /dev/null
@@ -1,300 +0,0 @@
-[
-    {
-        "id": "d607a46.e92cb58",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 174,
-        "y": 115,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            [
-                "2e999e7.6f2df62"
-            ]
-        ]
-    },
-    {
-        "id": "2e999e7.6f2df62",
-        "type": "method",
-        "name": "method notifyPolicyEnforcementUpdate",
-        "xml": "<method rpc='notifyPolicyEnforcementUpdate' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 256,
-        "y": 249,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            [
-                "5f8adea.c825d2"
-            ]
-        ]
-    },
-    {
-        "id": "f3f643f9.0b58f",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Adapter - notify policy enforcement update\"/>\n<parameter name=\"field2\" value=\"`$notify-policy-enforcement-update-input.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$notify-policy-enforcement-update-input.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$notify-policy-enforcement-update-input.policy-instance-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 714,
-        "y": 58,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5f8adea.c825d2",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 440,
-        "y": 189,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            [
-                "f3f643f9.0b58f",
-                "1d7cdc6d.ec16a4",
-                "fa6b1b92.347cc8",
-                "11dff310.728f7d",
-                "28b301ee.8e0efe",
-                "cee75651.1a7348",
-                "f216c1e8.790c3"
-            ]
-        ]
-    },
-    {
-        "id": "2e00adb0.ee7092",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 107,
-        "y": 51,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            [
-                "d607a46.e92cb58"
-            ]
-        ]
-    },
-    {
-        "id": "1d7cdc6d.ec16a4",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Policy Enforcement Update Received' />",
-        "comments": "",
-        "x": 750,
-        "y": 105,
-        "z": "fcb09084.b4e08",
-        "wires": []
-    },
-    {
-        "id": "fa6b1b92.347cc8",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 736,
-        "y": 149,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "28b301ee.8e0efe",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"SNear-RT RIC ID\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>\n<parameter name=\"field4\" value=\"`$tmp.policy-instance-id`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 737,
-        "y": 267,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "cee75651.1a7348",
-        "type": "block",
-        "name": "DMAAP Reponse Publish",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 756.0001220703125,
-        "y": 342.0001220703125,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            [
-                "f50bdebd.3de09",
-                "6575ab06.dda994",
-                "320829fe.db34f6"
-            ]
-        ]
-    },
-    {
-        "id": "6575ab06.dda994",
-        "type": "execute",
-        "name": "execute DmaapMsg",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n    <parameter name='restapiUrl' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name='responsePrefix' value='dmaap' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1041.0003204345703,
-        "y": 486.9995563030243,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            [
-                "4e1391bd.8d447",
-                "3c57dd0f.634742"
-            ]
-        ]
-    },
-    {
-        "id": "f50bdebd.3de09",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='notifyPolicyEnforcementUpdate'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>\n<parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>\n<parameter name='tmp.a1Policy-dmaap-resp.payload' value=\"Policy Enforcement Update - Policies Applied\" />",
-        "comments": "",
-        "x": 1030.6669921875,
-        "y": 278.0001220703125,
-        "z": "fcb09084.b4e08",
-        "wires": []
-    },
-    {
-        "id": "4e1391bd.8d447",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1256.5002059936523,
-        "y": 409.9168601036072,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            [
-                "4ae10a72.001ec4"
-            ]
-        ]
-    },
-    {
-        "id": "3c57dd0f.634742",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1260.5001258850098,
-        "y": 548.916702747345,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            [
-                "67e3a637.e66228"
-            ]
-        ]
-    },
-    {
-        "id": "4ae10a72.001ec4",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1416.5000400543213,
-        "y": 411.9168610572815,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            [
-                "36a5b080.f013b"
-            ]
-        ]
-    },
-    {
-        "id": "36a5b080.f013b",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"500\" />\n<parameter name=\"response-message\" value=\"Error publishing DMAAP A1 Policy Response message. \" />",
-        "comments": "",
-        "x": 1598.499771118164,
-        "y": 402.91693687438965,
-        "z": "fcb09084.b4e08",
-        "wires": []
-    },
-    {
-        "id": "67e3a637.e66228",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1443.4997692108154,
-        "y": 541.916811466217,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            [
-                "aaed77f7.aba678"
-            ]
-        ]
-    },
-    {
-        "id": "aaed77f7.aba678",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"DMAAP A1Policy message Successfully Published \"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1631.5,
-        "y": 532.9171142578125,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "320829fe.db34f6",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Before DMAAP Event - template file name, restapiURL\"/>\n<parameter name='field3' value=\"`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`\" />\n<parameter name='field4' value=\"`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`\" />\n<parameter name='field5' value=\"Status Code and Status Value to be published\" />\n<parameter name='field6' value=\"`$tmp.a1Adapter-dmaap-resp.status-code`\" />\n<parameter name='field7' value=\"`$tmp.a1Adapter-dmaap-resp.status-value`\" />\n<parameter name='field8' value=\"A1 Adapter DMAAP Response Payload\" />\n<parameter name='field9' value=\"`$tmp.a1Policy-dmaap-resp.payload`\" />\n<parameter name='field10' value=\"RPC Name\" />\n<parameter name='field11' value=\"`$tmp.a1-adapter-api.rpc-name`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1037.5002517700195,
-        "y": 363.4550609588623,
-        "z": "fcb09084.b4e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f216c1e8.790c3",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Policy Enforcement Update Received'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 674.7539672851562,
-        "y": 442.00390625,
-        "z": "fcb09084.b4e08",
-        "wires": []
-    },
-    {
-        "id": "11dff310.728f7d",
-        "type": "set",
-        "name": "set tmp variables for Near RT RIC ID",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-id\" value=\"`$notify-policy-enforcement-update-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.policy-type-id\" value=\"`$notify-policy-enforcement-update-input.policy-type-id`\"/>\n<parameter name=\"tmp.policy-instance-id\" value=\"`$notify-policy-enforcement-update-input.policy-instance-id`\"/>",
-        "comments": "",
-        "x": 843,
-        "y": 214,
-        "z": "fcb09084.b4e08",
-        "wires": []
-    }
-]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json
new file mode 100644
index 00000000..419d5b71
--- /dev/null
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json
@@ -0,0 +1,273 @@
+[
+    {
+        "id": "270a5aa5.bc52d6",
+        "type": "service-logic",
+        "name": "A1-ADAPTER-API ${project.version}",
+        "module": "A1-ADAPTER-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 171,
+        "y": 150,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            [
+                "187cb7f8.135d08"
+            ]
+        ]
+    },
+    {
+        "id": "187cb7f8.135d08",
+        "type": "method",
+        "name": "method putA1Policy",
+        "xml": "<method rpc='putA1Policy' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 158,
+        "y": 219,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            [
+                "60165fbc.5b22d8"
+            ]
+        ]
+    },
+    {
+        "id": "ca1b73bb.bd73a",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Put A1 Policy :\"/>\n<parameter name=\"field2\" value=\"`$put-a1-policy-input.near-rt-ric-url`\"/>\n<parameter name=\"field3\" value=\"`$put-a1-policy-input.body`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 472,
+        "y": 187,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "60165fbc.5b22d8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 222,
+        "y": 286,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            [
+                "ca1b73bb.bd73a",
+                "3bda5968.b55f7e",
+                "a7fa8c3e.f91198",
+                "d671108f.2dd19"
+            ]
+        ]
+    },
+    {
+        "id": "86499c8c.9221c",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 99,
+        "y": 88,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            [
+                "270a5aa5.bc52d6"
+            ]
+        ]
+    },
+    {
+        "id": "3bda5968.b55f7e",
+        "type": "execute",
+        "name": "execute Properties",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 506,
+        "y": 285,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f71250c1.d2e79",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 988.0001220703125,
+        "y": 363.00006103515625,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            [
+                "424bcc5a.68059c"
+            ]
+        ]
+    },
+    {
+        "id": "678803c.a1c0efc",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 995.0003051757812,
+        "y": 453.0000457763672,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            [
+                "d61f47fe.10e5e8"
+            ]
+        ]
+    },
+    {
+        "id": "d61f47fe.10e5e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1136.9999389648438,
+        "y": 449.00006103515625,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            [
+                "44bf0d67.60023c"
+            ]
+        ]
+    },
+    {
+        "id": "b1b2cbaf.574838",
+        "type": "set",
+        "name": "set tmp variables for input RPC parms",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$put-a1-policy-input.near-rt-ric-url`\"/>\n<parameter name=\"tmp.body\" value=\"`$put-a1-policy-input.body`\"/>",
+        "comments": "",
+        "x": 884.0010375976562,
+        "y": 239.88909912109375,
+        "z": "33919dc9.0e17ba",
+        "wires": []
+    },
+    {
+        "id": "1fe61572.90f523",
+        "type": "execute",
+        "name": "Put A1 Policy",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"PUT\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"requestBody\" value=\"`$tmp.body`\"/>\n<parameter name=\"convertResponse\" value=\"false\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 811.00048828125,
+        "y": 411.0103759765625,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            [
+                "f71250c1.d2e79",
+                "678803c.a1c0efc"
+            ]
+        ]
+    },
+    {
+        "id": "d671108f.2dd19",
+        "type": "block",
+        "name": "A1 Mediator RestAPI Invocation",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 542.0000305175781,
+        "y": 350.00006103515625,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            [
+                "8d62fd00.aa56e",
+                "b1b2cbaf.574838",
+                "1fe61572.90f523"
+            ]
+        ]
+    },
+    {
+        "id": "8d62fd00.aa56e",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for Put A1 Policy.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.body`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 807.0000610351562,
+        "y": 335,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "44bf0d67.60023c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Policy Instance Created.\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1293,
+        "y": 448.00006103515625,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a0360147.468f3",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error creating A1 Policy. Aborting A1 Policy creation\" />",
+        "comments": "",
+        "x": 1286,
+        "y": 401,
+        "z": "33919dc9.0e17ba",
+        "wires": []
+    },
+    {
+        "id": "a7fa8c3e.f91198",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Put A1 Policy executed successfully' />",
+        "comments": "",
+        "x": 517,
+        "y": 240,
+        "z": "33919dc9.0e17ba",
+        "wires": []
+    },
+    {
+        "id": "424bcc5a.68059c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1124,
+        "y": 361,
+        "z": "33919dc9.0e17ba",
+        "wires": [
+            [
+                "b8ca1bb9.7870e",
+                "a0360147.468f3"
+            ]
+        ]
+    },
+    {
+        "id": "b8ca1bb9.7870e",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-code' value='500'/>\n<parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>\n",
+        "comments": "",
+        "x": 1268,
+        "y": 307,
+        "z": "33919dc9.0e17ba",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/resources/graph.versions b/platform-logic/a1Adapter-api/src/main/resources/graph.versions
index 6be6e239..0c029822 100644
--- a/platform-logic/a1Adapter-api/src/main/resources/graph.versions
+++ b/platform-logic/a1Adapter-api/src/main/resources/graph.versions
@@ -1,12 +1,5 @@
-A1-ADAPTER-API getNearRT-RICs ${project.version} sync
-A1-ADAPTER-API getHealthCheck ${project.version} sync
-A1-ADAPTER-API getPolicyTypes ${project.version} sync
-A1-ADAPTER-API createPolicyType ${project.version} sync
+A1-ADAPTER-API deleteA1Policy ${project.version} sync
+A1-ADAPTER-API getA1Policy ${project.version} sync
+A1-ADAPTER-API getA1PolicyStatus ${project.version} sync
 A1-ADAPTER-API getA1PolicyType ${project.version} sync
-A1-ADAPTER-API getPolicyInstances ${project.version} sync
-A1-ADAPTER-API createPolicyInstance ${project.version} sync
-A1-ADAPTER-API getPolicyInstance ${project.version} sync
-A1-ADAPTER-API deletePolicyInstance ${project.version} sync
-A1-ADAPTER-API getStatus ${project.version} sync
-A1-ADAPTER-API notifyPolicyEnforcementUpdate ${project.version} sync
-A1-ADAPTER-API deletePolicyType ${project.version} sync
+A1-ADAPTER-API putA1Policy ${project.version} sync
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_createPolicyInstance.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_createPolicyInstance.xml
deleted file mode 100644
index 569c8db5..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_createPolicyInstance.xml
+++ /dev/null
@@ -1,470 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='createPolicyInstance' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="A1 Adapter Create Policy Instance. RPC Parms:"/>
-                <parameter name="field2" value="`$create-policy-instance-input.near-rt-ric-id`"/>
-                <parameter name="field3" value="`$create-policy-instance-input.policy-type-id`"/>
-                <parameter name="field4" value="`$create-policy-instance-input.policy-instance-id`"/>
-                <parameter name="field5" value="A1 Adapter Create Policy Instance. Number of Policy Properties"/>
-                <parameter name="field6" value="`$create-policy-instance-input.properties_length`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='Successful execution of createPolicyInstance RPC' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <for index='idx' start='0' end='`$create-policy-instance-input.properties_length`' >
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                    <parameter name="level" value="info" />
-                    <parameter name="field1" value="A1 Adapter Create Policy Instance. Properties Name and Value"/>
-                    <parameter name="field2" value="`$idx`"/>
-                    <parameter name="field3" value="`$create-policy-instance-input.properties[$idx].property-name`"/>
-                    <parameter name="field4" value="`$create-policy-instance-input.properties[$idx].property-value`"/>
-                </record>
-            </for>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Properties read .. A1 Mediator Target"/>
-                <parameter name="field2" value="`$prop.oofpcipoc.patch.pci.target`"/>
-                <parameter name="field3" value="`$prop.controller.user`"/>
-                <parameter name="field4" value="`$prop.controller.pwd`"/>
-                <parameter name="field5" value="`$prop.controller.url`"/>
-                <parameter name="field6" value="A1 Mediator deployed (true/false): "/>
-                <parameter name="field7" value="`$prop.ric-plt-A1Mediator-deployed`"/>
-            </record>
-            <switch test='`$prop.ric-plt-A1Mediator-deployed`'>
-                <outcome value='true'>
-                    <block atomic='true'>
-                        <block atomic='true'>
-                            <execute plugin="org.onap.ccsdk.sli.plugins.template.TemplateNode" method="evaluateTemplate" >
-                                <parameter name='templatePath' value='a1-policy-instance-property-payload-template.vtl' />
-                                <parameter name='output' value='restapi-payload' />
-                                <parameter name='prefix' value='a1-mediator' />
-                                <outcome value='success'>
-                                    <block atomic='true'>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                            <parameter name="field2" value="Redndred A1 Mediator RestAPI payload template as a string"/>
-                                            <parameter name='field3' value='`$a1-mediator.restapi-payload`' />
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name='response-message' value='Error creating A1 Mediator Rest API payload string. Aborting A1 Policy Instance creation'/>
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error creating A1 Mediatory Rest API payload string. Aborting A1 Policy Instance creation" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyInstance'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
-                                <parameter name="source" value="`$a1-mediator.restapi-payload`"/>
-                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.payload"/>
-                                <parameter name="target" value="\n"/>
-                                <parameter name="replacement" value=""/>
-                                <outcome value='success'>
-                                    <block atomic='true'>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                            <parameter name="field2" value="Redndred template with lines removed \r"/>
-                                            <parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name="response-message" value="Error removing lines from A1 Mediator Rest API payload string. Aborting A1 Policy Instance creation" />
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error removing lines from A1 Mediator Rest API payload string. Aborting A1 Policy creation" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyInstance'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
-                                <parameter name="source" value="`$tmp.a1-mediator-restapi.payload`"/>
-                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.payload"/>
-                                <parameter name="target" value="\t"/>
-                                <parameter name="replacement" value=""/>
-                                <outcome value='success'>
-                                    <block atomic='true'>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                            <parameter name="field2" value="Redndred template with tabs removed \r"/>
-                                            <parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name="response-message" value="Error removing tabs from A1 Mediator Rest API payload string. Aborting A1 Policy Instance creation" />
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error removing tabs from A1 Mediator Rest API payload string. Aborting A1 Policy creation" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyInstance'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name="tmp.near-rt-ric-id" value="`$create-policy-instance-input.near-rt-ric-id`"/>
-                                <parameter name="tmp.policy-type-id" value="`$create-policy-instance-input.policy-type-id`"/>
-                                <parameter name="tmp.policy-instance-id" value="`$create-policy-instance-input.policy-instance-id`"/>
-                            </set>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$prop.restapi.policy`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policy-url"/>
-                                <parameter name="target" value="{policy_type_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-type-id`"/>
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$tmp.restapi.policy-url`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policy-url"/>
-                                <parameter name="target" value="{policy_instance_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-instance-id`"/>
-                            </execute>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Create Policy Instance."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                                <parameter name="field4" value="`$tmp.policy-instance-id`"/>
-                                <parameter name="field5" value="`$tmp.restapi.policy-url`"/>
-                                <parameter name="field6" value="`$a1-mediator.restapi-payload`"/>
-                                <parameter name="field7" value="Temporary A1 Mediatory Payload"/>
-                                <parameter name="field8" value="`$tmp.a1-mediator-restapi.payload`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.a1Mediator.url + '/' + $tmp.restapi.policy-url`"/>
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="PUT"/>
-                                <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='accept' value='application/json' />
-                                <parameter name="requestBody" value="`$tmp.a1-mediator-restapi.payload`"/>
-                                <parameter name="convertResponse" value="false"/>
-                                <outcome value='failure'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="response-code" value="404" />
-                                        <parameter name="response-message" value="Error creating A1 Policy Instance. Aborting A1 Policy creation" />
-                                    </return>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="A1 Policy Instance Accepted."/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                    </block>
-                </outcome>
-                <outcome value='false'>
-                    <block>
-                        <set>
-                            <parameter name='response-code' value='500'/>
-                            <parameter name='response-message' value='A1 Mediator Not Deployed'/>
-                        </set>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyInstance'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                <parameter name='field10' value="RPC Name" />
-                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='format' value='json' />
-                                <parameter name='httpMethod' value='POST' />
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='responsePrefix' value='dmaap' />
-                                <outcome value='failure'>
-                                    <block>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                        </return>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="response-code" value="500" />
-                            <parameter name="response-message" value="A1 Mediator Not Deployed. Aborting A1 Policy creation" />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <block atomic='true'>
-                    <set>
-                        <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyInstance'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                        <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                        <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='field5' value="Status Code and Status Value to be published" />
-                        <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                        <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                        <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                        <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                        <parameter name='field10' value="RPC Name" />
-                        <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='format' value='json' />
-                        <parameter name='httpMethod' value='POST' />
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='responsePrefix' value='dmaap' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="response-code" value="500" />
-                                    <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='A1 Adapter is healthy'/>
-                    <parameter name='health-status' value='200'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_createPolicyType.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_createPolicyType.xml
deleted file mode 100644
index 11b7c70d..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_createPolicyType.xml
+++ /dev/null
@@ -1,534 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='createPolicyType' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="A1 Adapter Create Policy Type. RPC Parms:"/>
-                <parameter name="field2" value="`$create-policy-type-input.near-rt-ric-id`"/>
-                <parameter name="field3" value="`$create-policy-type-input.policy-type-id`"/>
-                <parameter name="field4" value="`$create-policy-type-input.description`"/>
-                <parameter name="field5" value="A1 Adapter Create Policy Type Name:"/>
-                <parameter name="field6" value="`$create-policy-type-input.name`"/>
-                <parameter name="field7" value="A1 Adapter Create Policy Type. Number of Policy Type Properties"/>
-                <parameter name="field8" value="`$create-policy-type-input.properties_length`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='Successful execution of createPolicyType RPC' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <for index='idx1' start='0' end='`$create-policy-type-input.properties_length`' >
-                <block atomic='true'>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="A1 Adapter Create Policy Type. Properties Number, Name and Number of Policy Statements"/>
-                        <parameter name="field2" value="`$idx1`"/>
-                        <parameter name="field3" value="`$create-policy-type-input.properties[$idx1].property-name`"/>
-                        <parameter name="field4" value="`$create-policy-type-input.properties[$idx1].policy-statements_length`"/>
-                    </record>
-                    <for index='idx2' start='0' end='`$create-policy-type-input.properties[$idx1].policy-statements_length`' >
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                            <parameter name="level" value="info" />
-                            <parameter name="field1" value="A1 Adapter Create Policy Type. Policy Statements for policy statement # "/>
-                            <parameter name="field2" value="`$idx2`"/>
-                            <parameter name="field3" value="`$create-policy-type-input.properties[$idx1].policy-statements[$idx2].policy-statement`"/>
-                            <parameter name="field4" value="`$create-policy-type-input.properties[$idx1].policy-statements[$idx2].policy-statement-value`"/>
-                        </record>
-                    </for>
-                </block>
-            </for>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Properties read .. A1 Mediator Target"/>
-                <parameter name="field2" value="`$prop.oofpcipoc.patch.pci.target`"/>
-                <parameter name="field3" value="`$prop.controller.user`"/>
-                <parameter name="field4" value="`$prop.controller.pwd`"/>
-                <parameter name="field5" value="`$prop.controller.url`"/>
-                <parameter name="field6" value="A1 Mediator deployed (true/false): "/>
-                <parameter name="field7" value="`$prop.ric-plt-A1Mediator-deployed`"/>
-            </record>
-            <switch test='`$prop.ric-plt-A1Mediator-deployed`'>
-                <outcome value='true'>
-                    <block atomic='true'>
-                        <block atomic='true'>
-                            <execute plugin="org.onap.ccsdk.sli.plugins.template.TemplateNode" method="evaluateTemplate" >
-                                <parameter name='templatePath' value='a1-policy-type-create-schema-property-payload-template.vtl' />
-                                <parameter name='output' value='restapi-payload' />
-                                <parameter name='prefix' value='a1-mediator' />
-                                <outcome value='success'>
-                                    <block atomic='true'>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                            <parameter name="field2" value="Redndred A1 Mediator RestAPI payload template as a string"/>
-                                            <parameter name='field3' value='`$a1-mediator.restapi-payload`' />
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name='response-message' value='Error creating A1 Mediator Rest API payload string. Aborting A1 Policy Type creation'/>
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name='response-message' value='Error creating A1 Mediator Rest API payload string. Aborting A1 Policy Type creation'/>
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyType'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
-                                <parameter name="source" value="`$a1-mediator.restapi-payload`"/>
-                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.payload"/>
-                                <parameter name="target" value="\n"/>
-                                <parameter name="replacement" value=""/>
-                                <outcome value='success'>
-                                    <block atomic='true'>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                            <parameter name="field2" value="Redndred template with lines removed \r"/>
-                                            <parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name="response-message" value="Error removing lines from A1 Mediator Rest API payload string. Aborting A1 Policy creation" />
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error removing lines from A1 Mediator Rest API payload string. Aborting A1 Policy creation" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyType'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
-                                <parameter name="source" value="`$tmp.a1-mediator-restapi.payload`"/>
-                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.payload"/>
-                                <parameter name="target" value="\t"/>
-                                <parameter name="replacement" value=""/>
-                                <outcome value='success'>
-                                    <block atomic='true'>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="__TIMESTAMP__"/>
-                                            <parameter name="field2" value="Redndred template with tabs removed \r"/>
-                                            <parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name="response-message" value="Error removing tabs from A1 Mediator Rest API payload string. Aborting A1 Policy creation" />
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error removing tabs from A1 Mediator Rest API payload string. Aborting A1 Policy creation" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyType'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name="tmp.near-rt-ric-id" value="`$create-policy-type-input.near-rt-ric-id`"/>
-                                <parameter name="tmp.policy-type-id" value="`$create-policy-type-input.policy-type-id`"/>
-                                <parameter name="tmp.name" value="`$create-policy-type-input.name`"/>
-                                <parameter name="tmp.description" value="`$create-policy-type-input.description`"/>
-                            </set>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$prop.restapi.policytype`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policytype-url"/>
-                                <parameter name="target" value="{policy_type_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-type-id`"/>
-                            </execute>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Create Policy Type."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                                <parameter name="field4" value="`$tmp.name`"/>
-                                <parameter name="field5" value="`$tmp.restapi.policytype-url`"/>
-                                <parameter name="field6" value="`$a1-mediator.restapi-payload`"/>
-                                <parameter name="field7" value="Temporary A1 Mediatory Payload"/>
-                                <parameter name="field8" value="`$tmp.a1-mediator-restapi.payload`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.a1Mediator.url + '/' + $tmp.restapi.policytype-url`"/>
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="PUT"/>
-                                <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='accept' value='application/json' />
-                                <parameter name="requestBody" value="`$tmp.a1-mediator-restapi.payload`"/>
-                                <parameter name="convertResponse" value="false"/>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name="response-message" value="Error creating A1 Policy Policy. Aborting A1 Policy Type creation" />
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="404" />
-                                            <parameter name="response-message" value="Error creating A1 Policy Policy. Aborting A1 Policy Type creation" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyType'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="A1 Policy Type Accepted."/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                    </block>
-                </outcome>
-                <outcome value='false'>
-                    <block>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyType'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                <parameter name='field10' value="RPC Name" />
-                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='format' value='json' />
-                                <parameter name='httpMethod' value='POST' />
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='responsePrefix' value='dmaap' />
-                                <outcome value='failure'>
-                                    <block>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                        </return>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <set>
-                            <parameter name='response-code' value='500'/>
-                            <parameter name='response-message' value='A1 Mediator Not Deployed'/>
-                        </set>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="response-code" value="500" />
-                            <parameter name="response-message" value="A1 Mediator Not Deployed. Aborting A1 Policy creation" />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <block atomic='true'>
-                    <set>
-                        <parameter name='tmp.a1-adapter-api.rpc-name' value='createPolicyType'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                        <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                        <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='field5' value="Status Code and Status Value to be published" />
-                        <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                        <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                        <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                        <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                        <parameter name='field10' value="RPC Name" />
-                        <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='format' value='json' />
-                        <parameter name='httpMethod' value='POST' />
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='responsePrefix' value='dmaap' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="response-code" value="500" />
-                                    <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='A1 Adapter is healthy'/>
-                    <parameter name='health-status' value='200'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml
new file mode 100644
index 00000000..a351cc5c
--- /dev/null
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml
@@ -0,0 +1,78 @@
+<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='A1-ADAPTER-API' version='${project.version}'>
+    <method rpc='deleteA1Policy' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Delete Policy:"/>
+                <parameter name="field2" value="`$delete-a1-policy-input.near-rt-ric-url`"/>
+            </record>
+            <set>
+                <parameter name='response-code' value='200' />
+                <parameter name='response-message' value='deletePolicy executed successfully' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <block atomic='true'>
+                <set>
+                    <parameter name="tmp.near-rt-ric-url" value="`$delete-a1-policy-input.near-rt-ric-url`"/>
+                </set>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Setting variables for A1 Adapter Delete Policy Instance."/>
+                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
+                    <parameter name="format" value="json"/>
+                    <parameter name="httpMethod" value="DELETE"/>
+                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="convertResponse" value="false"/>
+                    <outcome value='success'>
+                        <block>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="A1 Delete Policy Information "/>
+                                <parameter name="field2" value="`$a1MediatorRsp.httpResponse`"/>
+                            </record>
+                            <set>
+                                <parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>
+                            </set>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='response-code' value='500'/>
+                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="response-code" value="404" />
+                                <parameter name="response-message" value="Error in Deleting A1 Policy Instance. Aborting" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
+            <block>
+                <return status='success'>
+                    <parameter name="ack-final-indicator" value="Y" />
+                    <parameter name="error-code" value="200" />
+                    <parameter name="error-message" value="`$error-message`" />
+                    <parameter name='response-code' value='200' />
+                    <parameter name='response-message' value='deletePolicyInstance executed successfully'/>
+                    <parameter name='ack-final' value='Y'/>
+                </return>
+            </block>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deletePolicyInstance.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deletePolicyInstance.xml
deleted file mode 100644
index 6cc39b94..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deletePolicyInstance.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='deletePolicyInstance' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Delete Policy Instance  associated with Near RT RIC ID and Policy Type ID"/>
-                <parameter name="field2" value="`$delete-policy-instance-input.near-rt-ric-id`"/>
-                <parameter name="field3" value="`$delete-policy-instance-input.policy-type-id`"/>
-                <parameter name="field4" value="`$delete-policy-instance-input.policy-instance-id`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='deletePolicyInstance executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <switch test='`$prop.ric-plt-A1Mediator-deployed`'>
-                <outcome value='true'>
-                    <block atomic='true'>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name="tmp.near-rt-ric-id" value="`$delete-policy-instance-input.near-rt-ric-id`"/>
-                                <parameter name="tmp.policy-type-id" value="`$delete-policy-instance-input.policy-type-id`"/>
-                                <parameter name="tmp.policy-instance-id" value="`$delete-policy-instance-input.policy-instance-id`"/>
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Delete Policy Instance."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                                <parameter name="field4" value="`$tmp.policy-instance-id`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$prop.restapi.policy`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policyinstance-url"/>
-                                <parameter name="target" value="{policy_type_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-type-id`"/>
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$tmp.restapi.policyinstance-url`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policyinstance-url"/>
-                                <parameter name="target" value="{policy_instance_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-instance-id`"/>
-                            </execute>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Delete Policy Instance."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                                <parameter name="field4" value="`$tmp.policy-instance-id`"/>
-                                <parameter name="field5" value="`$tmp.restapi.policyinstance-url`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.a1Mediator.url + '/' + $tmp.restapi.policyinstance-url`"/>
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="DELETE"/>
-                                <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='accept' value='application/json' />
-                                <parameter name="convertResponse" value="false"/>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="Details of A1 Policy Instance "/>
-                                            <parameter name="field2" value="`$a1MediatorRsp`"/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error in Deleting A1 Policy Instance. Aborting" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='deletePolicyInstance'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="Working On it" />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                    </block>
-                </outcome>
-                <outcome value='false'>
-                    <block>
-                        <set>
-                            <parameter name='response-code' value='500'/>
-                            <parameter name='response-message' value='A1 Mediator Not Deployed'/>
-                        </set>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='tmp.a1-adapter-api.rpc-name' value='deletePolicyInstance'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="Working On it" />
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                <parameter name='field10' value="RPC Name" />
-                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='format' value='json' />
-                                <parameter name='httpMethod' value='POST' />
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='responsePrefix' value='dmaap' />
-                                <outcome value='failure'>
-                                    <block>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                        </return>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="response-code" value="500" />
-                            <parameter name="response-message" value="Error in Deleting A1 Policy Instance. Aborting" />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <block atomic='true'>
-                    <set>
-                        <parameter name='tmp.a1-adapter-api.rpc-name' value='deletePolicyInstance'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                        <parameter name='tmp.a1Policy-dmaap-resp.payload' value="Working On it" />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                        <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='field5' value="Status Code and Status Value to be published" />
-                        <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                        <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                        <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                        <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                        <parameter name='field10' value="RPC Name" />
-                        <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='format' value='json' />
-                        <parameter name='httpMethod' value='POST' />
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='responsePrefix' value='dmaap' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="response-code" value="500" />
-                                    <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='deletePolicyInstance executed successfully'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deletePolicyType.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deletePolicyType.xml
deleted file mode 100644
index 7711962b..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deletePolicyType.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='deletePolicyType' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Delete Policy Type from Near RT RIC ID"/>
-                <parameter name="field2" value="`$delete-policy-type-input.near-rt-ric-id`"/>
-                <parameter name="field3" value="`$delete-policy-type-input.policy-type-id`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='deletePolicyType executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <switch test='`$prop.ric-plt-A1Mediator-deployed`'>
-                <outcome value='true'>
-                    <block atomic='true'>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name="tmp.near-rt-ric-id" value="`$delete-policy-type-input.near-rt-ric-id`"/>
-                                <parameter name="tmp.policy-type-id" value="`$delete-policy-type-input.policy-type-id`"/>
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Delete Policy Type."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$prop.restapi.policytype`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policytype-url"/>
-                                <parameter name="target" value="{policy_type_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-type-id`"/>
-                            </execute>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Delete Policy Type."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.restapi.policytype-url`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.a1Mediator.url + '/' + $tmp.restapi.policytype-url`"/>
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="DELETE"/>
-                                <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='accept' value='application/json' />
-                                <parameter name="convertResponse" value="false"/>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="Delete policy type operation executed against A1 Mediator "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="404" />
-                                            <parameter name="response-message" value="Error in Delete Policy. Aborting" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='deletePolicyType'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="Working On it" />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                    </block>
-                </outcome>
-                <outcome value='false'>
-                    <block>
-                        <set>
-                            <parameter name='response-code' value='500'/>
-                            <parameter name='response-message' value='A1 Mediator Not Deployed'/>
-                        </set>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='tmp.a1-adapter-api.rpc-name' value='deletePolicyType'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="Working On it" />
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                <parameter name='field10' value="RPC Name" />
-                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='format' value='json' />
-                                <parameter name='httpMethod' value='POST' />
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='responsePrefix' value='dmaap' />
-                                <outcome value='failure'>
-                                    <block>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                        </return>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="response-code" value="500" />
-                            <parameter name="response-message" value="A1 Mediator Not Deployed. Aborting Policy Delete" />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <block atomic='true'>
-                    <set>
-                        <parameter name='tmp.a1-adapter-api.rpc-name' value='deletePolicyType'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                        <parameter name='tmp.a1Policy-dmaap-resp.payload' value="Working On it" />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                        <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='field5' value="Status Code and Status Value to be published" />
-                        <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                        <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                        <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                        <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                        <parameter name='field10' value="RPC Name" />
-                        <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='format' value='json' />
-                        <parameter name='httpMethod' value='POST' />
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='responsePrefix' value='dmaap' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="response-code" value="500" />
-                                    <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='A1 Adapter is healthy'/>
-                    <parameter name='health-status' value='200'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1Policy.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1Policy.xml
new file mode 100644
index 00000000..79b4a9c7
--- /dev/null
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1Policy.xml
@@ -0,0 +1,84 @@
+<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='A1-ADAPTER-API' version='${project.version}'>
+    <method rpc='getA1Policy' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Get A1 Policy:"/>
+                <parameter name="field2" value="`$get-a1-policy-input.near-rt-ric-url`"/>
+            </record>
+            <set>
+                <parameter name='response-code' value='200' />
+                <parameter name='response-message' value='Get A1 Policy executed successfully' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <block atomic='true'>
+                <set>
+                    <parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-input.near-rt-ric-url`"/>
+                </set>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Instance."/>
+                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
+                    <parameter name="format" value="json"/>
+                    <parameter name="httpMethod" value="GET"/>
+                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="convertResponse" value="false"/>
+                    <outcome value='success'>
+                        <block>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
+                                <parameter name="source" value="`$a1MediatorRsp.httpResponse`"/>
+                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.httpResponse"/>
+                                <parameter name="target" value="\n"/>
+                                <parameter name="replacement" value=""/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="A1 Get Policy Information "/>
+                                <parameter name="field2" value="`$tmp.a1-mediator-restapi.httpResponse`"/>
+                            </record>
+                            <set>
+                                <parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>
+                            </set>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='response-code' value='500'/>
+                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="response-code" value="500" />
+                                <parameter name="response-message" value="Error in Getting A1 Policy Instance. Aborting" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
+            <block>
+                <return status='success'>
+                    <parameter name="ack-final-indicator" value="Y" />
+                    <parameter name="error-code" value="200" />
+                    <parameter name="error-message" value="`$error-message`" />
+                    <parameter name='response-code' value='200' />
+                    <parameter name='response-message' value='Get PolicyInstance executed successfully'/>
+                    <parameter name='ack-final' value='Y'/>
+                </return>
+            </block>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml
new file mode 100644
index 00000000..703c7dfe
--- /dev/null
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml
@@ -0,0 +1,84 @@
+<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='A1-ADAPTER-API' version='${project.version}'>
+    <method rpc='getA1PolicyStatus' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Get A1 Policy Status:"/>
+                <parameter name="field2" value="`$get-a1-policy-status-input.near-rt-ric-url`"/>
+            </record>
+            <set>
+                <parameter name='response-code' value='200' />
+                <parameter name='response-message' value='Get A1 Policy executed successfully' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <block atomic='true'>
+                <set>
+                    <parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-status-input.near-rt-ric-url`"/>
+                </set>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Status."/>
+                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
+                    <parameter name="format" value="json"/>
+                    <parameter name="httpMethod" value="GET"/>
+                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="convertResponse" value="true"/>
+                    <outcome value='success'>
+                        <block>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
+                                <parameter name="source" value="`$a1MediatorRsp.httpResponse`"/>
+                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.httpResponse"/>
+                                <parameter name="target" value="\n"/>
+                                <parameter name="replacement" value=""/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="A1 Get Policy Status "/>
+                                <parameter name="field2" value="`$tmp.a1-mediator-restapi.httpResponse`"/>
+                            </record>
+                            <set>
+                                <parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>
+                            </set>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='response-code' value='500'/>
+                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="response-code" value="404" />
+                                <parameter name="response-message" value="Error in Getting A1 Policy Status. Aborting" />
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
+            <block>
+                <return status='success'>
+                    <parameter name="ack-final-indicator" value="Y" />
+                    <parameter name="error-code" value="200" />
+                    <parameter name="error-message" value="`$error-message`" />
+                    <parameter name='response-code' value='200' />
+                    <parameter name='response-message' value='Get Policy Status executed successfully'/>
+                    <parameter name='ack-final' value='Y'/>
+                </return>
+            </block>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyType.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyType.xml
index 39908d81..cea0bc5f 100644
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyType.xml
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyType.xml
@@ -37,19 +37,21 @@
                     <parameter name="convertResponse" value="true"/>
                     <outcome value='success'>
                         <block>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
+                                <parameter name="source" value="`$a1MediatorRsp.httpResponse`"/>
+                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.httpResponse"/>
+                                <parameter name="target" value="\n"/>
+                                <parameter name="replacement" value=""/>
+                            </execute>
                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                 <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
                                 <parameter name="level" value="info" />
                                 <parameter name="field1" value="A1 Policy Type Information "/>
-                                <parameter name="field2" value="`$a1MediatorRsp.httpResponse`"/>
+                                <parameter name="field2" value="`$tmp.a1-mediator-restapi.httpResponse`"/>
                             </record>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='ctxSetAttribute'>
-                                <parameter name='object' value=	"`$a1MediatorRsp.httpResponse`" />
-                                <parameter name='key' value='a1PolicyTypeResponse' />
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                <parameter name='filename' value='/opt/opendaylight/current/data/log/A1-Adapter-getPolicytype-specific-context.log' />
-                            </execute>
+                            <set>
+                                <parameter name='responseBody' value="`$tmp.a1-mediator-restapi.httpResponse`"/>
+                            </set>
                         </block>
                     </outcome>
                     <outcome value='failure'>
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getHealthCheck.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getHealthCheck.xml
deleted file mode 100644
index 6ba77520..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getHealthCheck.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='getHealthCheck' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="A1 Adapter Health Check. Near RT RIC ID"/>
-                <parameter name="field2" value="`$get-health-check-input.near-rt-ric-id`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='A1 is Healthy' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <switch test='`$prop.ric-plt-A1Mediator-deployed`'>
-                <outcome value='true'>
-                    <block atomic='true'>
-                        <block atomic='true'>
-                            <block atomic='true'>
-                                <set>
-                                    <parameter name="tmp.near-rt-ric-id" value="`$get-health-check-input.near-rt-ric-id`"/>
-                                    <parameter name="tmp.restapi.healthcheck-url" value="`$prop.restapi.healthcheck`"/>
-                                </set>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="Setting variables for A1 Adapter Health Check."/>
-                                    <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                    <parameter name="field3" value="`$tmp.restapi.healthcheck-url`"/>
-                                </record>
-                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                    <parameter name="restapiUrl" value="`$prop.a1Mediator.url + '/' + $tmp.restapi.healthcheck-url`"/>
-                                    <parameter name="format" value="json"/>
-                                    <parameter name="httpMethod" value="GET"/>
-                                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                                    <parameter name='contentType' value='application/json' />
-                                    <parameter name='accept' value='application/json' />
-                                    <parameter name="convertResponse" value="false"/>
-                                    <outcome value='success'>
-                                        <block>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="A1 Mediator is Healthy."/>
-                                            </record>
-                                        </block>
-                                    </outcome>
-                                    <outcome value='failure'>
-                                        <block>
-                                            <set>
-                                                <parameter name='response-code' value='500'/>
-                                                <parameter name='response-message' value='A1 Mediator Not Healthy'/>
-                                            </set>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="response-code" value="404" />
-                                                <parameter name="response-message" value="Error in A1 Mediator Health Check. Aborting A1 Health Check" />
-                                            </return>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='tmp.a1-adapter-api.rpc-name' value='getHealthCheck'/>
-                                                    <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                    <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                    <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                                                </set>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                    <parameter name="level" value="info" />
-                                                    <parameter name="field1" value="__TIMESTAMP__"/>
-                                                    <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                    <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                    <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                    <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                    <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                    <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                    <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                                    <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                    <parameter name='field10' value="RPC Name" />
-                                                    <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                                </record>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                    <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='POST' />
-                                                    <parameter name='contentType' value='application/json' />
-                                                    <parameter name='responsePrefix' value='dmaap' />
-                                                    <outcome value='failure'>
-                                                        <block>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="response-code" value="500" />
-                                                                <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                            </return>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='success'>
-                                                        <block>
-                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                                <parameter name="level" value="info" />
-                                                                <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                            </record>
-                                                        </block>
-                                                    </outcome>
-                                                </execute>
-                                            </block>
-                                        </block>
-                                    </outcome>
-                                </execute>
-                            </block>
-                        </block>
-                    </block>
-                </outcome>
-                <outcome value='false'>
-                    <block>
-                        <set>
-                            <parameter name='response-code' value='500'/>
-                            <parameter name='response-message' value='A1 Mediator Not Deployed'/>
-                        </set>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='tmp.a1-adapter-api.rpc-name' value='getHealthCheck'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                <parameter name='field10' value="RPC Name" />
-                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='format' value='json' />
-                                <parameter name='httpMethod' value='POST' />
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='responsePrefix' value='dmaap' />
-                                <outcome value='failure'>
-                                    <block>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                        </return>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="response-code" value="500" />
-                            <parameter name="response-message" value="A1 Mediator Not Deployed. Aborting Health Check" />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <block atomic='true'>
-                    <set>
-                        <parameter name='tmp.a1-adapter-api.rpc-name' value='getHealthCheck'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                        <parameter name='tmp.a1Policy-dmaap-resp.payload' value="None" />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                        <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='field5' value="Status Code and Status Value to be published" />
-                        <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                        <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                        <parameter name='field8' value="A1 Adapter DMAAP Response Payload Not Required" />
-                        <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                        <parameter name='field10' value="RPC Name" />
-                        <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='format' value='json' />
-                        <parameter name='httpMethod' value='POST' />
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='responsePrefix' value='dmaap' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="response-code" value="500" />
-                                    <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='A1 Adapter is healthy'/>
-                    <parameter name='health-status' value='200'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getNearRT-RICs.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getNearRT-RICs.xml
deleted file mode 100644
index 0e3a2c16..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getNearRT-RICs.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='getNearRT-RICs' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="A1 Adapter - get near-RT RIC Info"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='A1 Mediator RIC ID available' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <switch test='`$prop.ric-plt-A1Mediator-deployed`'>
-                <outcome value='true'>
-                    <block atomic='true'>
-                        <set>
-                            <parameter name="tmp.near-rt-ric-id" value="`$prop.near-rt-ric-id`"/>
-                        </set>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                            <parameter name="level" value="info" />
-                            <parameter name="field1" value="SNear-RT RIC ID"/>
-                            <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                        </record>
-                    </block>
-                </outcome>
-                <outcome value='false'>
-                    <block>
-                        <set>
-                            <parameter name='response-code' value='500'/>
-                            <parameter name='response-message' value='A1 Mediator Not Deployed'/>
-                        </set>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='tmp.a1-adapter-api.rpc-name' value='getNearRT-RICs'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="`$tmp.near-rt-ric-id`" />
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                <parameter name='field10' value="RPC Name" />
-                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='format' value='json' />
-                                <parameter name='httpMethod' value='POST' />
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='responsePrefix' value='dmaap' />
-                                <outcome value='failure'>
-                                    <block>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                        </return>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="response-code" value="500" />
-                            <parameter name="response-message" value="A1 Mediator Not Deployed. Aborting Health Check" />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <block atomic='true'>
-                    <set>
-                        <parameter name='tmp.a1-adapter-api.rpc-name' value='getNearRT-RICs'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                        <parameter name='tmp.a1Policy-dmaap-resp.payload' value="`$tmp.near-rt-ric-id`" />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                        <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='field5' value="Status Code and Status Value to be published" />
-                        <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                        <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                        <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                        <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                        <parameter name='field10' value="RPC Name" />
-                        <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='format' value='json' />
-                        <parameter name='httpMethod' value='POST' />
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='responsePrefix' value='dmaap' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="response-code" value="500" />
-                                    <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='A1 Mediatpor is available'/>
-                    <parameter name='health-status' value='200'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstance.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstance.xml
deleted file mode 100644
index 03fa7855..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstance.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='getPolicyInstance' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Get Policy Instance details associated with Near RT RIC ID and Policy Type ID"/>
-                <parameter name="field2" value="`$get-policy-instance-input.near-rt-ric-id`"/>
-                <parameter name="field3" value="`$get-policy-instance-input.policy-type-id`"/>
-                <parameter name="field4" value="`$get-policy-instance-input.policy-instance-id`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='getPolicyInstance executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <switch test='`$prop.ric-plt-A1Mediator-deployed`'>
-                <outcome value='true'>
-                    <block atomic='true'>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name="tmp.near-rt-ric-id" value="`$get-policy-instance-input.near-rt-ric-id`"/>
-                                <parameter name="tmp.policy-type-id" value="`$get-policy-instance-input.policy-type-id`"/>
-                                <parameter name="tmp.policy-instance-id" value="`$get-policy-instance-input.policy-instance-id`"/>
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Instance."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                                <parameter name="field4" value="`$tmp.policy-instance-id`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$prop.restapi.policy`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policyinstance-url"/>
-                                <parameter name="target" value="{policy_type_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-type-id`"/>
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$tmp.restapi.policyinstance-url`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policyinstance-url"/>
-                                <parameter name="target" value="{policy_instance_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-instance-id`"/>
-                            </execute>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Instance."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                                <parameter name="field4" value="`$tmp.policy-instance-id`"/>
-                                <parameter name="field5" value="`$tmp.restapi.policyinstance-url`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.a1Mediator.url + '/' + $tmp.restapi.policyinstance-url`"/>
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="GET"/>
-                                <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='accept' value='application/json' />
-                                <parameter name="convertResponse" value="true"/>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="Details of A1 Policy Instance "/>
-                                            <parameter name="field2" value="`$a1MediatorRsp.httpResponse`"/>
-                                        </record>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
-                                            <parameter name="source" value="`$a1MediatorRsp.httpResponse`"/>
-                                            <parameter name="outputPath" value="tmp.a1-mediator-restapi.payload"/>
-                                            <parameter name="target" value="\n"/>
-                                            <parameter name="replacement" value=""/>
-                                        </execute>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
-                                            <parameter name="source" value="`$tmp.a1-mediator-restapi.payload`"/>
-                                            <parameter name="outputPath" value="tmp.a1-mediator-restapi.payload"/>
-                                            <parameter name="target" value="\t"/>
-                                            <parameter name="replacement" value=""/>
-                                            <outcome value='success'>
-                                                <block atomic='true'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                        <parameter name="level" value="info" />
-                                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                                        <parameter name="field2" value="Redndred template with lines removed \r"/>
-                                                        <parameter name='field3' value='`$tmp.a1-mediator-restapi.payload`' />
-                                                    </record>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='failure'>
-                                                <block></block>
-                                            </outcome>
-                                        </execute>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                            <parameter name='filename' value='/opt/opendaylight/current/data/log/A1-Adapter-getPolicyInstance-specific-context.log' />
-                                        </execute>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error in Getting A1 Policy Instances. Aborting" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyInstance'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$tmp.a1-mediator-restapi.payload`' />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                    </block>
-                </outcome>
-                <outcome value='false'>
-                    <block>
-                        <set>
-                            <parameter name='response-code' value='500'/>
-                            <parameter name='response-message' value='A1 Mediator Not Deployed'/>
-                        </set>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyInstance'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$tmp.a1-mediator-restapi.payload`' />
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                <parameter name='field10' value="RPC Name" />
-                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='format' value='json' />
-                                <parameter name='httpMethod' value='POST' />
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='responsePrefix' value='dmaap' />
-                                <outcome value='failure'>
-                                    <block>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                        </return>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="response-code" value="500" />
-                            <parameter name="response-message" value="Error in Getting A1 Policy Instance. Aborting" />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <block atomic='true'>
-                    <set>
-                        <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyInstance'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                        <parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$tmp.a1-mediator-restapi.payload`' />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                        <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='field5' value="Status Code and Status Value to be published" />
-                        <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                        <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                        <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                        <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                        <parameter name='field10' value="RPC Name" />
-                        <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='format' value='json' />
-                        <parameter name='httpMethod' value='POST' />
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='responsePrefix' value='dmaap' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="response-code" value="500" />
-                                    <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='getPolicyInstance executed successfully'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstances.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstances.xml
deleted file mode 100644
index c486afb9..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstances.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='getPolicyInstances' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Get All Policy Instance from Near RT RIC ID and Policy Type ID"/>
-                <parameter name="field2" value="`$get-policy-instances-input.near-rt-ric-id`"/>
-                <parameter name="field3" value="`$get-policy-instances-input.policy-type-id`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='getPolicyInstances executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <switch test='`$prop.ric-plt-A1Mediator-deployed`'>
-                <outcome value='true'>
-                    <block atomic='true'>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name="tmp.near-rt-ric-id" value="`$get-policy-instances-input.near-rt-ric-id`"/>
-                                <parameter name="tmp.policy-type-id" value="`$get-policy-instances-input.policy-type-id`"/>
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Instances."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$prop.restapi.policies`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policyinstances-url"/>
-                                <parameter name="target" value="{policy_type_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-type-id`"/>
-                            </execute>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Instances."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                                <parameter name="field4" value="`$tmp.restapi.policyinstances-url`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.a1Mediator.url + '/' + $tmp.restapi.policyinstances-url`"/>
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="GET"/>
-                                <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='accept' value='application/json' />
-                                <parameter name="convertResponse" value="true"/>
-                                <outcome value='success'>
-                                    <block>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
-                                            <parameter name='source' value='a1MediatorRsp.httpResponse' />
-                                            <parameter name='outputPath' value='a1MediatorPolicyInstancesList' />
-                                            <parameter name='isEscaped' value='false' />
-                                        </execute>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="List of A1 Policy Instances: "/>
-                                            <parameter name="field2" value="`$a1MediatorRsp`"/>
-                                        </record>
-                                        <execute plugin="org.onap.ccsdk.sli.plugins.template.TemplateNode" method="evaluateTemplate" >
-                                            <parameter name='templatePath' value='a1Mediator-get-policy-instances.vtl' />
-                                            <parameter name='output' value='policyInstancesList' />
-                                            <parameter name='prefix' value='a1-mediator' />
-                                            <outcome value='success'>
-                                                <block atomic='true'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                        <parameter name="level" value="info" />
-                                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                                        <parameter name="field2" value="A1 Policiy Instances List"/>
-                                                        <parameter name='field3' value='`$a1-mediator.policyInstancesList`' />
-                                                    </record>
-                                                </block>
-                                            </outcome>
-                                        </execute>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                            <parameter name='filename' value='/opt/opendaylight/current/data/log/A1-Adapter-getPolicyInstances-context.log' />
-                                        </execute>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="List of A1 Policy Types: "/>
-                                            <parameter name="field2" value="`$a1MediatorRsp._length`"/>
-                                            <parameter name="field3" value="`$a1MediatorRsp.httpResponse`"/>
-                                            <parameter name="field4" value="`$a1MediatorRsp.response-code`"/>
-                                            <parameter name="field5" value='`$a1MediatorRsp._length`' />
-                                            <parameter name="field6" value='`$a1-mediator.policyInstancesList`' />
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error in Getting A1 Policy Instances. Aborting" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyInstances'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$a1-mediator.policyInstancesList`' />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                    </block>
-                </outcome>
-                <outcome value='false'>
-                    <block>
-                        <set>
-                            <parameter name='response-code' value='500'/>
-                            <parameter name='response-message' value='A1 Mediator Not Deployed'/>
-                        </set>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyInstances'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$a1-mediator.policyInstancesList`' />
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                <parameter name='field10' value="RPC Name" />
-                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='format' value='json' />
-                                <parameter name='httpMethod' value='POST' />
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='responsePrefix' value='dmaap' />
-                                <outcome value='failure'>
-                                    <block>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                        </return>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="response-code" value="500" />
-                            <parameter name="response-message" value="Error in Getting A1 Policy Instances. Aborting" />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <block atomic='true'>
-                    <set>
-                        <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyInstances'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                        <parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$a1-mediator.policyInstancesList`' />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                        <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='field5' value="Status Code and Status Value to be published" />
-                        <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                        <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                        <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                        <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                        <parameter name='field10' value="RPC Name" />
-                        <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='format' value='json' />
-                        <parameter name='httpMethod' value='POST' />
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='responsePrefix' value='dmaap' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="response-code" value="500" />
-                                    <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='getPolicyInstances executed successfully'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyTypes.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyTypes.xml
deleted file mode 100644
index 7a6bb9c0..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyTypes.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='getPolicyTypes' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Get All Policy Types from Near RT RIC ID"/>
-                <parameter name="field2" value="`$get-policy-types-input.near-rt-ric-id`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='getPolicyTypes executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <switch test='`$prop.ric-plt-A1Mediator-deployed`'>
-                <outcome value='true'>
-                    <block atomic='true'>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name="tmp.near-rt-ric-id" value="`$get-policy-types-input.near-rt-ric-id`"/>
-                                <parameter name="tmp.restapi.getPolicyTypes-url" value="`$prop.restapi.policytypes`"/>
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Types."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.restapi.getPolicyTypes-url`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.a1Mediator.url + '/' + $tmp.restapi.getPolicyTypes-url`"/>
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="GET"/>
-                                <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='accept' value='application/json' />
-                                <parameter name="convertResponse" value="true"/>
-                                <outcome value='success'>
-                                    <block>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
-                                            <parameter name='source' value='a1MediatorRsp.httpResponse' />
-                                            <parameter name='outputPath' value='a1MediatorList' />
-                                            <parameter name='isEscaped' value='false' />
-                                        </execute>
-                                        <execute plugin="org.onap.ccsdk.sli.plugins.template.TemplateNode" method="evaluateTemplate" >
-                                            <parameter name='templatePath' value='a1Mediator-get-policies.vtl' />
-                                            <parameter name='output' value='policiesList' />
-                                            <parameter name='prefix' value='a1-mediator' />
-                                            <outcome value='success'>
-                                                <block atomic='true'>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                        <parameter name="level" value="info" />
-                                                        <parameter name="field1" value="__TIMESTAMP__"/>
-                                                        <parameter name="field2" value="A1 Policies List"/>
-                                                        <parameter name='field3' value='`$a1-mediator.policiesList`' />
-                                                    </record>
-                                                </block>
-                                            </outcome>
-                                        </execute>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                            <parameter name='filename' value='/opt/opendaylight/current/data/log/A1-Adapter-getPolicytype-context.log' />
-                                        </execute>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="List of A1 Policy Types: "/>
-                                            <parameter name="field2" value="`$a1MediatorRsp._length`"/>
-                                            <parameter name="field3" value="`$a1MediatorRsp.httpResponse`"/>
-                                            <parameter name="field4" value="`$a1MediatorRsp.response-code`"/>
-                                            <parameter name="field5" value='`$a1MediatorRsp._length`' />
-                                            <parameter name="field6" value='`$a1-mediator.policiesList`' />
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error in Getting A1 Policy Types. Aborting" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyTypes'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$a1-mediator.policiesList`'  />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                    </block>
-                </outcome>
-                <outcome value='false'>
-                    <block>
-                        <set>
-                            <parameter name='response-code' value='500'/>
-                            <parameter name='response-message' value='A1 Mediator Not Deployed'/>
-                        </set>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyTypes'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$a1-mediator.policiesList`'  />
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                <parameter name='field10' value="RPC Name" />
-                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='format' value='json' />
-                                <parameter name='httpMethod' value='POST' />
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='responsePrefix' value='dmaap' />
-                                <outcome value='failure'>
-                                    <block>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                        </return>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="response-code" value="500" />
-                            <parameter name="response-message" value="Error in Getting A1 Policy Types. Aborting" />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <block atomic='true'>
-                    <set>
-                        <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyTypes'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                        <parameter name='tmp.a1Policy-dmaap-resp.payload' value='`$a1-mediator.policiesList`'  />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                        <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='field5' value="Status Code and Status Value to be published" />
-                        <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                        <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                        <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                        <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                        <parameter name='field10' value="RPC Name" />
-                        <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='format' value='json' />
-                        <parameter name='httpMethod' value='POST' />
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='responsePrefix' value='dmaap' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="response-code" value="500" />
-                                    <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='A1 Adapter is healthy'/>
-                    <parameter name='health-status' value='200'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getStatus.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getStatus.xml
deleted file mode 100644
index fcc6da46..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getStatus.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='getStatus' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Get status of Policy Instance  associated with Near RT RIC ID and Policy Type ID"/>
-                <parameter name="field2" value="`$get-status-input.near-rt-ric-id`"/>
-                <parameter name="field3" value="`$get-status-input.policy-type-id`"/>
-                <parameter name="field4" value="`$get-status-input.policy-instance-id`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='getStatus executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <switch test='`$prop.ric-plt-A1Mediator-deployed`'>
-                <outcome value='true'>
-                    <block atomic='true'>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name="tmp.near-rt-ric-id" value="`$get-status-input.near-rt-ric-id`"/>
-                                <parameter name="tmp.policy-type-id" value="`$get-status-input.policy-type-id`"/>
-                                <parameter name="tmp.policy-instance-id" value="`$get-status-input.policy-instance-id`"/>
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter Getting status for Policy Instance."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                                <parameter name="field4" value="`$tmp.policy-instance-id`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$prop.restapi.policystatus`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policyinstance-url"/>
-                                <parameter name="target" value="{policy_type_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-type-id`"/>
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                <parameter name="source" value="`$tmp.restapi.policyinstance-url`"/>
-                                <parameter name="outputPath" value="tmp.restapi.policyinstance-url"/>
-                                <parameter name="target" value="{policy_instance_id}"/>
-                                <parameter name="replacement" value="`$tmp.policy-instance-id`"/>
-                            </execute>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Setting variables for A1 Adapter getting status for Policy Instance."/>
-                                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                                <parameter name="field4" value="`$tmp.policy-instance-id`"/>
-                                <parameter name="field5" value="`$tmp.restapi.policyinstance-url`"/>
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.a1Mediator.url + '/' + $tmp.restapi.policyinstance-url`"/>
-                                <parameter name="format" value="json"/>
-                                <parameter name="httpMethod" value="GET"/>
-                                <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='accept' value='application/json' />
-                                <parameter name="convertResponse" value="false"/>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="Status of A1 Policy Instance "/>
-                                            <parameter name="field2" value="`$a1MediatorRsp`"/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                                <outcome value='failure'>
-                                    <block>
-                                        <set>
-                                            <parameter name='response-code' value='500'/>
-                                            <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                                        </set>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error in Getting status for A1 Policy Instance. Aborting" />
-                                        </return>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.a1-adapter-api.rpc-name' value='getStatus'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="Working On it" />
-                                            </set>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                                <parameter name='field10' value="RPC Name" />
-                                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                                            </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                                <parameter name='format' value='json' />
-                                                <parameter name='httpMethod' value='POST' />
-                                                <parameter name='contentType' value='application/json' />
-                                                <parameter name='responsePrefix' value='dmaap' />
-                                                <outcome value='failure'>
-                                                    <block>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="response-code" value="500" />
-                                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                                        </return>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                            </execute>
-                                        </block>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                    </block>
-                </outcome>
-                <outcome value='false'>
-                    <block>
-                        <set>
-                            <parameter name='response-code' value='500'/>
-                            <parameter name='response-message' value='A1 Mediator Not Deployed'/>
-                        </set>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='tmp.a1-adapter-api.rpc-name' value='getStatus'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                                <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                                <parameter name='tmp.a1Policy-dmaap-resp.payload' value="Working On it" />
-                            </set>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="__TIMESTAMP__"/>
-                                <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                                <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='field5' value="Status Code and Status Value to be published" />
-                                <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                                <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                                <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                                <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                                <parameter name='field10' value="RPC Name" />
-                                <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                            </record>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                                <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                                <parameter name='format' value='json' />
-                                <parameter name='httpMethod' value='POST' />
-                                <parameter name='contentType' value='application/json' />
-                                <parameter name='responsePrefix' value='dmaap' />
-                                <outcome value='failure'>
-                                    <block>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="response-code" value="500" />
-                                            <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                        </return>
-                                    </block>
-                                </outcome>
-                                <outcome value='success'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                            <parameter name="level" value="info" />
-                                            <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                        </record>
-                                    </block>
-                                </outcome>
-                            </execute>
-                        </block>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="response-code" value="500" />
-                            <parameter name="response-message" value="Error in getting status for A1 Policy Instance. Aborting" />
-                        </return>
-                    </block>
-                </outcome>
-            </switch>
-            <block>
-                <block atomic='true'>
-                    <set>
-                        <parameter name='tmp.a1-adapter-api.rpc-name' value='getStatus'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                        <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                        <parameter name='tmp.a1Policy-dmaap-resp.payload' value="Working On it" />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="__TIMESTAMP__"/>
-                        <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                        <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='field5' value="Status Code and Status Value to be published" />
-                        <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                        <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                        <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                        <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                        <parameter name='field10' value="RPC Name" />
-                        <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                    </record>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                        <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                        <parameter name='format' value='json' />
-                        <parameter name='httpMethod' value='POST' />
-                        <parameter name='contentType' value='application/json' />
-                        <parameter name='responsePrefix' value='dmaap' />
-                        <outcome value='failure'>
-                            <block>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="response-code" value="500" />
-                                    <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                                </return>
-                            </block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                                </record>
-                            </block>
-                        </outcome>
-                    </execute>
-                </block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='getStatus executed successfully'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_notifyPolicyEnforcementUpdate.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_notifyPolicyEnforcementUpdate.xml
deleted file mode 100644
index 70fa8049..00000000
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_notifyPolicyEnforcementUpdate.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<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='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='notifyPolicyEnforcementUpdate' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="A1 Adapter - notify policy enforcement update"/>
-                <parameter name="field2" value="`$notify-policy-enforcement-update-input.near-rt-ric-id`"/>
-                <parameter name="field3" value="`$notify-policy-enforcement-update-input.policy-type-id`"/>
-                <parameter name="field4" value="`$notify-policy-enforcement-update-input.policy-instance-id`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='Policy Enforcement Update Received' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <set>
-                <parameter name="tmp.near-rt-ric-id" value="`$notify-policy-enforcement-update-input.near-rt-ric-id`"/>
-                <parameter name="tmp.policy-type-id" value="`$notify-policy-enforcement-update-input.policy-type-id`"/>
-                <parameter name="tmp.policy-instance-id" value="`$notify-policy-enforcement-update-input.policy-instance-id`"/>
-            </set>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="SNear-RT RIC ID"/>
-                <parameter name="field2" value="`$tmp.near-rt-ric-id`"/>
-                <parameter name="field3" value="`$tmp.policy-type-id`"/>
-                <parameter name="field4" value="`$tmp.policy-instance-id`"/>
-            </record>
-            <block atomic='true'>
-                <set>
-                    <parameter name='tmp.a1-adapter-api.rpc-name' value='notifyPolicyEnforcementUpdate'/>
-                    <parameter name='tmp.a1Adapter-dmaap-resp.status-code' value='`$response-code`'/>
-                    <parameter name='tmp.a1Adapter-dmaap-resp.status-value' value='`$response-message`'/>
-                    <parameter name='tmp.a1Policy-dmaap-resp.payload' value="Policy Enforcement Update - Policies Applied" />
-                </set>
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                    <parameter name="level" value="info" />
-                    <parameter name="field1" value="__TIMESTAMP__"/>
-                    <parameter name="field2" value="Before DMAAP Event - template file name, restapiURL"/>
-                    <parameter name='field3' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                    <parameter name='field4' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                    <parameter name='field5' value="Status Code and Status Value to be published" />
-                    <parameter name='field6' value="`$tmp.a1Adapter-dmaap-resp.status-code`" />
-                    <parameter name='field7' value="`$tmp.a1Adapter-dmaap-resp.status-value`" />
-                    <parameter name='field8' value="A1 Adapter DMAAP Response Payload" />
-                    <parameter name='field9' value="`$tmp.a1Policy-dmaap-resp.payload`" />
-                    <parameter name='field10' value="RPC Name" />
-                    <parameter name='field11' value="`$tmp.a1-adapter-api.rpc-name`" />
-                </record>
-                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' +  $prop.restapi.dmaap-publish-generic-response.template`" />
-                    <parameter name='restapiUrl' value="`$prop.dmaap-message-router.url + $prop.a1Adapter-dmaap-policy-response.topic`" />
-                    <parameter name='format' value='json' />
-                    <parameter name='httpMethod' value='POST' />
-                    <parameter name='contentType' value='application/json' />
-                    <parameter name='responsePrefix' value='dmaap' />
-                    <outcome value='failure'>
-                        <block>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="response-code" value="500" />
-                                <parameter name="response-message" value="Error publishing DMAAP A1 Policy Response message. " />
-                            </return>
-                        </block>
-                    </outcome>
-                    <outcome value='success'>
-                        <block>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="DMAAP A1Policy message Successfully Published "/>
-                            </record>
-                        </block>
-                    </outcome>
-                </execute>
-            </block>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='Policy Enforcement Update Received'/>
-                <parameter name='health-status' value='200'/>
-                <parameter name='ack-final' value='Y'/>
-            </return>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml
new file mode 100644
index 00000000..d674abfd
--- /dev/null
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml
@@ -0,0 +1,68 @@
+<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='A1-ADAPTER-API' version='${project.version}'>
+    <method rpc='putA1Policy' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Put A1 Policy :"/>
+                <parameter name="field2" value="`$put-a1-policy-input.near-rt-ric-url`"/>
+                <parameter name="field3" value="`$put-a1-policy-input.body`"/>
+            </record>
+            <set>
+                <parameter name='response-code' value='200' />
+                <parameter name='response-message' value='Put A1 Policy executed successfully' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <block atomic='true'>
+                <set>
+                    <parameter name="tmp.near-rt-ric-url" value="`$put-a1-policy-input.near-rt-ric-url`"/>
+                    <parameter name="tmp.body" value="`$put-a1-policy-input.body`"/>
+                </set>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Setting variables for Put A1 Policy."/>
+                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
+                    <parameter name="field3" value="`$tmp.body`"/>
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
+                    <parameter name="format" value="json"/>
+                    <parameter name="httpMethod" value="PUT"/>
+                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="requestBody" value="`$tmp.body`"/>
+                    <parameter name="convertResponse" value="false"/>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='response-code' value='500'/>
+                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="response-code" value="404" />
+                                <parameter name="response-message" value="Error creating A1 Policy. Aborting A1 Policy creation" />
+                            </return>
+                        </block>
+                    </outcome>
+                    <outcome value='success'>
+                        <block>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="A1 Policy Instance Created."/>
+                            </record>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
-- 
2.16.6