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
index 298122e..5e0db03 100644
--- 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
@@ -1,6 +1,6 @@
 [
     {
-        "id": "71057082.a243e",
+        "id": "97b83863.1e9f28",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,599 +8,725 @@
         "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.00390625,
-        "y": 111.00390625,
-        "z": "9a83e9ac.8e87e8",
+        "x": 193,
+        "y": 90,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "19afdfe5.38b64"
+                "2c1bb19d.1f605e"
             ]
         ]
     },
     {
-        "id": "19afdfe5.38b64",
+        "id": "2c1bb19d.1f605e",
         "type": "method",
         "name": "method getPolicyInstance",
         "xml": "<method rpc='getPolicyInstance' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 246.00390625,
-        "y": 231.00390625,
-        "z": "9a83e9ac.8e87e8",
+        "x": 254,
+        "y": 210,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "37f244a6.0ab56c"
+                "b5f6b2ec.ef41b"
             ]
         ]
     },
     {
-        "id": "7cfcfa29.2fc534",
+        "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": 710.00390625,
-        "y": 46.00390625,
-        "z": "9a83e9ac.8e87e8",
+        "x": 718,
+        "y": 25,
+        "z": "758646cf.8567e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "37f244a6.0ab56c",
+        "id": "b5f6b2ec.ef41b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 451.00390625,
-        "y": 185.00390625,
-        "z": "9a83e9ac.8e87e8",
+        "x": 459,
+        "y": 164,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "7cfcfa29.2fc534",
-                "5f6ae6c2.664f58",
-                "91b2618d.b3e64",
-                "ff11fc63.9326c",
-                "857216e8.e8f328"
+                "efbffea8.48951",
+                "148e2110.a4834f",
+                "18026c55.380af4",
+                "39a10e6b.20e9d2",
+                "27fa4f62.a357e"
             ]
         ]
     },
     {
-        "id": "87a6087.e17c9f8",
+        "id": "26a452fa.b3c30e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 118.00390625,
-        "y": 47.00390625,
-        "z": "9a83e9ac.8e87e8",
+        "x": 126,
+        "y": 26,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "71057082.a243e"
+                "97b83863.1e9f28"
             ]
         ]
     },
     {
-        "id": "5f6ae6c2.664f58",
+        "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": 750.0039520263672,
-        "y": 100.00390720367432,
-        "z": "9a83e9ac.8e87e8",
+        "x": 758.0000457763672,
+        "y": 79.00000095367432,
+        "z": "758646cf.8567e8",
         "wires": []
     },
     {
-        "id": "91b2618d.b3e64",
+        "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": 750.00390625,
-        "y": 153.00390625,
-        "z": "9a83e9ac.8e87e8",
+        "x": 758,
+        "y": 132,
+        "z": "758646cf.8567e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ff11fc63.9326c",
+        "id": "39a10e6b.20e9d2",
         "type": "switchNode",
         "name": "A1 Mediator Deployed",
         "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 700.00390625,
-        "y": 209.00390625,
-        "z": "9a83e9ac.8e87e8",
+        "x": 708,
+        "y": 188,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "eb95df55.02d21",
-                "e95fa510.0ebf68"
+                "98ca2153.5878",
+                "6d44289a.6170c8"
             ]
         ]
     },
     {
-        "id": "e95fa510.0ebf68",
+        "id": "6d44289a.6170c8",
         "type": "outcome",
         "name": "Deployed",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 984.0039520263672,
-        "y": 69.00397157669067,
-        "z": "9a83e9ac.8e87e8",
+        "x": 992.0000457763672,
+        "y": 48.000065326690674,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "a8bd697e.3db8a8"
+                "5cf6b010.ca826"
             ]
         ]
     },
     {
-        "id": "a8bd697e.3db8a8",
+        "id": "5cf6b010.ca826",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 961.0040016174316,
-        "y": 215.00392389297485,
-        "z": "9a83e9ac.8e87e8",
+        "x": 969.0000953674316,
+        "y": 194.00001764297485,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "2cf579fc.444f26"
+                "2aab41ec.e46f5e"
             ]
         ]
     },
     {
-        "id": "eb95df55.02d21",
+        "id": "98ca2153.5878",
         "type": "outcome",
         "name": "Not Deployed",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 937.0039749145508,
-        "y": 504.0039677619934,
-        "z": "9a83e9ac.8e87e8",
+        "x": 945.0000686645508,
+        "y": 483.0000615119934,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "f9cc4575.cfd998"
+                "f07c3468.9111e8"
             ]
         ]
     },
     {
-        "id": "f9cc4575.cfd998",
+        "id": "f07c3468.9111e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1152.0040130615234,
-        "y": 633.0039205551147,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1160.0001068115234,
+        "y": 612.0000143051147,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "2881f676.88488a",
-                "a5d36c9a.4d26a",
-                "3cf054c2.6c700c"
+                "2cd09689.a09f0a",
+                "6164d8bd.4d3918",
+                "d08cdaa2.2497e8"
             ]
         ]
     },
     {
-        "id": "2881f676.88488a",
+        "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": 1282.0038299560547,
-        "y": 714.0039048194885,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1289.9999237060547,
+        "y": 692.9999985694885,
+        "z": "758646cf.8567e8",
         "wires": []
     },
     {
-        "id": "2cf579fc.444f26",
+        "id": "2aab41ec.e46f5e",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1155.0040130615234,
-        "y": 326.00391072034836,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1163.0001068115234,
+        "y": 305.00000447034836,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "ced8bdb3.3e326",
-                "3bab4a80.83e436",
-                "7e7b0916.928d98",
-                "6419a04c.32704",
-                "f3275c75.b49b7",
-                "e3d7b540.043a18"
+                "c4334ddb.ffe25",
+                "37a120b.00129e",
+                "f4688866.4effb8",
+                "da836929.9c5f78",
+                "c1d4adc6.62ca2",
+                "ebc97fe1.51a3a"
             ]
         ]
     },
     {
-        "id": "3bab4a80.83e436",
+        "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": 1493.00537109375,
-        "y": 123.89303684234619,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1501.00146484375,
+        "y": 102.88913059234619,
+        "z": "758646cf.8567e8",
         "wires": []
     },
     {
-        "id": "ced8bdb3.3e326",
+        "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": 1414.0040016174316,
-        "y": 177.00390911102295,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1422.0000953674316,
+        "y": 156.00000286102295,
+        "z": "758646cf.8567e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7e7b0916.928d98",
+        "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": 1432.0045166015625,
-        "y": 380.0143041610718,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1440.0006103515625,
+        "y": 359.0103979110718,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "d99d36d2.a41738",
-                "d90c54fd.fb6598"
+                "b526d90b.44e268",
+                "b94ea3f0.48558"
             ]
         ]
     },
     {
-        "id": "d99d36d2.a41738",
+        "id": "b526d90b.44e268",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1408.0039367675781,
-        "y": 477.00401973724365,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1416.0000305175781,
+        "y": 456.00011348724365,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "fae65389.46b4c"
+                "f8459ad3.8c2c48"
             ]
         ]
     },
     {
-        "id": "d90c54fd.fb6598",
+        "id": "b94ea3f0.48558",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1652.0041809082031,
-        "y": 348.0039281845093,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1660.0002746582031,
+        "y": 327.0000219345093,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "bafba09b.77276"
+                "6285d3a5.ab56dc"
             ]
         ]
     },
     {
-        "id": "2e6e9e5e.d18972",
+        "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": 1568.0045166015625,
-        "y": 584.0039892196655,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1576.0006103515625,
+        "y": 563.0000829696655,
+        "z": "758646cf.8567e8",
         "wires": []
     },
     {
-        "id": "bafba09b.77276",
+        "id": "6285d3a5.ab56dc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1802.0037860870361,
-        "y": 312.00395822525024,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1809.9998798370361,
+        "y": 291.00005197525024,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "53d1c58f.35908c"
+                "5db65a6d.9f3e14",
+                "ca2d2c79.f3d44",
+                "3c595f87.c89d7",
+                "f44c6a04.7c7928"
             ]
         ]
     },
     {
-        "id": "53d1c58f.35908c",
+        "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`\"/>",
+        "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": 1982.0039100646973,
-        "y": 286.00390911102295,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1976,
+        "y": 158,
+        "z": "758646cf.8567e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5d36c9a.4d26a",
+        "id": "6164d8bd.4d3918",
         "type": "block",
         "name": "DMAAP Reponse Publish",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1938.0040283203125,
-        "y": 681.0040578842163,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1946.0001220703125,
+        "y": 660.0001516342163,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "929dc7d7.1039c8",
-                "dc1ffc54.5e3cd",
-                "fe0ccd89.12fd1"
+                "e185025b.25cad",
+                "ad621b23.b3ace8",
+                "3610d471.52412c"
             ]
         ]
     },
     {
-        "id": "dc1ffc54.5e3cd",
+        "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": 2287.0042266845703,
-        "y": 859.0034625530243,
-        "z": "9a83e9ac.8e87e8",
+        "x": 2295.0003204345703,
+        "y": 837.9995563030243,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "76f21871.691708",
-                "8e9322d6.6a8b9"
+                "b4fb73f0.839e1",
+                "44c81024.27ce2"
             ]
         ]
     },
     {
-        "id": "929dc7d7.1039c8",
+        "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=\"Working On it\" />",
+        "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": 2276.670944213867,
-        "y": 650.0040187835693,
-        "z": "9a83e9ac.8e87e8",
+        "x": 2284.667037963867,
+        "y": 629.0001125335693,
+        "z": "758646cf.8567e8",
         "wires": []
     },
     {
-        "id": "76f21871.691708",
+        "id": "b4fb73f0.839e1",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2502.5041122436523,
-        "y": 781.9207663536072,
-        "z": "9a83e9ac.8e87e8",
+        "x": 2510.5002059936523,
+        "y": 760.9168601036072,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "aae104a5.55a318"
+                "8e7ce8fd.116958"
             ]
         ]
     },
     {
-        "id": "8e9322d6.6a8b9",
+        "id": "44c81024.27ce2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2506.5040321350098,
-        "y": 920.920608997345,
-        "z": "9a83e9ac.8e87e8",
+        "x": 2514.5001258850098,
+        "y": 899.916702747345,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "98ac5348.1769d"
+                "b83226f6.1f4ac8"
             ]
         ]
     },
     {
-        "id": "aae104a5.55a318",
+        "id": "8e7ce8fd.116958",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2662.5039463043213,
-        "y": 783.9207673072815,
-        "z": "9a83e9ac.8e87e8",
+        "x": 2670.5000400543213,
+        "y": 762.9168610572815,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "9195416c.3d54d"
+                "4ca5110c.d6744"
             ]
         ]
     },
     {
-        "id": "9195416c.3d54d",
+        "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": 2844.503677368164,
-        "y": 774.9208431243896,
-        "z": "9a83e9ac.8e87e8",
+        "x": 2852.499771118164,
+        "y": 753.9169368743896,
+        "z": "758646cf.8567e8",
         "wires": []
     },
     {
-        "id": "98ac5348.1769d",
+        "id": "b83226f6.1f4ac8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2689.5036754608154,
-        "y": 913.920717716217,
-        "z": "9a83e9ac.8e87e8",
+        "x": 2697.4997692108154,
+        "y": 892.916811466217,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "a2280756.7ffb78"
+                "b666dc86.2cbb5"
             ]
         ]
     },
     {
-        "id": "a2280756.7ffb78",
+        "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": 2875.5038299560547,
-        "y": 901.9210414886475,
-        "z": "9a83e9ac.8e87e8",
+        "x": 2883.4999237060547,
+        "y": 880.9171352386475,
+        "z": "758646cf.8567e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fe0ccd89.12fd1",
+        "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": 2285.504165649414,
-        "y": 741.4589986801147,
-        "z": "9a83e9ac.8e87e8",
+        "x": 2293.500259399414,
+        "y": 720.4550924301147,
+        "z": "758646cf.8567e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3cf054c2.6c700c",
+        "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": 1353.0040588378906,
-        "y": 566.0039277076721,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1361.0001525878906,
+        "y": 545.0000214576721,
+        "z": "758646cf.8567e8",
         "wires": []
     },
     {
-        "id": "cdb5081e.c62b38",
+        "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": 1727.757869720459,
-        "y": 413.00780391693115,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1735.753963470459,
+        "y": 392.00389766693115,
+        "z": "758646cf.8567e8",
         "wires": []
     },
     {
-        "id": "857216e8.e8f328",
+        "id": "27fa4f62.a357e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 693.7578010559082,
-        "y": 823.0078420639038,
-        "z": "9a83e9ac.8e87e8",
+        "x": 701.7538948059082,
+        "y": 802.0039358139038,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "bb3497e8.2c2608",
-                "a5d36c9a.4d26a"
+                "b67da5ac.72ddb8",
+                "6164d8bd.4d3918"
             ]
         ]
     },
     {
-        "id": "bb3497e8.2c2608",
+        "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": 843.7578449249268,
-        "y": 905.0078115463257,
-        "z": "9a83e9ac.8e87e8",
+        "x": 851.7539386749268,
+        "y": 884.0039052963257,
+        "z": "758646cf.8567e8",
         "wires": []
     },
     {
-        "id": "fae65389.46b4c",
+        "id": "f8459ad3.8c2c48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1554.0077781677246,
-        "y": 480.0078344345093,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1562.0038719177246,
+        "y": 459.0039281845093,
+        "z": "758646cf.8567e8",
         "wires": [
             [
-                "cdb5081e.c62b38",
-                "a5d36c9a.4d26a",
-                "2e6e9e5e.d18972"
+                "47937742.d68258",
+                "6164d8bd.4d3918",
+                "94dc60b.42280a"
             ]
         ]
     },
     {
-        "id": "6419a04c.32704",
+        "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": 1483.0042419433594,
-        "y": 227.0039050579071,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1491.0003356933594,
+        "y": 205.9999988079071,
+        "z": "758646cf.8567e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "f3275c75.b49b7",
+        "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": 1430.0046348571777,
-        "y": 316.88250637054443,
-        "z": "9a83e9ac.8e87e8",
+        "x": 1438.0007286071777,
+        "y": 295.87860012054443,
+        "z": "758646cf.8567e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e3d7b540.043a18",
+        "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": 1489.2538757324219,
-        "y": 275.00391244888306,
-        "z": "9a83e9ac.8e87e8",
+        "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": [
             []
         ]
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
index e56e22c..4a2df73 100644
--- 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
@@ -1,6 +1,6 @@
 [
     {
-        "id": "ec032236.b7a57",
+        "id": "2ef2c73.a74c138",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,584 +8,693 @@
         "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": 179.00390625,
-        "y": 144.00390625,
-        "z": "b909beb3.a3f6a",
+        "x": 207,
+        "y": 97,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "21fb48ea.c20258"
+                "9c18f2.85c8071"
             ]
         ]
     },
     {
-        "id": "21fb48ea.c20258",
+        "id": "9c18f2.85c8071",
         "type": "method",
         "name": "method getPolicyInstances",
         "xml": "<method rpc='getPolicyInstances' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 240.00390625,
-        "y": 264.00390625,
-        "z": "b909beb3.a3f6a",
+        "x": 268,
+        "y": 217,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "d720c111.6c25c"
+                "322607d6.ede268"
             ]
         ]
     },
     {
-        "id": "7e7a0567.85988c",
+        "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": 704.00390625,
-        "y": 79.00390625,
-        "z": "b909beb3.a3f6a",
+        "x": 732,
+        "y": 32,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             []
         ]
     },
     {
-        "id": "d720c111.6c25c",
+        "id": "322607d6.ede268",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 445.00390625,
-        "y": 218.00390625,
-        "z": "b909beb3.a3f6a",
+        "x": 473,
+        "y": 171,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "7e7a0567.85988c",
-                "75eb8d67.498124",
-                "f200a52d.0d0588",
-                "dab8aaba.ccc9c8",
-                "2d112420.4bbb3c"
+                "d9aa77b7.d8d998",
+                "c08be395.f405a",
+                "17f931de.f2160e",
+                "62f4ed6b.a9b444",
+                "e2373e18.e3f52"
             ]
         ]
     },
     {
-        "id": "11949972.8a7e97",
+        "id": "3877a9a8.bee066",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 112.00390625,
-        "y": 80.00390625,
-        "z": "b909beb3.a3f6a",
+        "x": 140,
+        "y": 33,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "ec032236.b7a57"
+                "2ef2c73.a74c138"
             ]
         ]
     },
     {
-        "id": "75eb8d67.498124",
+        "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": 744.0039520263672,
-        "y": 133.00390720367432,
-        "z": "b909beb3.a3f6a",
+        "x": 772.0000457763672,
+        "y": 86.00000095367432,
+        "z": "7ab03abd.cfb3d4",
         "wires": []
     },
     {
-        "id": "f200a52d.0d0588",
+        "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": 744.00390625,
-        "y": 186.00390625,
-        "z": "b909beb3.a3f6a",
+        "x": 772,
+        "y": 139,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             []
         ]
     },
     {
-        "id": "dab8aaba.ccc9c8",
+        "id": "62f4ed6b.a9b444",
         "type": "switchNode",
         "name": "A1 Mediator Deployed",
         "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 694.00390625,
-        "y": 242.00390625,
-        "z": "b909beb3.a3f6a",
+        "x": 722,
+        "y": 195,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "fd41c325.2c9ea",
-                "f27633b5.a9da6"
+                "6ee8b33f.55947c",
+                "4038226b.2b505c"
             ]
         ]
     },
     {
-        "id": "f27633b5.a9da6",
+        "id": "4038226b.2b505c",
         "type": "outcome",
         "name": "Deployed",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978.0039520263672,
-        "y": 102.00397157669067,
-        "z": "b909beb3.a3f6a",
+        "x": 1006.0000457763672,
+        "y": 55.000065326690674,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "9da3376b.3dd138"
+                "b1b2d727.4a5fc8"
             ]
         ]
     },
     {
-        "id": "9da3376b.3dd138",
+        "id": "b1b2d727.4a5fc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 955.0040016174316,
-        "y": 248.00392389297485,
-        "z": "b909beb3.a3f6a",
+        "x": 983.0000953674316,
+        "y": 201.00001764297485,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "a8185ff4.a81ee"
+                "e2a4df1a.855f6"
             ]
         ]
     },
     {
-        "id": "fd41c325.2c9ea",
+        "id": "6ee8b33f.55947c",
         "type": "outcome",
         "name": "Not Deployed",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 931.0039749145508,
-        "y": 537.0039677619934,
-        "z": "b909beb3.a3f6a",
+        "x": 959.0000686645508,
+        "y": 490.0000615119934,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "6e9eb61d.8a4578"
+                "c2f215d2.1cb368"
             ]
         ]
     },
     {
-        "id": "6e9eb61d.8a4578",
+        "id": "c2f215d2.1cb368",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1146.0040130615234,
-        "y": 666.0039205551147,
-        "z": "b909beb3.a3f6a",
+        "x": 1174.0001068115234,
+        "y": 619.0000143051147,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "3caedb5f.a72044",
-                "441fe2c0.e1e7fc",
-                "c00c107b.52f55"
+                "ad62ff09.05a02",
+                "55e0d36.689052c",
+                "91cd032.df9ff"
             ]
         ]
     },
     {
-        "id": "3caedb5f.a72044",
+        "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": 1271.0037689208984,
-        "y": 747.0039050579071,
-        "z": "b909beb3.a3f6a",
+        "x": 1298.9998626708984,
+        "y": 699.9999988079071,
+        "z": "7ab03abd.cfb3d4",
         "wires": []
     },
     {
-        "id": "a8185ff4.a81ee",
+        "id": "e2a4df1a.855f6",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1149.0040130615234,
-        "y": 359.00391072034836,
-        "z": "b909beb3.a3f6a",
+        "x": 1177.0001068115234,
+        "y": 312.00000447034836,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "6ea37614.a6ad08",
-                "c6d4b2d.c900a5",
-                "f32ead23.ce141",
-                "e6186f85.a2b5f",
-                "aa8f25a3.941fd8"
+                "fef9cb64.204608",
+                "ae52adc3.7b016",
+                "d64ef10d.f5309",
+                "f8cb76ee.b9e368",
+                "e5e2e791.7e4778"
             ]
         ]
     },
     {
-        "id": "c6d4b2d.c900a5",
+        "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": 1486.0053405761719,
-        "y": 185.89303493499756,
-        "z": "b909beb3.a3f6a",
+        "x": 1514.0014343261719,
+        "y": 138.88912868499756,
+        "z": "7ab03abd.cfb3d4",
         "wires": []
     },
     {
-        "id": "6ea37614.a6ad08",
+        "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": 1412.0039978027344,
-        "y": 233.0039005279541,
-        "z": "b909beb3.a3f6a",
+        "x": 1440.0000915527344,
+        "y": 185.9999942779541,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             []
         ]
     },
     {
-        "id": "f32ead23.ce141",
+        "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": 1426.0045166015625,
-        "y": 413.0143041610718,
-        "z": "b909beb3.a3f6a",
+        "x": 1454.0006103515625,
+        "y": 366.0103979110718,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "81763a3a.75e9a8",
-                "548c624e.550c4c"
+                "d71e51ff.7be1a",
+                "d4d5f1ab.35cd9"
             ]
         ]
     },
     {
-        "id": "81763a3a.75e9a8",
+        "id": "d71e51ff.7be1a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1402.0039367675781,
-        "y": 510.00401973724365,
-        "z": "b909beb3.a3f6a",
+        "x": 1430.0000305175781,
+        "y": 463.00011348724365,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "9d082013.fde13"
+                "d59b92db.746d5"
             ]
         ]
     },
     {
-        "id": "548c624e.550c4c",
+        "id": "d4d5f1ab.35cd9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1646.0041809082031,
-        "y": 381.0039281845093,
-        "z": "b909beb3.a3f6a",
+        "x": 1674.0002746582031,
+        "y": 334.0000219345093,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "f1293484.0bc0b8"
+                "b5885e67.58f09"
             ]
         ]
     },
     {
-        "id": "e45b7a63.5e3678",
+        "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": 1562.0045166015625,
-        "y": 617.0039892196655,
-        "z": "b909beb3.a3f6a",
+        "x": 1590.0006103515625,
+        "y": 570.0000829696655,
+        "z": "7ab03abd.cfb3d4",
         "wires": []
     },
     {
-        "id": "f1293484.0bc0b8",
+        "id": "b5885e67.58f09",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1796.0037860870361,
-        "y": 345.00395822525024,
-        "z": "b909beb3.a3f6a",
+        "x": 1823.9998798370361,
+        "y": 298.00005197525024,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "d525c780.d9e1f8"
+                "2a60eb9b.39ccc4",
+                "e3ef35fd.a96518",
+                "e055c0d1.c51e3",
+                "78e8b370.a1c68c",
+                "52acbf94.d0542"
             ]
         ]
     },
     {
-        "id": "d525c780.d9e1f8",
+        "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": 1976.0039100646973,
-        "y": 319.00390911102295,
-        "z": "b909beb3.a3f6a",
+        "x": 2020,
+        "y": 230,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             []
         ]
     },
     {
-        "id": "441fe2c0.e1e7fc",
+        "id": "55e0d36.689052c",
         "type": "block",
         "name": "DMAAP Reponse Publish",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1932.0040283203125,
-        "y": 714.0040578842163,
-        "z": "b909beb3.a3f6a",
+        "x": 1960.0001220703125,
+        "y": 667.0001516342163,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "98e62a34.70f008",
-                "c6fd62af.c7216",
-                "bec3e985.6b96c8"
+                "39c58f15.87c84",
+                "b6fb1d33.d4dce",
+                "68afbda6.b2da84"
             ]
         ]
     },
     {
-        "id": "c6fd62af.c7216",
+        "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": 2281.0042266845703,
-        "y": 892.0034625530243,
-        "z": "b909beb3.a3f6a",
+        "x": 2309.0003204345703,
+        "y": 844.9995563030243,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "18ca6a8e.895005",
-                "5c7201b9.5f902"
+                "18afe330.09bd4d",
+                "730fd2a5.584c7c"
             ]
         ]
     },
     {
-        "id": "98e62a34.70f008",
+        "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=\"Working On it\" />",
+        "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": 2270.670944213867,
-        "y": 683.0040187835693,
-        "z": "b909beb3.a3f6a",
+        "x": 2304.6669921875,
+        "y": 640.0001220703125,
+        "z": "7ab03abd.cfb3d4",
         "wires": []
     },
     {
-        "id": "18ca6a8e.895005",
+        "id": "18afe330.09bd4d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2496.5041122436523,
-        "y": 814.9207663536072,
-        "z": "b909beb3.a3f6a",
+        "x": 2524.5002059936523,
+        "y": 767.9168601036072,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "32a11aed.000606"
+                "ddc3776c.e922d8"
             ]
         ]
     },
     {
-        "id": "5c7201b9.5f902",
+        "id": "730fd2a5.584c7c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2500.5040321350098,
-        "y": 953.920608997345,
-        "z": "b909beb3.a3f6a",
+        "x": 2528.5001258850098,
+        "y": 906.916702747345,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "3f10fd46.bde0e2"
+                "c2e51e51.ce11"
             ]
         ]
     },
     {
-        "id": "32a11aed.000606",
+        "id": "ddc3776c.e922d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2656.5039463043213,
-        "y": 816.9207673072815,
-        "z": "b909beb3.a3f6a",
+        "x": 2684.5000400543213,
+        "y": 769.9168610572815,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "af4fd183.8aab9"
+                "37ee6733.0d3ce8"
             ]
         ]
     },
     {
-        "id": "af4fd183.8aab9",
+        "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": 2838.503677368164,
-        "y": 807.9208431243896,
-        "z": "b909beb3.a3f6a",
+        "x": 2866.499771118164,
+        "y": 760.9169368743896,
+        "z": "7ab03abd.cfb3d4",
         "wires": []
     },
     {
-        "id": "3f10fd46.bde0e2",
+        "id": "c2e51e51.ce11",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2683.5036754608154,
-        "y": 946.920717716217,
-        "z": "b909beb3.a3f6a",
+        "x": 2711.4997692108154,
+        "y": 899.916811466217,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "434607a6.ef8078"
+                "79473b19.1f2a54"
             ]
         ]
     },
     {
-        "id": "434607a6.ef8078",
+        "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": 2869.5038299560547,
-        "y": 934.9210414886475,
-        "z": "b909beb3.a3f6a",
+        "x": 2897.4999237060547,
+        "y": 887.9171352386475,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             []
         ]
     },
     {
-        "id": "bec3e985.6b96c8",
+        "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": 2279.504165649414,
-        "y": 774.4589986801147,
-        "z": "b909beb3.a3f6a",
+        "x": 2307.500259399414,
+        "y": 727.4550924301147,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             []
         ]
     },
     {
-        "id": "c00c107b.52f55",
+        "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": 1347.0040588378906,
-        "y": 599.0039277076721,
-        "z": "b909beb3.a3f6a",
+        "x": 1375.0001525878906,
+        "y": 552.0000214576721,
+        "z": "7ab03abd.cfb3d4",
         "wires": []
     },
     {
-        "id": "e2a14338.fa69e",
+        "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": 1721.757869720459,
-        "y": 446.00780391693115,
-        "z": "b909beb3.a3f6a",
+        "x": 1749.753963470459,
+        "y": 399.00389766693115,
+        "z": "7ab03abd.cfb3d4",
         "wires": []
     },
     {
-        "id": "2d112420.4bbb3c",
+        "id": "e2373e18.e3f52",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 687.7578010559082,
-        "y": 856.0078420639038,
-        "z": "b909beb3.a3f6a",
+        "x": 715.7538948059082,
+        "y": 809.0039358139038,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "b9d43aed.0e9ff8",
-                "441fe2c0.e1e7fc"
+                "5a09f4bf.92845c",
+                "55e0d36.689052c"
             ]
         ]
     },
     {
-        "id": "b9d43aed.0e9ff8",
+        "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": 837.7578449249268,
-        "y": 938.0078115463257,
-        "z": "b909beb3.a3f6a",
+        "x": 865.7539386749268,
+        "y": 891.0039052963257,
+        "z": "7ab03abd.cfb3d4",
         "wires": []
     },
     {
-        "id": "9d082013.fde13",
+        "id": "d59b92db.746d5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1548.0077781677246,
-        "y": 513.0078344345093,
-        "z": "b909beb3.a3f6a",
+        "x": 1576.0038719177246,
+        "y": 466.0039281845093,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             [
-                "e2a14338.fa69e",
-                "441fe2c0.e1e7fc",
-                "e45b7a63.5e3678"
+                "e7488f0e.105bf",
+                "55e0d36.689052c",
+                "52dad0a2.d0077"
             ]
         ]
     },
     {
-        "id": "e6186f85.a2b5f",
+        "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": 1475.0041198730469,
-        "y": 289.00391244888306,
-        "z": "b909beb3.a3f6a",
+        "x": 1503.0002136230469,
+        "y": 242.00000619888306,
+        "z": "7ab03abd.cfb3d4",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa8f25a3.941fd8",
+        "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": 1424.0046348571777,
-        "y": 349.88250637054443,
-        "z": "b909beb3.a3f6a",
+        "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": [
             []
         ]
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyType.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyType.json
index fcfe11e..5a0d4ac 100644
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyType.json
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyType.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": "deb6b7ae.432f48",
+        "id": "5b092693.8b31a8",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,620 +8,851 @@
         "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": 227.00390625,
-        "y": 105.00390625,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 184,
+        "y": 97.00000095367432,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "42af6ba5.ed05e4"
+                "afc11ca.4c58de"
             ]
         ]
     },
     {
-        "id": "42af6ba5.ed05e4",
+        "id": "afc11ca.4c58de",
         "type": "method",
         "name": "method getPolicyType",
         "xml": "<method rpc='getPolicyType' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 290.00391387939453,
-        "y": 228.00391578674316,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 247.00000762939453,
+        "y": 220.00001049041748,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "7d583e57.3a038"
+                "3ad9b2ad.8bd4de"
             ]
         ]
     },
     {
-        "id": "14acd312.55d52d",
+        "id": "6646c270.0174cc",
         "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 from Near RT RIC ID\"/>\n<parameter name=\"field2\" value=\"`$get-policy-type-input.near-rt-ric-id`\"/>\n<parameter name=\"field3\" value=\"`$get-policy-type-input.policy-type-id`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 755.0039329528809,
-        "y": 41.003905296325684,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 712.0000267028809,
+        "y": 33,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7d583e57.3a038",
+        "id": "3ad9b2ad.8bd4de",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 493.00390625,
-        "y": 179.00390625,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 450,
+        "y": 171.00000095367432,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "14acd312.55d52d",
-                "278bea58.810416",
-                "9f2d6793.a34c08",
-                "656e0fe4.4c146",
-                "699ddeff.ea20c"
+                "6646c270.0174cc",
+                "1372436.3cfc4bd",
+                "48c86cd1.d4ec04",
+                "7589e079.778f",
+                "610eb9a7.c191a8"
             ]
         ]
     },
     {
-        "id": "71079a32.757f84",
+        "id": "217182fc.bc476e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 160.00390625,
-        "y": 41.00390625,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 117,
+        "y": 33.000000953674316,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "deb6b7ae.432f48"
+                "5b092693.8b31a8"
             ]
         ]
     },
     {
-        "id": "278bea58.810416",
+        "id": "1372436.3cfc4bd",
         "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": 792.0040130615234,
-        "y": 94.00390434265137,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 749.0001068115234,
+        "y": 85.99999904632568,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "9f2d6793.a34c08",
+        "id": "48c86cd1.d4ec04",
         "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": 792.00390625,
-        "y": 147.00390625,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 749,
+        "y": 139.00000095367432,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "656e0fe4.4c146",
+        "id": "7589e079.778f",
         "type": "switchNode",
         "name": "A1 Mediator Deployed",
         "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 742.00390625,
-        "y": 203.00390625,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 699,
+        "y": 195.00000095367432,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "dca8b30a.68fdc",
-                "9120c0b9.1ccb5"
+                "4960c05e.4a48e",
+                "9d487d40.76962"
             ]
         ]
     },
     {
-        "id": "9120c0b9.1ccb5",
+        "id": "9d487d40.76962",
         "type": "outcome",
         "name": "Deployed",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1026.0039520263672,
-        "y": 63.003971576690674,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 983.0000457763672,
+        "y": 55.00006628036499,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "c8aa8c79.ffc7b"
+                "fae15a24.468558"
             ]
         ]
     },
     {
-        "id": "c8aa8c79.ffc7b",
+        "id": "fae15a24.468558",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1003.0040016174316,
-        "y": 209.00392389297485,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 960.0000953674316,
+        "y": 201.00001859664917,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "f87feba2.fca948"
+                "8adeeb48.5c34c8"
             ]
         ]
     },
     {
-        "id": "dca8b30a.68fdc",
+        "id": "4960c05e.4a48e",
         "type": "outcome",
         "name": "Not Deployed",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 979.0039749145508,
-        "y": 498.0039677619934,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 936.0000686645508,
+        "y": 490.0000624656677,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "3f2d9857.202c88"
+                "cafd16f3.2ead98"
             ]
         ]
     },
     {
-        "id": "3f2d9857.202c88",
+        "id": "cafd16f3.2ead98",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1194.0040130615234,
-        "y": 627.0039205551147,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1151.0001068115234,
+        "y": 619.0000152587891,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "1628f3ec.4529fc",
-                "941815be.0e6418",
-                "af6e494e.eba298"
+                "e3d060c0.b81ec",
+                "944ee6aa.e0ceb8",
+                "77b3dd76.a3cb44"
             ]
         ]
     },
     {
-        "id": "1628f3ec.4529fc",
+        "id": "e3d060c0.b81ec",
         "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 Type. Aborting\" />",
         "comments": "",
-        "x": 1319.0037689208984,
-        "y": 708.0039050579071,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1275.9998626708984,
+        "y": 699.9999997615814,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "f87feba2.fca948",
+        "id": "8adeeb48.5c34c8",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1197.0040130615234,
-        "y": 320.00391072034836,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1154.0001068115234,
+        "y": 312.0000054240227,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "5d39225d.b5d86c",
-                "8bcf78cb.a45fa8",
-                "ec0ff476.077b18",
-                "adeac94f.c6b478",
-                "ca2401e.27b07"
+                "38afaf12.aee1f",
+                "3a82d4a7.de542c",
+                "c33b0782.69bf48",
+                "77404dcb.5cb384",
+                "de061428.e131a8"
             ]
         ]
     },
     {
-        "id": "8bcf78cb.a45fa8",
+        "id": "3a82d4a7.de542c",
         "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-type-input.near-rt-ric-id`\"/>\n<parameter name=\"tmp.policy-type-id\" value=\"`$get-policy-type-input.policy-type-id`\"/>",
         "comments": "",
-        "x": 1532.0054016113281,
-        "y": 159.89304208755493,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1489.0014953613281,
+        "y": 151.88913679122925,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "5d39225d.b5d86c",
+        "id": "38afaf12.aee1f",
         "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-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.restapi.policytype-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1459.0040550231934,
-        "y": 312.0039167404175,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1418.0001220703125,
+        "y": 305,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ec0ff476.077b18",
+        "id": "c33b0782.69bf48",
         "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.policytype-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": 1486.0045127868652,
-        "y": 383.01427364349365,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1443.0006065368652,
+        "y": 375.01036834716797,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "6449f6f.dddf208",
-                "d6f09679.a01fe8"
+                "e4055a3f.3f1948",
+                "d16bd1ec.d9d41"
             ]
         ]
     },
     {
-        "id": "6449f6f.dddf208",
+        "id": "e4055a3f.3f1948",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1450.0039367675781,
-        "y": 471.00401973724365,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1407.0000305175781,
+        "y": 463.00011444091797,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "91104dd5.632de"
+                "75a0dbe4.4e34d4"
             ]
         ]
     },
     {
-        "id": "d6f09679.a01fe8",
+        "id": "d16bd1ec.d9d41",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1694.0041809082031,
-        "y": 342.0039281845093,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1651.0002746582031,
+        "y": 334.0000228881836,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "e81637cc.588ed8"
+                "670e82ec.e25a0c"
             ]
         ]
     },
     {
-        "id": "d8c6f411.0c63d8",
+        "id": "c041efea.9ebb8",
         "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": 1610.0045166015625,
-        "y": 578.0039892196655,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1567.0006103515625,
+        "y": 570.0000839233398,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "e81637cc.588ed8",
+        "id": "670e82ec.e25a0c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1844.0037860870361,
-        "y": 306.00395822525024,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1800.9998798370361,
+        "y": 298.00005292892456,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "a2df3924.7ce618"
+                "a67a8a02.c4eee8",
+                "ae1fa477.a961e8",
+                "4e22b738.909c78",
+                "d3650671.cbdc18"
             ]
         ]
     },
     {
-        "id": "a2df3924.7ce618",
+        "id": "a67a8a02.c4eee8",
         "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.*`\"/>",
+        "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`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 2025.00390625,
-        "y": 283.00390911102295,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1991,
+        "y": 279,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "941815be.0e6418",
+        "id": "944ee6aa.e0ceb8",
         "type": "block",
         "name": "DMAAP Reponse Publish",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1980.0040283203125,
-        "y": 675.0040578842163,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1937.0001220703125,
+        "y": 667.0001525878906,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "1211b972.fe3cf7",
-                "3f01de14.4ed1b2",
-                "ffe957f0.991a38"
+                "fc69fb2.0d81f08",
+                "4306b6e3.228028",
+                "7c10f260.44e35c"
             ]
         ]
     },
     {
-        "id": "3f01de14.4ed1b2",
+        "id": "4306b6e3.228028",
         "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": 2329.0042266845703,
-        "y": 853.0034625530243,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 2286.0003204345703,
+        "y": 844.9995572566986,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "a14ff319.1db5f",
-                "1fd03359.fc712d"
+                "a20937dd.f06898",
+                "afcdec04.54575"
             ]
         ]
     },
     {
-        "id": "1211b972.fe3cf7",
+        "id": "fc69fb2.0d81f08",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyType'/>\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\" />",
+        "xml": "<set>\n<parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyType'/>\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": 2318.670944213867,
-        "y": 644.0040187835693,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 2276.6669921875,
+        "y": 637.0001220703125,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "a14ff319.1db5f",
+        "id": "a20937dd.f06898",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2544.5041122436523,
-        "y": 775.9207663536072,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 2501.5002059936523,
+        "y": 767.9168610572815,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "1c603946.e2ec57"
+                "6180ced9.26a6c"
             ]
         ]
     },
     {
-        "id": "1fd03359.fc712d",
+        "id": "afcdec04.54575",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2548.5040321350098,
-        "y": 914.920608997345,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 2505.5001258850098,
+        "y": 906.9167037010193,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "f06f4733.197198"
+                "e35e575c.da5738"
             ]
         ]
     },
     {
-        "id": "1c603946.e2ec57",
+        "id": "6180ced9.26a6c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2704.5039463043213,
-        "y": 777.9207673072815,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 2661.5000400543213,
+        "y": 769.9168620109558,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "758bbaed.01d694"
+                "2c8065c6.6dbfda"
             ]
         ]
     },
     {
-        "id": "758bbaed.01d694",
+        "id": "2c8065c6.6dbfda",
         "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": 2886.503677368164,
-        "y": 768.9208431243896,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 2843.499771118164,
+        "y": 760.916937828064,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "f06f4733.197198",
+        "id": "e35e575c.da5738",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2731.5036754608154,
-        "y": 907.920717716217,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 2688.4997692108154,
+        "y": 899.9168124198914,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "f7ca92e4.64915"
+                "b0aef6ff.309868"
             ]
         ]
     },
     {
-        "id": "f7ca92e4.64915",
+        "id": "b0aef6ff.309868",
         "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": 2917.5038299560547,
-        "y": 895.9210414886475,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 2874.4999237060547,
+        "y": 887.9171361923218,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ffe957f0.991a38",
+        "id": "7c10f260.44e35c",
         "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": 2327.504165649414,
-        "y": 735.4589986801147,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 2287.500244140625,
+        "y": 727.455078125,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "af6e494e.eba298",
+        "id": "77b3dd76.a3cb44",
         "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": 1397.0041275024414,
-        "y": 561.0039281845093,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1354.0002212524414,
+        "y": 553.0000228881836,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "b95a43d4.018fc",
+        "id": "c52c6d9d.59628",
         "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": 1773.7578506469727,
-        "y": 411.00782680511475,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1730.7539443969727,
+        "y": 403.00392150878906,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "699ddeff.ea20c",
+        "id": "610eb9a7.c191a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 735.7578010559082,
-        "y": 817.0078420639038,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 692.7538948059082,
+        "y": 809.0039367675781,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "12f7b185.4d91ee",
-                "941815be.0e6418"
+                "e54fca82.f54998",
+                "944ee6aa.e0ceb8"
             ]
         ]
     },
     {
-        "id": "12f7b185.4d91ee",
+        "id": "e54fca82.f54998",
         "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": 885.7578449249268,
-        "y": 899.0078115463257,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 842.7539386749268,
+        "y": 891.00390625,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "91104dd5.632de",
+        "id": "75a0dbe4.4e34d4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1598.0078468322754,
-        "y": 477.0078339576721,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1555.0039405822754,
+        "y": 469.00392866134644,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             [
-                "b95a43d4.018fc",
-                "941815be.0e6418",
-                "d8c6f411.0c63d8"
+                "c52c6d9d.59628",
+                "944ee6aa.e0ceb8",
+                "c041efea.9ebb8"
             ]
         ]
     },
     {
-        "id": "9b40ce31.b3a69",
+        "id": "e78926ee.e57698",
         "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": 219.00390625,
-        "y": 470.00390625,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 176,
+        "y": 462.0000009536743,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "adeac94f.c6b478",
+        "id": "77404dcb.5cb384",
         "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": 1527.0033569335938,
-        "y": 259.12530422210693,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1483.9994506835938,
+        "y": 251.12139892578125,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2adb928.6c9c98",
+        "id": "4ee7bbbd.0e4a04",
         "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": 174.0029296875,
-        "y": 643.1148071289062,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 130.9990234375,
+        "y": 635.1109018325806,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a095d160.04b79",
+        "id": "84be517a.aeb94",
         "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": 221.0029296875,
-        "y": 586.1148071289062,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 177.9990234375,
+        "y": 578.1109018325806,
+        "z": "b55eea1d.a59fe8",
         "wires": []
     },
     {
-        "id": "ca2401e.27b07",
+        "id": "de061428.e131a8",
         "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-id`\"/>\n<parameter name=\"field3\" value=\"`$tmp.policy-type-id`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1463.0038719177246,
-        "y": 210.00391292572021,
-        "z": "4e8e4e8b.e7eb7",
+        "x": 1419.9999656677246,
+        "y": 202.00000762939453,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "347044de.5be97c",
+        "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='a1MediatorRsp.unescaped.httpResponse' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2524,
+        "y": 235,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ae1fa477.a961e8",
+        "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": 1962,
+        "y": 522,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dc58bba7.2a8c48",
+        "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' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2541,
+        "y": 297,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "178332cc.70a4dd",
+        "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.vtl' />\n    <parameter name='output' value='policy' />\n    <parameter name='prefix' value='a1-mediator' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2061,
+        "y": 341,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            [
+                "71224d76.822194"
+            ]
+        ]
+    },
+    {
+        "id": "71224d76.822194",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2283,
+        "y": 348,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            [
+                "651f0c08.1762d4"
+            ]
+        ]
+    },
+    {
+        "id": "651f0c08.1762d4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2442,
+        "y": 384,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            [
+                "410a16ab.2db198"
+            ]
+        ]
+    },
+    {
+        "id": "410a16ab.2db198",
+        "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 Policy Info: a1-mediator.policy\"/>\n<parameter name='field3' value='`$a1-mediator.policy`' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2629,
+        "y": 400,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "568eaf0f.6c1b8",
+        "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": 2039,
+        "y": 199,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4e22b738.909c78",
+        "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": 2055,
+        "y": 398,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            [
+                "858d973a.bd78e8",
+                "2a34ede9.f48572"
+            ]
+        ]
+    },
+    {
+        "id": "858d973a.bd78e8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2550.5001068115234,
+        "y": 477.0000033378601,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            [
+                "416d5516.42b47c"
+            ]
+        ]
+    },
+    {
+        "id": "416d5516.42b47c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2685.500259399414,
+        "y": 547.0000357627869,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            [
+                "9fd68ab6.cc7f68"
+            ]
+        ]
+    },
+    {
+        "id": "9fd68ab6.cc7f68",
+        "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": 2757.500198364258,
+        "y": 465.9999976158142,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2a34ede9.f48572",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2560.5000762939453,
+        "y": 637.0000382959843,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            [
+                "c19e3ee9.36685"
+            ]
+        ]
+    },
+    {
+        "id": "c19e3ee9.36685",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2713.4999237060547,
+        "y": 613.0000309944153,
+        "z": "b55eea1d.a59fe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d3650671.cbdc18",
+        "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": 2033,
+        "y": 470,
+        "z": "b55eea1d.a59fe8",
         "wires": [
             []
         ]
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
index b134c19..a5378e5 100644
--- 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
@@ -1,6 +1,6 @@
 [
     {
-        "id": "59c2dfd4.8abe9",
+        "id": "6067cd4e.304ae4",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,556 +8,650 @@
         "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": 180.00390625,
-        "y": 101.00390625,
-        "z": "4c7efb80.7cead4",
+        "x": 185,
+        "y": 89,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "7af1d8df.20fb98"
+                "70ed549c.b5d70c"
             ]
         ]
     },
     {
-        "id": "7af1d8df.20fb98",
+        "id": "70ed549c.b5d70c",
         "type": "method",
         "name": "method getPolicyTypes",
         "xml": "<method rpc='getPolicyTypes' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 241.00390625,
-        "y": 221.00390625,
-        "z": "4c7efb80.7cead4",
+        "x": 246,
+        "y": 209,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "b15010d5.15696"
+                "91bd15a2.424a98"
             ]
         ]
     },
     {
-        "id": "a1c2f906.421c18",
+        "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": 705.00390625,
-        "y": 36.00390625,
-        "z": "4c7efb80.7cead4",
+        "x": 710,
+        "y": 24,
+        "z": "5e99e485.2d389c",
         "wires": [
             []
         ]
     },
     {
-        "id": "b15010d5.15696",
+        "id": "91bd15a2.424a98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 446.00390625,
-        "y": 175.00390625,
-        "z": "4c7efb80.7cead4",
+        "x": 451,
+        "y": 163,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "a1c2f906.421c18",
-                "da9b1969.ac6b58",
-                "2640d848.80bbb8",
-                "2b968baf.6ed334",
-                "78f940aa.11fce"
+                "31ba6243.302d2e",
+                "31915871.748968",
+                "58b6b3e3.593f7c",
+                "19d73ae2.c7f4a5",
+                "673d4b76.d5ea84"
             ]
         ]
     },
     {
-        "id": "df08bd9f.55af9",
+        "id": "987f4471.584818",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 113.00390625,
-        "y": 37.00390625,
-        "z": "4c7efb80.7cead4",
+        "x": 118,
+        "y": 25,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "59c2dfd4.8abe9"
+                "6067cd4e.304ae4"
             ]
         ]
     },
     {
-        "id": "da9b1969.ac6b58",
+        "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": 745.0039520263672,
-        "y": 90.00390720367432,
-        "z": "4c7efb80.7cead4",
+        "x": 751.0000610351562,
+        "y": 79,
+        "z": "5e99e485.2d389c",
         "wires": []
     },
     {
-        "id": "2640d848.80bbb8",
+        "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": 745.00390625,
-        "y": 143.00390625,
-        "z": "4c7efb80.7cead4",
+        "x": 750,
+        "y": 131,
+        "z": "5e99e485.2d389c",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b968baf.6ed334",
+        "id": "19d73ae2.c7f4a5",
         "type": "switchNode",
         "name": "A1 Mediator Deployed",
         "xml": "<switch test='`$prop.ric-plt-A1Mediator-deployed`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 695.00390625,
-        "y": 199.00390625,
-        "z": "4c7efb80.7cead4",
+        "x": 700,
+        "y": 187,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "3ce1cda5.28ff92",
-                "787a0ceb.e039b4"
+                "19811b4a.acaa95",
+                "fc6bbd7a.17bdd"
             ]
         ]
     },
     {
-        "id": "787a0ceb.e039b4",
+        "id": "fc6bbd7a.17bdd",
         "type": "outcome",
         "name": "Deployed",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 979.0039520263672,
-        "y": 59.003971576690674,
-        "z": "4c7efb80.7cead4",
+        "x": 984.0000457763672,
+        "y": 47.000065326690674,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "f952e955.833d08"
+                "4109ed4a.292674"
             ]
         ]
     },
     {
-        "id": "f952e955.833d08",
+        "id": "4109ed4a.292674",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 956.0040016174316,
-        "y": 205.00392389297485,
-        "z": "4c7efb80.7cead4",
+        "x": 961.0000953674316,
+        "y": 193.00001764297485,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "cbd67155.db51b"
+                "86b25e24.27ef5"
             ]
         ]
     },
     {
-        "id": "3ce1cda5.28ff92",
+        "id": "19811b4a.acaa95",
         "type": "outcome",
         "name": "Not Deployed",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 932.0039749145508,
-        "y": 494.0039677619934,
-        "z": "4c7efb80.7cead4",
+        "x": 937.0000686645508,
+        "y": 482.0000615119934,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "e8dd7987.9127e8"
+                "6d6ae46c.57116c"
             ]
         ]
     },
     {
-        "id": "e8dd7987.9127e8",
+        "id": "6d6ae46c.57116c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1147.0040130615234,
-        "y": 623.0039205551147,
-        "z": "4c7efb80.7cead4",
+        "x": 1152.0001068115234,
+        "y": 611.0000143051147,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "a7a142e7.93988",
-                "5e2ec2ff.98aacc",
-                "9143fd0a.5fd1f"
+                "fa0fa11d.ceb9",
+                "4fef8f1a.599d4",
+                "287f4673.477b1a"
             ]
         ]
     },
     {
-        "id": "a7a142e7.93988",
+        "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": 1272.0037689208984,
-        "y": 704.0039050579071,
-        "z": "4c7efb80.7cead4",
+        "x": 1276.9998626708984,
+        "y": 691.9999988079071,
+        "z": "5e99e485.2d389c",
         "wires": []
     },
     {
-        "id": "cbd67155.db51b",
+        "id": "86b25e24.27ef5",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1150.0040130615234,
-        "y": 316.00391072034836,
-        "z": "4c7efb80.7cead4",
+        "x": 1156.0001220703125,
+        "y": 305,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "40b30f7a.5851c",
-                "37a98276.7f1bee",
-                "8ae6d3fc.6de4"
+                "f9fbf240.fa61f",
+                "5f33ee47.bd2a1",
+                "609ca78d.4934f8"
             ]
         ]
     },
     {
-        "id": "37a98276.7f1bee",
+        "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": 1520.005283355713,
-        "y": 250.89303016662598,
-        "z": "4c7efb80.7cead4",
+        "x": 1525.001377105713,
+        "y": 238.88912391662598,
+        "z": "5e99e485.2d389c",
         "wires": []
     },
     {
-        "id": "40b30f7a.5851c",
+        "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": 1409.0039367675781,
-        "y": 304.00390911102295,
-        "z": "4c7efb80.7cead4",
+        "x": 1414.0000305175781,
+        "y": 292.00000286102295,
+        "z": "5e99e485.2d389c",
         "wires": [
             []
         ]
     },
     {
-        "id": "8ae6d3fc.6de4",
+        "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": 1445.0045471191406,
-        "y": 387.0142889022827,
-        "z": "4c7efb80.7cead4",
+        "x": 1453.0006103515625,
+        "y": 377.0103759765625,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "f0fde675.5fc208",
-                "ea57a120.aefb9"
+                "bdaa1249.dc6c4",
+                "9810268a.b5ebc8"
             ]
         ]
     },
     {
-        "id": "f0fde675.5fc208",
+        "id": "bdaa1249.dc6c4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1403.0039367675781,
-        "y": 467.00401973724365,
-        "z": "4c7efb80.7cead4",
+        "x": 1408.0000305175781,
+        "y": 455.00011348724365,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "47280ee8.91324"
+                "b9f104a6.8bd438"
             ]
         ]
     },
     {
-        "id": "ea57a120.aefb9",
+        "id": "9810268a.b5ebc8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1647.0041809082031,
-        "y": 338.0039281845093,
-        "z": "4c7efb80.7cead4",
+        "x": 1652.0002746582031,
+        "y": 326.0000219345093,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "91c7cc22.f50fa"
+                "31d1df15.23aae"
             ]
         ]
     },
     {
-        "id": "6ad346e1.874668",
+        "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": 1563.0045166015625,
-        "y": 574.0039892196655,
-        "z": "4c7efb80.7cead4",
+        "x": 1568.0006103515625,
+        "y": 562.0000829696655,
+        "z": "5e99e485.2d389c",
         "wires": []
     },
     {
-        "id": "91c7cc22.f50fa",
+        "id": "31d1df15.23aae",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1797.0037860870361,
-        "y": 302.00395822525024,
-        "z": "4c7efb80.7cead4",
+        "x": 1801.9998798370361,
+        "y": 290.00005197525024,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "b0927297.5c798"
+                "f2eaf7c1.ad8c98",
+                "87eb9f5d.78ef7",
+                "2c6137d1.211508",
+                "3ff97da4.fc2632"
             ]
         ]
     },
     {
-        "id": "b0927297.5c798",
+        "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`\"/>",
+        "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": 1977.0039100646973,
-        "y": 276.00390911102295,
-        "z": "4c7efb80.7cead4",
+        "x": 1980,
+        "y": 283,
+        "z": "5e99e485.2d389c",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e2ec2ff.98aacc",
+        "id": "4fef8f1a.599d4",
         "type": "block",
         "name": "DMAAP Reponse Publish",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1933.0040283203125,
-        "y": 671.0040578842163,
-        "z": "4c7efb80.7cead4",
+        "x": 1938.0001220703125,
+        "y": 659.0001516342163,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "19f09b1f.ef68a5",
-                "c85abe4e.04981",
-                "6e7b36c6.941d68"
+                "a2679af6.639ab8",
+                "968b7857.8630b8",
+                "be33abf4.cf9ec8"
             ]
         ]
     },
     {
-        "id": "c85abe4e.04981",
+        "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": 2282.0042266845703,
-        "y": 849.0034625530243,
-        "z": "4c7efb80.7cead4",
+        "x": 2295.000244140625,
+        "y": 843.9995727539062,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "778c6b4c.d4c124",
-                "4e9a9c42.7e1bc4"
+                "83072b70.549ff8",
+                "649a948c.8fd06c"
             ]
         ]
     },
     {
-        "id": "19f09b1f.ef68a5",
+        "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=\"`$a1MediatorRsp`\" />",
+        "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": 2271.670944213867,
-        "y": 640.0040187835693,
-        "z": "4c7efb80.7cead4",
+        "x": 2276.6669921875,
+        "y": 629.0001220703125,
+        "z": "5e99e485.2d389c",
         "wires": []
     },
     {
-        "id": "778c6b4c.d4c124",
+        "id": "83072b70.549ff8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2497.5041122436523,
-        "y": 771.9207663536072,
-        "z": "4c7efb80.7cead4",
+        "x": 2502.5002059936523,
+        "y": 759.9168601036072,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "63bc20b5.f1da2"
+                "c3f33449.19fdb8"
             ]
         ]
     },
     {
-        "id": "4e9a9c42.7e1bc4",
+        "id": "649a948c.8fd06c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2501.5040321350098,
-        "y": 910.920608997345,
-        "z": "4c7efb80.7cead4",
+        "x": 2506.5001258850098,
+        "y": 898.916702747345,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "76ba37c0.8c4108"
+                "eb0e78e3.be81d8"
             ]
         ]
     },
     {
-        "id": "63bc20b5.f1da2",
+        "id": "c3f33449.19fdb8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2657.5039463043213,
-        "y": 773.9207673072815,
-        "z": "4c7efb80.7cead4",
+        "x": 2662.5000400543213,
+        "y": 761.9168610572815,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "f50721b0.4e107"
+                "5929c9fd.274ba8"
             ]
         ]
     },
     {
-        "id": "f50721b0.4e107",
+        "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": 2839.503677368164,
-        "y": 764.9208431243896,
-        "z": "4c7efb80.7cead4",
+        "x": 2844.499771118164,
+        "y": 752.9169368743896,
+        "z": "5e99e485.2d389c",
         "wires": []
     },
     {
-        "id": "76ba37c0.8c4108",
+        "id": "eb0e78e3.be81d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2684.5036754608154,
-        "y": 903.920717716217,
-        "z": "4c7efb80.7cead4",
+        "x": 2689.4997692108154,
+        "y": 891.916811466217,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "7bc04bf1.7e7834"
+                "af7b183b.0a64f8"
             ]
         ]
     },
     {
-        "id": "7bc04bf1.7e7834",
+        "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": 2870.5038299560547,
-        "y": 891.9210414886475,
-        "z": "4c7efb80.7cead4",
+        "x": 2875.4999237060547,
+        "y": 879.9171352386475,
+        "z": "5e99e485.2d389c",
         "wires": [
             []
         ]
     },
     {
-        "id": "6e7b36c6.941d68",
+        "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": 2280.504165649414,
-        "y": 731.4589986801147,
-        "z": "4c7efb80.7cead4",
+        "x": 2286.500244140625,
+        "y": 721.455078125,
+        "z": "5e99e485.2d389c",
         "wires": [
             []
         ]
     },
     {
-        "id": "9143fd0a.5fd1f",
+        "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": 1348.0040588378906,
-        "y": 556.0039277076721,
-        "z": "4c7efb80.7cead4",
+        "x": 1353.0001525878906,
+        "y": 544.0000214576721,
+        "z": "5e99e485.2d389c",
         "wires": []
     },
     {
-        "id": "bd7fd084.d14a1",
+        "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": 1722.757869720459,
-        "y": 403.00780391693115,
-        "z": "4c7efb80.7cead4",
+        "x": 1727.753963470459,
+        "y": 391.00389766693115,
+        "z": "5e99e485.2d389c",
         "wires": []
     },
     {
-        "id": "78f940aa.11fce",
+        "id": "673d4b76.d5ea84",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 688.7578010559082,
-        "y": 813.0078420639038,
-        "z": "4c7efb80.7cead4",
+        "x": 693.7538948059082,
+        "y": 801.0039358139038,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "4c3d7914.2ada48",
-                "5e2ec2ff.98aacc"
+                "8deed83d.906568",
+                "4fef8f1a.599d4"
             ]
         ]
     },
     {
-        "id": "4c3d7914.2ada48",
+        "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": 838.7578449249268,
-        "y": 895.0078115463257,
-        "z": "4c7efb80.7cead4",
+        "x": 845.7539672851562,
+        "y": 885.00390625,
+        "z": "5e99e485.2d389c",
         "wires": []
     },
     {
-        "id": "47280ee8.91324",
+        "id": "b9f104a6.8bd438",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1549.0077781677246,
-        "y": 470.0078344345093,
-        "z": "4c7efb80.7cead4",
+        "x": 1554.0038719177246,
+        "y": 458.0039281845093,
+        "z": "5e99e485.2d389c",
         "wires": [
             [
-                "bd7fd084.d14a1",
-                "5e2ec2ff.98aacc",
-                "6ad346e1.874668"
+                "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/xml/A1-ADAPTER-API_getPolicyInstance.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstance.xml
index e20c3cd..03fa785 100644
--- 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
@@ -71,8 +71,37 @@
                                             <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`"/>
+                                            <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'>
@@ -91,7 +120,7 @@
                                                 <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="Working On it" />
+                                                <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" />
@@ -152,7 +181,7 @@
                                 <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="Working On it" />
+                                <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" />
@@ -210,7 +239,7 @@
                         <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="Working On it" />
+                        <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" />
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
index 5d272a7..c486afb 100644
--- 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
@@ -57,12 +57,46 @@
                                 <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'>
@@ -81,7 +115,7 @@
                                                 <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="Working On it" />
+                                                <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" />
@@ -142,7 +176,7 @@
                                 <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="Working On it" />
+                                <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" />
@@ -200,7 +234,7 @@
                         <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="Working On it" />
+                        <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" />
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyType.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyType.xml
index b598ef3..72eb3e2 100644
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyType.xml
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyType.xml
@@ -60,8 +60,37 @@
                                             <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.*`"/>
+                                            <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=""/>
+                                            <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.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=""/>
+                                        </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>
                                     </block>
                                 </outcome>
                                 <outcome value='failure'>
@@ -80,7 +109,7 @@
                                                 <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyType'/>
                                                 <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" />
+                                                <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" />
@@ -141,7 +170,7 @@
                                 <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyType'/>
                                 <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" />
+                                <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" />
@@ -199,7 +228,7 @@
                         <parameter name='tmp.a1-adapter-api.rpc-name' value='getPolicyType'/>
                         <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" />
+                        <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" />
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
index 97ff313..7a6bb9c 100644
--- 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
@@ -42,11 +42,39 @@
                                 <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`"/>
+                                            <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>
@@ -66,7 +94,7 @@
                                                 <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="`$a1MediatorRsp`" />
+                                                <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" />
@@ -127,7 +155,7 @@
                                 <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="`$a1MediatorRsp`" />
+                                <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" />
@@ -185,7 +213,7 @@
                         <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="`$a1MediatorRsp`" />
+                        <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" />