Bug Fix- Updated the http response code/ response message

Issue-ID: CCSDK-2828 Change-Id: Ifa65c7a75fdc00cb0db5fd34e3a42695bad3c4db Signed-off-by: Lathish <lathishbabu.ganesan@est.tech>
author: Lathish <lathishbabu.ganesan@est.tech> 2021-09-06 16:10:50 +0100
committer: Lathish <lathishbabu.ganesan@est.tech> 2021-09-07 15:07:20 +0100
commit: f906377369016ed5d82dd1f458b4b8cdcc2778b7 (patch)
tree: 6a32d40a7a98b179d2ecf69d30d1fd5ea2a1a465 /platform-logic
parent: d39df59d0b50a60922ca790699cecc93258ed519 (diff)
10 files changed, 2791 insertions, 2757 deletions
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json
index bae3ba86..8534f6d9 100644
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json
@@ -1,514 +1,514 @@
-[
-    {
-        "id": "40b94c2a.1d5be4",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 194,
-        "y": 237,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "c8e7631.2112ba"
-            ]
-        ]
-    },
-    {
-        "id": "c8e7631.2112ba",
-        "type": "method",
-        "name": "method deleteA1Policy",
-        "xml": "<method rpc='deleteA1Policy' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 254,
-        "y": 357,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "4faf22ab.4c738c"
-            ]
-        ]
-    },
-    {
-        "id": "166f48b5.9a3a17",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy:\"/>\n<parameter name=\"field2\" value=\"`$delete-a1-policy-input.near-rt-ric-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 718,
-        "y": 171,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4faf22ab.4c738c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 459,
-        "y": 311,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "166f48b5.9a3a17",
-                "b2679b68.1462c8",
-                "4148a57a.c7efcc",
-                "f504796c.262f88",
-                "aba0ccb1.73758"
-            ]
-        ]
-    },
-    {
-        "id": "4e2bdc30.8909a4",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 126,
-        "y": 173,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "40b94c2a.1d5be4"
-            ]
-        ]
-    },
-    {
-        "id": "b2679b68.1462c8",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicy executed successfully' />",
-        "comments": "",
-        "x": 759.0000610351562,
-        "y": 226,
-        "z": "5421e0da.e98ea",
-        "wires": []
-    },
-    {
-        "id": "4148a57a.c7efcc",
-        "type": "execute",
-        "name": "execute Properties",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 758,
-        "y": 279,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "aba0ccb1.73758",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 788.0001220703125,
-        "y": 363,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "c6ab5263.f678d",
-                "5cd5776d.1e0278",
-                "628e7bf2.7d9964",
-                "793b4300.b8738c"
-            ]
-        ]
-    },
-    {
-        "id": "5cd5776d.1e0278",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$delete-a1-policy-input.near-rt-ric-url`\"/>",
-        "comments": "",
-        "x": 1161.00146484375,
-        "y": 136.88912963867188,
-        "z": "5421e0da.e98ea",
-        "wires": []
-    },
-    {
-        "id": "c6ab5263.f678d",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Delete Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1056.0001220703125,
-        "y": 461,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "628e7bf2.7d9964",
-        "type": "execute",
-        "name": "Delete Policy Instance",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"false\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1096.0006103515625,
-        "y": 536.0104064941406,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "2eaa9315.f1267c",
-                "1b5b58af.e3d147"
-            ]
-        ]
-    },
-    {
-        "id": "2eaa9315.f1267c",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1325,
-        "y": 625.0001220703125,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "8fd194ab.4d6f48"
-            ]
-        ]
-    },
-    {
-        "id": "1b5b58af.e3d147",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1315.000244140625,
-        "y": 470.0000305175781,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "4ca53b3d.e09944"
-            ]
-        ]
-    },
-    {
-        "id": "c96895f9.6920d8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error in Deleting A1 Policy Instance. Aborting\" />",
-        "comments": "",
-        "x": 1648.0006103515625,
-        "y": 680.0000610351562,
-        "z": "5421e0da.e98ea",
-        "wires": []
-    },
-    {
-        "id": "4ca53b3d.e09944",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1488.9998779296875,
-        "y": 470.00006103515625,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "e8211cdb.f1c0b",
-                "4e8c89de.7e4e78"
-            ]
-        ]
-    },
-    {
-        "id": "e8211cdb.f1c0b",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Delete Policy Information \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp.httpResponse`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1646,
-        "y": 416,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ab28de1f.ae2e2",
-        "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": 1621.75390625,
-        "y": 573.00390625,
-        "z": "5421e0da.e98ea",
-        "wires": []
-    },
-    {
-        "id": "f504796c.262f88",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 697.75390625,
-        "y": 545.00390625,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "2fbb20e3.ff965"
-            ]
-        ]
-    },
-    {
-        "id": "2fbb20e3.ff965",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicyInstance executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 858.7539672851562,
-        "y": 545.0039672851562,
-        "z": "5421e0da.e98ea",
-        "wires": []
-    },
-    {
-        "id": "8fd194ab.4d6f48",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1480.00390625,
-        "y": 624.0039367675781,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "ab28de1f.ae2e2",
-                "c96895f9.6920d8"
-            ]
-        ]
-    },
-    {
-        "id": "4e8c89de.7e4e78",
-        "type": "execute",
-        "name": "set",
-        "xml": "<set>\n<parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1652,
-        "y": 520,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "19e9382.863dfc8",
-        "type": "execute",
-        "name": "split near-rt-ric URL",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n    <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2055,
-        "y": 252,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "df43d920.c48608",
-        "type": "for",
-        "name": "for",
-        "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
-        "comments": "",
-        "outputs": 1,
-        "x": 2021,
-        "y": 322,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "e32aea7c.0c7418"
-            ]
-        ]
-    },
-    {
-        "id": "e32aea7c.0c7418",
-        "type": "execute",
-        "name": "set concat url",
-        "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2199,
-        "y": 322,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "695b0eaa.faece",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2021,
-        "y": 376,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c793909b.fccf4",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy: No proxy found on properties file \"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1825,
-        "y": 288,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dbb430eb.1e3ee",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1817,
-        "y": 356,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "19e9382.863dfc8",
-                "df43d920.c48608",
-                "695b0eaa.faece",
-                "cb7535ae.d9c2b8"
-            ]
-        ]
-    },
-    {
-        "id": "cb7535ae.d9c2b8",
-        "type": "set",
-        "name": "set variables for A1 Mediator with proxy url",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
-        "comments": "",
-        "x": 2131,
-        "y": 435,
-        "z": "5421e0da.e98ea",
-        "wires": []
-    },
-    {
-        "id": "3bf50c57.2c0d74",
-        "type": "outcome",
-        "name": "No proxy URL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1657,
-        "y": 288,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "c793909b.fccf4"
-            ]
-        ]
-    },
-    {
-        "id": "719dd702.c98f88",
-        "type": "outcome",
-        "name": "Otherwise",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1653,
-        "y": 356,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "dbb430eb.1e3ee"
-            ]
-        ]
-    },
-    {
-        "id": "77200c7b.1ac3f4",
-        "type": "set",
-        "name": "set tmp url variables with proxy information",
-        "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
-        "comments": "",
-        "x": 1596,
-        "y": 164,
-        "z": "5421e0da.e98ea",
-        "wires": []
-    },
-    {
-        "id": "f471f3e5.a3e5c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1479,
-        "y": 239,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d521b1c.f9f805",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$tmp.proxy-url`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1478,
-        "y": 322,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "3bf50c57.2c0d74",
-                "719dd702.c98f88"
-            ]
-        ]
-    },
-    {
-        "id": "793b4300.b8738c",
-        "type": "block",
-        "name": "block Substitute proxy address if available",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1141,
-        "y": 321,
-        "z": "5421e0da.e98ea",
-        "wires": [
-            [
-                "77200c7b.1ac3f4",
-                "f471f3e5.a3e5c",
-                "d521b1c.f9f805"
-            ]
-        ]
-    }
+[
+    {
+        "id": "a447a452.635fa8",
+        "type": "service-logic",
+        "name": "A1-ADAPTER-API ${project.version}",
+        "module": "A1-ADAPTER-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 148,
+        "y": 146.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "aa9f057c.f13598"
+            ]
+        ]
+    },
+    {
+        "id": "aa9f057c.f13598",
+        "type": "method",
+        "name": "method deleteA1Policy",
+        "xml": "<method rpc='deleteA1Policy' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 208,
+        "y": 266.1108703613281,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "5c8824d3.f2344c"
+            ]
+        ]
+    },
+    {
+        "id": "9fb06523.31d628",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy:\"/>\n<parameter name=\"field2\" value=\"`$delete-a1-policy-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 672,
+        "y": 80.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5c8824d3.f2344c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 413,
+        "y": 220.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "9fb06523.31d628",
+                "23fdd8fa.63f2d8",
+                "1c180e5.366e5f2",
+                "36348c30.bf23e4",
+                "233e808.6a2288"
+            ]
+        ]
+    },
+    {
+        "id": "5d0de73d.0e8098",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 80,
+        "y": 82.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "a447a452.635fa8"
+            ]
+        ]
+    },
+    {
+        "id": "233e808.6a2288",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicy executed successfully' />",
+        "comments": "",
+        "x": 713.0000610351562,
+        "y": 135.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": []
+    },
+    {
+        "id": "23fdd8fa.63f2d8",
+        "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": 712,
+        "y": 188.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "36348c30.bf23e4",
+        "type": "block",
+        "name": "A1 Mediator RestAPI Invocation",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 742.0001220703125,
+        "y": 272.1108703613281,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "67c4647.5e9d39c",
+                "137a540e.529a0c",
+                "5d1ae490.dcddcc",
+                "5d1a137e.2dac4c"
+            ]
+        ]
+    },
+    {
+        "id": "137a540e.529a0c",
+        "type": "set",
+        "name": "set tmp variables for A1 Mediator REST API call",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$delete-a1-policy-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "x": 1115.00146484375,
+        "y": 46,
+        "z": "b095413b.d2f8d",
+        "wires": []
+    },
+    {
+        "id": "67c4647.5e9d39c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Delete Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1010.0001220703125,
+        "y": 370.1108703613281,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5d1ae490.dcddcc",
+        "type": "execute",
+        "name": "Delete Policy Instance",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"DELETE\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"false\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1050.0006103515625,
+        "y": 445.12127685546875,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "af85ffea.175b3",
+                "d620d649.a947c8"
+            ]
+        ]
+    },
+    {
+        "id": "af85ffea.175b3",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1279,
+        "y": 534.1109924316406,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "56ddc908.6336c8"
+            ]
+        ]
+    },
+    {
+        "id": "d620d649.a947c8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1269.000244140625,
+        "y": 379.11090087890625,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "def3924e.1551b"
+            ]
+        ]
+    },
+    {
+        "id": "2e291aaf.e9f6b6",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "x": 1602.0006103515625,
+        "y": 589.1109313964844,
+        "z": "b095413b.d2f8d",
+        "wires": []
+    },
+    {
+        "id": "def3924e.1551b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1442.9998779296875,
+        "y": 379.1109313964844,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "2b3c81b8.a1a58e",
+                "5e3d39b8.e4f438"
+            ]
+        ]
+    },
+    {
+        "id": "2b3c81b8.a1a58e",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Delete Policy Information \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n<parameter name='field3' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='field4' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1600,
+        "y": 325.1108703613281,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "58e12f5b.03ab6",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>\n",
+        "comments": "",
+        "x": 1575.75390625,
+        "y": 482.1147766113281,
+        "z": "b095413b.d2f8d",
+        "wires": []
+    },
+    {
+        "id": "1c180e5.366e5f2",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 651.75390625,
+        "y": 454.1147766113281,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "d4c1291b.ee9338"
+            ]
+        ]
+    },
+    {
+        "id": "d4c1291b.ee9338",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicyInstance executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
+        "comments": "",
+        "x": 812.7539672851562,
+        "y": 454.1148376464844,
+        "z": "b095413b.d2f8d",
+        "wires": []
+    },
+    {
+        "id": "56ddc908.6336c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1434.00390625,
+        "y": 533.1148071289062,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "58e12f5b.03ab6",
+                "2e291aaf.e9f6b6"
+            ]
+        ]
+    },
+    {
+        "id": "5e3d39b8.e4f438",
+        "type": "execute",
+        "name": "set",
+        "xml": "<set>\n<parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1606,
+        "y": 429.1108703613281,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8784b71f.4102c8",
+        "type": "execute",
+        "name": "split near-rt-ric URL",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n    <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 2009,
+        "y": 161.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4a62f928.6bd3f8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1975,
+        "y": 231.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "70dc997b.0486a8"
+            ]
+        ]
+    },
+    {
+        "id": "70dc997b.0486a8",
+        "type": "execute",
+        "name": "set concat url",
+        "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2153,
+        "y": 231.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9476835d.fd86",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1975,
+        "y": 285.1108703613281,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f3d9622e.f23b9",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy: No proxy found on properties file \"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1779,
+        "y": 197.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "19526cfe.e22a53",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1771,
+        "y": 265.1108703613281,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "8784b71f.4102c8",
+                "4a62f928.6bd3f8",
+                "9476835d.fd86",
+                "fdf5e62e.ff4588"
+            ]
+        ]
+    },
+    {
+        "id": "fdf5e62e.ff4588",
+        "type": "set",
+        "name": "set variables for A1 Mediator with proxy url",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
+        "comments": "",
+        "x": 2085,
+        "y": 344.1108703613281,
+        "z": "b095413b.d2f8d",
+        "wires": []
+    },
+    {
+        "id": "c4aac840.55b728",
+        "type": "outcome",
+        "name": "No proxy URL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1611,
+        "y": 197.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "f3d9622e.f23b9"
+            ]
+        ]
+    },
+    {
+        "id": "6f2cfaad.7863b4",
+        "type": "outcome",
+        "name": "Otherwise",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1607,
+        "y": 265.1108703613281,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "19526cfe.e22a53"
+            ]
+        ]
+    },
+    {
+        "id": "4a770dc4.985ed4",
+        "type": "set",
+        "name": "set tmp url variables with proxy information",
+        "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
+        "comments": "",
+        "x": 1550,
+        "y": 73.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": []
+    },
+    {
+        "id": "49b752da.8fb6bc",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1433,
+        "y": 148.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "aa685353.a5b32",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$tmp.proxy-url`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1432,
+        "y": 231.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "c4aac840.55b728",
+                "6f2cfaad.7863b4"
+            ]
+        ]
+    },
+    {
+        "id": "5d1a137e.2dac4c",
+        "type": "block",
+        "name": "block Substitute proxy address if available",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1095,
+        "y": 230.11087036132812,
+        "z": "b095413b.d2f8d",
+        "wires": [
+            [
+                "4a770dc4.985ed4",
+                "49b752da.8fb6bc",
+                "aa685353.a5b32"
+            ]
+        ]
+    }
 ]
 \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1Policy.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1Policy.json
index 679a5648..f8a716f0 100644
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1Policy.json
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1Policy.json
@@ -1,529 +1,529 @@
-[
-    {
-        "id": "a60fb60b.241a28",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 175,
-        "y": 269,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "57fe6f06.92d82"
-            ]
-        ]
-    },
-    {
-        "id": "57fe6f06.92d82",
-        "type": "method",
-        "name": "method getA1Policy",
-        "xml": "<method rpc='getA1Policy' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 234,
-        "y": 390,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "5bd5c7d.75cdd38"
-            ]
-        ]
-    },
-    {
-        "id": "6c7eeb3b.b216c4",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-input.near-rt-ric-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 695,
-        "y": 191,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5bd5c7d.75cdd38",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 439,
-        "y": 344,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "6c7eeb3b.b216c4",
-                "ca0351d6.caa3e",
-                "18c8dded.66a2f2",
-                "236f6af1.570056",
-                "bfb54edb.3da1b"
-            ]
-        ]
-    },
-    {
-        "id": "24f44e9b.4aa622",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 106,
-        "y": 206,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "a60fb60b.241a28"
-            ]
-        ]
-    },
-    {
-        "id": "ca0351d6.caa3e",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get A1 Policy executed successfully' />",
-        "comments": "",
-        "x": 739.0000610351562,
-        "y": 259,
-        "z": "7304d8ed.dab258",
-        "wires": []
-    },
-    {
-        "id": "18c8dded.66a2f2",
-        "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": 738,
-        "y": 312,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bfb54edb.3da1b",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 768.0001220703125,
-        "y": 396,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "a8547794.9858e8",
-                "ddc15ef5.9b7b4",
-                "8a8335fe.a1c9b8",
-                "2e1a3941.d3ca26"
-            ]
-        ]
-    },
-    {
-        "id": "ddc15ef5.9b7b4",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$get-a1-policy-input.near-rt-ric-url`\"/>",
-        "comments": "",
-        "x": 1139.00146484375,
-        "y": 190.88912963867188,
-        "z": "7304d8ed.dab258",
-        "wires": []
-    },
-    {
-        "id": "a8547794.9858e8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1024.0001220703125,
-        "y": 395,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8a8335fe.a1c9b8",
-        "type": "execute",
-        "name": "Get Policy Instance",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"false\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1057.0006103515625,
-        "y": 543.0104064941406,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "e4a64d8c.fd97",
-                "5a45e869.670878"
-            ]
-        ]
-    },
-    {
-        "id": "e4a64d8c.fd97",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1267,
-        "y": 641.0001220703125,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "13b0f676.750d9a"
-            ]
-        ]
-    },
-    {
-        "id": "5a45e869.670878",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1274.000244140625,
-        "y": 542.0000305175781,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "2c53bf53.3bc33"
-            ]
-        ]
-    },
-    {
-        "id": "df221ec3.a4a66",
-        "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": 1591.0006103515625,
-        "y": 751.0000610351562,
-        "z": "7304d8ed.dab258",
-        "wires": []
-    },
-    {
-        "id": "2c53bf53.3bc33",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1430.9998779296875,
-        "y": 541.0000610351562,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "cbc08871.96e018",
-                "98154503.e4bc58",
-                "168fc93b.3defa7"
-            ]
-        ]
-    },
-    {
-        "id": "cbc08871.96e018",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information \"/>\n<parameter name=\"field2\" value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1582,
-        "y": 539,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9092f8ee.72e568",
-        "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": 1581.75390625,
-        "y": 667.00390625,
-        "z": "7304d8ed.dab258",
-        "wires": []
-    },
-    {
-        "id": "236f6af1.570056",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 701.75390625,
-        "y": 568.00390625,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "a1bd774.c21d588"
-            ]
-        ]
-    },
-    {
-        "id": "a1bd774.c21d588",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get PolicyInstance executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 862.7539672851562,
-        "y": 568.0039672851562,
-        "z": "7304d8ed.dab258",
-        "wires": []
-    },
-    {
-        "id": "13b0f676.750d9a",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1427.00390625,
-        "y": 705.00390625,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "9092f8ee.72e568",
-                "df221ec3.a4a66"
-            ]
-        ]
-    },
-    {
-        "id": "98154503.e4bc58",
-        "type": "execute",
-        "name": "set",
-        "xml": "<set>\n<parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1581,
-        "y": 584,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "168fc93b.3defa7",
-        "type": "execute",
-        "name": "execute",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1587,
-        "y": 490,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2e1a3941.d3ca26",
-        "type": "block",
-        "name": "block Substitute proxy address if available",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1144,
-        "y": 304,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "75b00f49.dcc31",
-                "c836a6e6.960ec8",
-                "e1b6f74c.e43ab8"
-            ]
-        ]
-    },
-    {
-        "id": "75b00f49.dcc31",
-        "type": "set",
-        "name": "set tmp url variables with proxy information",
-        "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
-        "comments": "",
-        "x": 1546,
-        "y": 181,
-        "z": "7304d8ed.dab258",
-        "wires": []
-    },
-    {
-        "id": "c836a6e6.960ec8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1429,
-        "y": 256,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "26ee6f37.aa426",
-        "type": "execute",
-        "name": "split near-rt-ric URL",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n    <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1978,
-        "y": 338,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2545ffb.f98f8",
-        "type": "for",
-        "name": "for",
-        "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
-        "comments": "",
-        "outputs": 1,
-        "x": 1944,
-        "y": 408,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "79fcf81b.cca0a8"
-            ]
-        ]
-    },
-    {
-        "id": "79fcf81b.cca0a8",
-        "type": "execute",
-        "name": "set concat url",
-        "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2122,
-        "y": 408,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4d7fe169.4b287",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1944,
-        "y": 471,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e1b6f74c.e43ab8",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$tmp.proxy-url`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1428,
-        "y": 339,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "8d722c43.e9664",
-                "1b872074.8d5e4"
-            ]
-        ]
-    },
-    {
-        "id": "8d722c43.e9664",
-        "type": "outcome",
-        "name": "No proxy URL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1607,
-        "y": 305,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "af216f88.1be42"
-            ]
-        ]
-    },
-    {
-        "id": "af216f88.1be42",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information: No proxy found on properties file \"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1775,
-        "y": 305,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1b872074.8d5e4",
-        "type": "outcome",
-        "name": "Otherwise",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1603,
-        "y": 373,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "6c54e9b2.79a338"
-            ]
-        ]
-    },
-    {
-        "id": "6c54e9b2.79a338",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1767,
-        "y": 373,
-        "z": "7304d8ed.dab258",
-        "wires": [
-            [
-                "26ee6f37.aa426",
-                "2545ffb.f98f8",
-                "4d7fe169.4b287",
-                "b2366d8c.1909"
-            ]
-        ]
-    },
-    {
-        "id": "b2366d8c.1909",
-        "type": "set",
-        "name": "set variables for A1 Mediator with proxy url",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
-        "comments": "",
-        "x": 2054,
-        "y": 532,
-        "z": "7304d8ed.dab258",
-        "wires": []
-    }
+[
+    {
+        "id": "6b8e8ac6.27c604",
+        "type": "service-logic",
+        "name": "A1-ADAPTER-API ${project.version}",
+        "module": "A1-ADAPTER-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 147,
+        "y": 150,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "f3000999.b457c8"
+            ]
+        ]
+    },
+    {
+        "id": "f3000999.b457c8",
+        "type": "method",
+        "name": "method getA1Policy",
+        "xml": "<method rpc='getA1Policy' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 206,
+        "y": 271,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "fd6ab97c.15c398"
+            ]
+        ]
+    },
+    {
+        "id": "b0630652.2b2fd8",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 667,
+        "y": 72,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fd6ab97c.15c398",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 411,
+        "y": 225,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "b0630652.2b2fd8",
+                "4adbc81e.0b0048",
+                "4fe0b14e.770ba",
+                "edc9dec.2ed5c2",
+                "b199f172.85d81"
+            ]
+        ]
+    },
+    {
+        "id": "f5e8f571.ccf0c8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 78,
+        "y": 87,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "6b8e8ac6.27c604"
+            ]
+        ]
+    },
+    {
+        "id": "b199f172.85d81",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get A1 Policy executed successfully' />",
+        "comments": "",
+        "x": 711.0000610351562,
+        "y": 140,
+        "z": "545d3747.09bc48",
+        "wires": []
+    },
+    {
+        "id": "4adbc81e.0b0048",
+        "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": 710,
+        "y": 193,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "edc9dec.2ed5c2",
+        "type": "block",
+        "name": "A1 Mediator RestAPI Invocation",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 740.0001220703125,
+        "y": 277,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "39a6720a.10988e",
+                "33dfeef0.7d5242",
+                "7a4641c.b4572c",
+                "df6fc431.781608"
+            ]
+        ]
+    },
+    {
+        "id": "33dfeef0.7d5242",
+        "type": "set",
+        "name": "set tmp variables for A1 Mediator REST API call",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$get-a1-policy-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "x": 1111.00146484375,
+        "y": 71.88912963867188,
+        "z": "545d3747.09bc48",
+        "wires": []
+    },
+    {
+        "id": "39a6720a.10988e",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 996.0001220703125,
+        "y": 276,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7a4641c.b4572c",
+        "type": "execute",
+        "name": "Get Policy Instance",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"false\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1029.0006103515625,
+        "y": 424.0104064941406,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "928c2359.89c87",
+                "db81e29d.785cf"
+            ]
+        ]
+    },
+    {
+        "id": "928c2359.89c87",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1239,
+        "y": 522.0001220703125,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "5dfae475.8705bc"
+            ]
+        ]
+    },
+    {
+        "id": "db81e29d.785cf",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1246.000244140625,
+        "y": 423.0000305175781,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "26c1647d.47560c"
+            ]
+        ]
+    },
+    {
+        "id": "c3778115.31514",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "x": 1563.0006103515625,
+        "y": 632.0000610351562,
+        "z": "545d3747.09bc48",
+        "wires": []
+    },
+    {
+        "id": "26c1647d.47560c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1402.9998779296875,
+        "y": 422.00006103515625,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "dc2efa73.54ac98",
+                "64acc423.194b8c",
+                "a368a134.d9d3"
+            ]
+        ]
+    },
+    {
+        "id": "dc2efa73.54ac98",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information \"/>\n<parameter name=\"field2\" value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>\n<parameter name='field3' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='field4' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1554,
+        "y": 420,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "352d49a0.502856",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "x": 1553.75390625,
+        "y": 548.00390625,
+        "z": "545d3747.09bc48",
+        "wires": []
+    },
+    {
+        "id": "4fe0b14e.770ba",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 673.75390625,
+        "y": 449.00390625,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "2868e6a6.21dd1a"
+            ]
+        ]
+    },
+    {
+        "id": "2868e6a6.21dd1a",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get PolicyInstance executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
+        "comments": "",
+        "x": 834.7539672851562,
+        "y": 449.00396728515625,
+        "z": "545d3747.09bc48",
+        "wires": []
+    },
+    {
+        "id": "5dfae475.8705bc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1399.00390625,
+        "y": 586.00390625,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "352d49a0.502856",
+                "c3778115.31514"
+            ]
+        ]
+    },
+    {
+        "id": "64acc423.194b8c",
+        "type": "execute",
+        "name": "set",
+        "xml": "<set>\n<parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1554,
+        "y": 465,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a368a134.d9d3",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1559,
+        "y": 371,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "df6fc431.781608",
+        "type": "block",
+        "name": "block Substitute proxy address if available",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1116,
+        "y": 185,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "1289f0de.0acddf",
+                "3504c3f2.901f0c",
+                "4102f074.51249"
+            ]
+        ]
+    },
+    {
+        "id": "1289f0de.0acddf",
+        "type": "set",
+        "name": "set tmp url variables with proxy information",
+        "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
+        "comments": "",
+        "x": 1518,
+        "y": 62,
+        "z": "545d3747.09bc48",
+        "wires": []
+    },
+    {
+        "id": "3504c3f2.901f0c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1401,
+        "y": 137,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8911bb5d.b025b8",
+        "type": "execute",
+        "name": "split near-rt-ric URL",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n    <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1950,
+        "y": 219,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e6ae7ab5.9009e8",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1916,
+        "y": 289,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "a8f7d018.65cc3"
+            ]
+        ]
+    },
+    {
+        "id": "a8f7d018.65cc3",
+        "type": "execute",
+        "name": "set concat url",
+        "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2094,
+        "y": 289,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d03c0ffe.7fff9",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1916,
+        "y": 352,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4102f074.51249",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$tmp.proxy-url`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1400,
+        "y": 220,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "442627aa.ecfb28",
+                "7f1b2e0f.e847e"
+            ]
+        ]
+    },
+    {
+        "id": "442627aa.ecfb28",
+        "type": "outcome",
+        "name": "No proxy URL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1579,
+        "y": 186,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "3c8e8474.1813cc"
+            ]
+        ]
+    },
+    {
+        "id": "3c8e8474.1813cc",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information: No proxy found on properties file \"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1747,
+        "y": 186,
+        "z": "545d3747.09bc48",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7f1b2e0f.e847e",
+        "type": "outcome",
+        "name": "Otherwise",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1575,
+        "y": 254,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "39d6481.0e40eb8"
+            ]
+        ]
+    },
+    {
+        "id": "39d6481.0e40eb8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1739,
+        "y": 254,
+        "z": "545d3747.09bc48",
+        "wires": [
+            [
+                "8911bb5d.b025b8",
+                "e6ae7ab5.9009e8",
+                "d03c0ffe.7fff9",
+                "958535d2.70fcf8"
+            ]
+        ]
+    },
+    {
+        "id": "958535d2.70fcf8",
+        "type": "set",
+        "name": "set variables for A1 Mediator with proxy url",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
+        "comments": "",
+        "x": 2026,
+        "y": 413,
+        "z": "545d3747.09bc48",
+        "wires": []
+    }
 ]
 \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json
index 85db3a55..5ae0f374 100644
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json
@@ -1,529 +1,529 @@
-[
-    {
-        "id": "7547a4fa.c7bbcc",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 172,
-        "y": 213,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "1108b3bd.2f6f4c"
-            ]
-        ]
-    },
-    {
-        "id": "1108b3bd.2f6f4c",
-        "type": "method",
-        "name": "method getA1PolicyStatus",
-        "xml": "<method rpc='getA1PolicyStatus' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 231,
-        "y": 334,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "423ee9ab.f84d58"
-            ]
-        ]
-    },
-    {
-        "id": "86ab57c6.4239e8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-status-input.near-rt-ric-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 695,
-        "y": 148,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "423ee9ab.f84d58",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 436,
-        "y": 288,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "86ab57c6.4239e8",
-                "377e4bc4.cf6254",
-                "d0dee2e1.f5a44",
-                "2064dc6c.f4a0b4",
-                "7b79073a.3842e8"
-            ]
-        ]
-    },
-    {
-        "id": "9743b8a8.158568",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 103,
-        "y": 150,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "7547a4fa.c7bbcc"
-            ]
-        ]
-    },
-    {
-        "id": "377e4bc4.cf6254",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get A1 Policy executed successfully' />",
-        "comments": "",
-        "x": 736.0000610351562,
-        "y": 203,
-        "z": "ba6f4cc8.60e08",
-        "wires": []
-    },
-    {
-        "id": "d0dee2e1.f5a44",
-        "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": 735,
-        "y": 256,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7b79073a.3842e8",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 765.0001220703125,
-        "y": 340,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "f6e87f8b.c8e97",
-                "484e89c8.8a2518",
-                "106aff5e.8841f1",
-                "7df3b9b5.9298c8"
-            ]
-        ]
-    },
-    {
-        "id": "484e89c8.8a2518",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$get-a1-policy-status-input.near-rt-ric-url`\"/>",
-        "comments": "",
-        "x": 1138.00146484375,
-        "y": 237.88912963867188,
-        "z": "ba6f4cc8.60e08",
-        "wires": []
-    },
-    {
-        "id": "f6e87f8b.c8e97",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Status.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1015.0001220703125,
-        "y": 416,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "106aff5e.8841f1",
-        "type": "execute",
-        "name": "Get Policy Instance Status",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1079.0006103515625,
-        "y": 544.0103759765625,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "f3f6f62a.f41478",
-                "969a94ea.773e38"
-            ]
-        ]
-    },
-    {
-        "id": "f3f6f62a.f41478",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1303,
-        "y": 624.0001220703125,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "6fa34f65.cd31e"
-            ]
-        ]
-    },
-    {
-        "id": "969a94ea.773e38",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1307.000244140625,
-        "y": 470.0000305175781,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "bb9a433.67534c"
-            ]
-        ]
-    },
-    {
-        "id": "841abfc3.69c46",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error in Getting A1 Policy Status. Aborting\" />",
-        "comments": "",
-        "x": 1610.0006103515625,
-        "y": 679.0000610351562,
-        "z": "ba6f4cc8.60e08",
-        "wires": []
-    },
-    {
-        "id": "bb9a433.67534c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1450.9998779296875,
-        "y": 470.00006103515625,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "53bf49b8.e46be8",
-                "23da3b63.1d7a64",
-                "e316d95e.fbfff8"
-            ]
-        ]
-    },
-    {
-        "id": "53bf49b8.e46be8",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Status \"/>\n<parameter name=\"field2\" value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1612,
-        "y": 469,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "45d11c3c.69ea24",
-        "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": 1583.75390625,
-        "y": 572.00390625,
-        "z": "ba6f4cc8.60e08",
-        "wires": []
-    },
-    {
-        "id": "2064dc6c.f4a0b4",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 698.75390625,
-        "y": 560.00390625,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "fd599731.db71c8"
-            ]
-        ]
-    },
-    {
-        "id": "fd599731.db71c8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get Policy Status executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
-        "comments": "",
-        "x": 859.7539672851562,
-        "y": 560.0039672851562,
-        "z": "ba6f4cc8.60e08",
-        "wires": []
-    },
-    {
-        "id": "6fa34f65.cd31e",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1442.00390625,
-        "y": 624.0039367675781,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "45d11c3c.69ea24",
-                "841abfc3.69c46"
-            ]
-        ]
-    },
-    {
-        "id": "23da3b63.1d7a64",
-        "type": "execute",
-        "name": "set",
-        "xml": "<set>\n<parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1614,
-        "y": 520,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e316d95e.fbfff8",
-        "type": "execute",
-        "name": "execute",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1616,
-        "y": 426,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b988a0f2.cebc8",
-        "type": "execute",
-        "name": "split near-rt-ric URL",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n    <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1994,
-        "y": 318,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6e6d1a6a.783024",
-        "type": "for",
-        "name": "for",
-        "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
-        "comments": "",
-        "outputs": 1,
-        "x": 1960,
-        "y": 388,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "91e4428c.7143b"
-            ]
-        ]
-    },
-    {
-        "id": "91e4428c.7143b",
-        "type": "execute",
-        "name": "set concat url",
-        "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2138,
-        "y": 388,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5958734e.49501c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1960,
-        "y": 451,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d87bfe21.b6db5",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status: No proxy found on properties file \"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1791,
-        "y": 285,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c12bf1b.56d2e1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1783,
-        "y": 353,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "b988a0f2.cebc8",
-                "6e6d1a6a.783024",
-                "5958734e.49501c",
-                "9090a68a.628a58"
-            ]
-        ]
-    },
-    {
-        "id": "9090a68a.628a58",
-        "type": "set",
-        "name": "set variables for A1 Mediator with proxy url",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
-        "comments": "",
-        "x": 2070,
-        "y": 512,
-        "z": "ba6f4cc8.60e08",
-        "wires": []
-    },
-    {
-        "id": "768b81d4.9d20c",
-        "type": "outcome",
-        "name": "Otherwise",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1619,
-        "y": 353,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "c12bf1b.56d2e1"
-            ]
-        ]
-    },
-    {
-        "id": "b3216caa.c1505",
-        "type": "outcome",
-        "name": "No proxy URL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1623,
-        "y": 285,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "d87bfe21.b6db5"
-            ]
-        ]
-    },
-    {
-        "id": "5379ad2e.52cba4",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$tmp.proxy-url`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1444,
-        "y": 319,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "b3216caa.c1505",
-                "768b81d4.9d20c"
-            ]
-        ]
-    },
-    {
-        "id": "2151b182.f0aebe",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1445,
-        "y": 236,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "862a1de8.7e469",
-        "type": "set",
-        "name": "set tmp url variables with proxy information",
-        "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
-        "comments": "",
-        "x": 1562,
-        "y": 161,
-        "z": "ba6f4cc8.60e08",
-        "wires": []
-    },
-    {
-        "id": "7df3b9b5.9298c8",
-        "type": "block",
-        "name": "block Substitute proxy address if available",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1117,
-        "y": 326,
-        "z": "ba6f4cc8.60e08",
-        "wires": [
-            [
-                "862a1de8.7e469",
-                "2151b182.f0aebe",
-                "5379ad2e.52cba4"
-            ]
-        ]
-    }
+[
+    {
+        "id": "1f03ae12.22b482",
+        "type": "service-logic",
+        "name": "A1-ADAPTER-API ${project.version}",
+        "module": "A1-ADAPTER-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 162,
+        "y": 133,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "8bd7382e.5951c8"
+            ]
+        ]
+    },
+    {
+        "id": "8bd7382e.5951c8",
+        "type": "method",
+        "name": "method getA1PolicyStatus",
+        "xml": "<method rpc='getA1PolicyStatus' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 221,
+        "y": 254,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "79d72e28.bcc54"
+            ]
+        ]
+    },
+    {
+        "id": "e61b6ee5.b949b",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-status-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 685,
+        "y": 68,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "79d72e28.bcc54",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 426,
+        "y": 208,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "e61b6ee5.b949b",
+                "577dc417.5a651c",
+                "7cb48c00.8ced04",
+                "eee487dc.9ea2f8",
+                "57df804c.8c393"
+            ]
+        ]
+    },
+    {
+        "id": "bfa9b29.612d95",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 93,
+        "y": 70,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "1f03ae12.22b482"
+            ]
+        ]
+    },
+    {
+        "id": "57df804c.8c393",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get A1 Policy executed successfully' />",
+        "comments": "",
+        "x": 726.0000610351562,
+        "y": 123,
+        "z": "82264c28.fa865",
+        "wires": []
+    },
+    {
+        "id": "577dc417.5a651c",
+        "type": "execute",
+        "name": "execute Properties",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 725,
+        "y": 176,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "eee487dc.9ea2f8",
+        "type": "block",
+        "name": "A1 Mediator RestAPI Invocation",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 755.0001220703125,
+        "y": 260,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "95f961b6.beecd",
+                "a037b233.bd226",
+                "64616aa3.fae654",
+                "321db38.935fb4c"
+            ]
+        ]
+    },
+    {
+        "id": "a037b233.bd226",
+        "type": "set",
+        "name": "set tmp variables for A1 Mediator REST API call",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$get-a1-policy-status-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "x": 1128.00146484375,
+        "y": 157.88912963867188,
+        "z": "82264c28.fa865",
+        "wires": []
+    },
+    {
+        "id": "95f961b6.beecd",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Status.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1005.0001220703125,
+        "y": 336,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "64616aa3.fae654",
+        "type": "execute",
+        "name": "Get Policy Instance Status",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1069.0006103515625,
+        "y": 464.0103759765625,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "c0ddbe62.cabd8",
+                "c22e34cd.633688"
+            ]
+        ]
+    },
+    {
+        "id": "c0ddbe62.cabd8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1293,
+        "y": 544.0001220703125,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "4c3581c9.8dd8c"
+            ]
+        ]
+    },
+    {
+        "id": "c22e34cd.633688",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1297.000244140625,
+        "y": 390.0000305175781,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "731c889.917be78"
+            ]
+        ]
+    },
+    {
+        "id": "81538b07.beae38",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "x": 1600.0006103515625,
+        "y": 599.0000610351562,
+        "z": "82264c28.fa865",
+        "wires": []
+    },
+    {
+        "id": "731c889.917be78",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1440.9998779296875,
+        "y": 390.00006103515625,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "ad128057.33ef5",
+                "622953f6.7f580c",
+                "3768e233.b0e54e"
+            ]
+        ]
+    },
+    {
+        "id": "ad128057.33ef5",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Status \"/>\n<parameter name=\"field2\" value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>\n<parameter name='field3' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='field4' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1602,
+        "y": 389,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d1a2e2f7.325b4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>\n",
+        "comments": "",
+        "x": 1573.75390625,
+        "y": 492.00390625,
+        "z": "82264c28.fa865",
+        "wires": []
+    },
+    {
+        "id": "7cb48c00.8ced04",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 688.75390625,
+        "y": 480.00390625,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "d4ec5ef4.1fe0c"
+            ]
+        ]
+    },
+    {
+        "id": "d4ec5ef4.1fe0c",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get Policy Status executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
+        "comments": "",
+        "x": 849.7539672851562,
+        "y": 480.00396728515625,
+        "z": "82264c28.fa865",
+        "wires": []
+    },
+    {
+        "id": "4c3581c9.8dd8c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1432.00390625,
+        "y": 544.0039367675781,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "d1a2e2f7.325b4",
+                "81538b07.beae38"
+            ]
+        ]
+    },
+    {
+        "id": "622953f6.7f580c",
+        "type": "execute",
+        "name": "set",
+        "xml": "<set>\n<parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1604,
+        "y": 440,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3768e233.b0e54e",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1606,
+        "y": 346,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "54b03a04.8e9294",
+        "type": "execute",
+        "name": "split near-rt-ric URL",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n    <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1984,
+        "y": 238,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "15d0daec.fa9565",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1950,
+        "y": 308,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "b8eadff3.5b547"
+            ]
+        ]
+    },
+    {
+        "id": "b8eadff3.5b547",
+        "type": "execute",
+        "name": "set concat url",
+        "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2128,
+        "y": 308,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "403fcfda.caf91",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1950,
+        "y": 371,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b78a829f.08531",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status: No proxy found on properties file \"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1781,
+        "y": 205,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a39978a8.b502b8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1773,
+        "y": 273,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "54b03a04.8e9294",
+                "15d0daec.fa9565",
+                "403fcfda.caf91",
+                "10e3a2b.3a8635d"
+            ]
+        ]
+    },
+    {
+        "id": "10e3a2b.3a8635d",
+        "type": "set",
+        "name": "set variables for A1 Mediator with proxy url",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
+        "comments": "",
+        "x": 2060,
+        "y": 432,
+        "z": "82264c28.fa865",
+        "wires": []
+    },
+    {
+        "id": "c2e7e2c1.1efa3",
+        "type": "outcome",
+        "name": "Otherwise",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1609,
+        "y": 273,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "a39978a8.b502b8"
+            ]
+        ]
+    },
+    {
+        "id": "351e35ee.b9fb4a",
+        "type": "outcome",
+        "name": "No proxy URL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1613,
+        "y": 205,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "b78a829f.08531"
+            ]
+        ]
+    },
+    {
+        "id": "b187a08d.4a91",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$tmp.proxy-url`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1434,
+        "y": 239,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "351e35ee.b9fb4a",
+                "c2e7e2c1.1efa3"
+            ]
+        ]
+    },
+    {
+        "id": "762e23e5.f9bb9c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1435,
+        "y": 156,
+        "z": "82264c28.fa865",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "eec4f452.eb64e8",
+        "type": "set",
+        "name": "set tmp url variables with proxy information",
+        "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
+        "comments": "",
+        "x": 1552,
+        "y": 81,
+        "z": "82264c28.fa865",
+        "wires": []
+    },
+    {
+        "id": "321db38.935fb4c",
+        "type": "block",
+        "name": "block Substitute proxy address if available",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1107,
+        "y": 246,
+        "z": "82264c28.fa865",
+        "wires": [
+            [
+                "eec4f452.eb64e8",
+                "762e23e5.f9bb9c",
+                "b187a08d.4a91"
+            ]
+        ]
+    }
 ]
 \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json
index e29dc2ad..144a1b7b 100644
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json
@@ -1,529 +1,529 @@
-[
-    {
-        "id": "c57a85a7.6d9e28",
-        "type": "service-logic",
-        "name": "A1-ADAPTER-API ${project.version}",
-        "module": "A1-ADAPTER-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 184,
-        "y": 217,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "7f8f754.1d44a8c"
-            ]
-        ]
-    },
-    {
-        "id": "7f8f754.1d44a8c",
-        "type": "method",
-        "name": "method getA1PolicyType",
-        "xml": "<method rpc='getA1PolicyType' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 247.00000762939453,
-        "y": 340.00000953674316,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "84af22f.906a3e"
-            ]
-        ]
-    },
-    {
-        "id": "ed70783e.27b828",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get Policy Type:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-type-input.near-rt-ric-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 712.0000267028809,
-        "y": 152.99999904632568,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "84af22f.906a3e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 450,
-        "y": 291,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "ed70783e.27b828",
-                "28381478.4110ac",
-                "37a94c09.766b94",
-                "87dae598.c09b78",
-                "5b5bbe8a.3a76a"
-            ]
-        ]
-    },
-    {
-        "id": "1bc64bfe.dda094",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 117,
-        "y": 153,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "c57a85a7.6d9e28"
-            ]
-        ]
-    },
-    {
-        "id": "28381478.4110ac",
-        "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getA1PolicyType executed successfully' />",
-        "comments": "",
-        "x": 749.0001068115234,
-        "y": 205.99999809265137,
-        "z": "6b10bb22.27b454",
-        "wires": []
-    },
-    {
-        "id": "37a94c09.766b94",
-        "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": 749,
-        "y": 259,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5b5bbe8a.3a76a",
-        "type": "block",
-        "name": "A1 Mediator RestAPI Invocation",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 773.0001525878906,
-        "y": 344.99999380111694,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "80c7ebd8.e99678",
-                "c14dac35.e1db6",
-                "410d2f2e.d71a4",
-                "d12e5095.54989"
-            ]
-        ]
-    },
-    {
-        "id": "80c7ebd8.e99678",
-        "type": "set",
-        "name": "set tmp variables for A1 Mediator REST API call",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$get-a1-policy-type-input.near-rt-ric-url`\"/>",
-        "comments": "",
-        "x": 1163.00146484375,
-        "y": 147.88912963867188,
-        "z": "6b10bb22.27b454",
-        "wires": []
-    },
-    {
-        "id": "c14dac35.e1db6",
-        "type": "execute",
-        "name": "Get Policy Types",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1059.0006103515625,
-        "y": 519.0103759765625,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "c5fcaf09.27937",
-                "855add04.525dc"
-            ]
-        ]
-    },
-    {
-        "id": "c5fcaf09.27937",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1240.0000610351562,
-        "y": 577.0001187324524,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "ddd5d6a3.da1298"
-            ]
-        ]
-    },
-    {
-        "id": "855add04.525dc",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1241.0002136230469,
-        "y": 473.000018119812,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "c1626bc6.876598"
-            ]
-        ]
-    },
-    {
-        "id": "a71cc3cf.ce06a",
-        "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": 1529.0006103515625,
-        "y": 611.0001220703125,
-        "z": "6b10bb22.27b454",
-        "wires": []
-    },
-    {
-        "id": "c1626bc6.876598",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1404.9998779296875,
-        "y": 447.00006103515625,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "471d2243.80555c",
-                "622289fe.925988",
-                "5eab9cfb.a9aba4"
-            ]
-        ]
-    },
-    {
-        "id": "471d2243.80555c",
-        "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=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1576.9999694824219,
-        "y": 450.9999780654907,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ce3d916.2cc397",
-        "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": 1511.75390625,
-        "y": 551.0039367675781,
-        "z": "6b10bb22.27b454",
-        "wires": []
-    },
-    {
-        "id": "87dae598.c09b78",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 696.7539367675781,
-        "y": 612.0039978027344,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "bd48102.d01bdf"
-            ]
-        ]
-    },
-    {
-        "id": "bd48102.d01bdf",
-        "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": 911.7540283203125,
-        "y": 612.0039367675781,
-        "z": "6b10bb22.27b454",
-        "wires": []
-    },
-    {
-        "id": "ddd5d6a3.da1298",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1368.0039367675781,
-        "y": 579.003918170929,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "a71cc3cf.ce06a",
-                "ce3d916.2cc397"
-            ]
-        ]
-    },
-    {
-        "id": "410d2f2e.d71a4",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Type.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1034.9998779296875,
-        "y": 455,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "622289fe.925988",
-        "type": "execute",
-        "name": "set",
-        "xml": "<set>\n<parameter name='responseBody' value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1578.0000915527344,
-        "y": 505.9999885559082,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5eab9cfb.a9aba4",
-        "type": "execute",
-        "name": "execute",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1579.9999694824219,
-        "y": 401.9999780654907,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3646f816.699f88",
-        "type": "execute",
-        "name": "split near-rt-ric URL",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n    <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2114,
-        "y": 245,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6556f21c.11ee1c",
-        "type": "for",
-        "name": "for",
-        "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
-        "comments": "",
-        "outputs": 1,
-        "x": 2080,
-        "y": 315,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "afa1cbf9.b42ef8"
-            ]
-        ]
-    },
-    {
-        "id": "afa1cbf9.b42ef8",
-        "type": "execute",
-        "name": "set concat url",
-        "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2258,
-        "y": 315,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1214c3b2.b5293c",
-        "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: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2080,
-        "y": 372,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ae139c27.9f81c",
-        "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: No proxy found on properties file \"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1884,
-        "y": 281,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a9cf882b.e74398",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1876,
-        "y": 349,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "3646f816.699f88",
-                "6556f21c.11ee1c",
-                "1214c3b2.b5293c",
-                "e7cb17c0.4634f8"
-            ]
-        ]
-    },
-    {
-        "id": "e7cb17c0.4634f8",
-        "type": "set",
-        "name": "set variables for A1 Mediator with proxy url",
-        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
-        "comments": "",
-        "x": 2190,
-        "y": 428,
-        "z": "6b10bb22.27b454",
-        "wires": []
-    },
-    {
-        "id": "96f3e7b2.57cad8",
-        "type": "outcome",
-        "name": "No proxy URL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1716,
-        "y": 281,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "ae139c27.9f81c"
-            ]
-        ]
-    },
-    {
-        "id": "d9949951.7f0e98",
-        "type": "outcome",
-        "name": "Otherwise",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1712,
-        "y": 349,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "a9cf882b.e74398"
-            ]
-        ]
-    },
-    {
-        "id": "bb63dde8.4da53",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$tmp.proxy-url`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1537,
-        "y": 315,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "96f3e7b2.57cad8",
-                "d9949951.7f0e98"
-            ]
-        ]
-    },
-    {
-        "id": "4600604a.a82ae",
-        "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: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1538,
-        "y": 232,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ddbc9e41.e0fde",
-        "type": "set",
-        "name": "set tmp url variables with proxy information",
-        "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
-        "comments": "",
-        "x": 1655,
-        "y": 157,
-        "z": "6b10bb22.27b454",
-        "wires": []
-    },
-    {
-        "id": "d12e5095.54989",
-        "type": "block",
-        "name": "block Substitute proxy address if available",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1142,
-        "y": 307,
-        "z": "6b10bb22.27b454",
-        "wires": [
-            [
-                "ddbc9e41.e0fde",
-                "4600604a.a82ae",
-                "bb63dde8.4da53"
-            ]
-        ]
-    }
+[
+    {
+        "id": "8c265fc3.6b9c2",
+        "type": "service-logic",
+        "name": "A1-ADAPTER-API ${project.version}",
+        "module": "A1-ADAPTER-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 150,
+        "y": 146.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "6e5c6f18.9dc93"
+            ]
+        ]
+    },
+    {
+        "id": "6e5c6f18.9dc93",
+        "type": "method",
+        "name": "method getA1PolicyType",
+        "xml": "<method rpc='getA1PolicyType' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 213.00000762939453,
+        "y": 269.1108798980713,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "de58383c.7e1718"
+            ]
+        ]
+    },
+    {
+        "id": "ae2a0098.f258c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get Policy Type:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-type-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 678.0000267028809,
+        "y": 82.11086940765381,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "de58383c.7e1718",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 416,
+        "y": 220.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "ae2a0098.f258c",
+                "53b03c05.963dc4",
+                "fa97dc4d.7c138",
+                "746426a9.66e6a8",
+                "da98d4e7.a42728"
+            ]
+        ]
+    },
+    {
+        "id": "8f9cdc00.4e19c8",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 83,
+        "y": 82.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "8c265fc3.6b9c2"
+            ]
+        ]
+    },
+    {
+        "id": "53b03c05.963dc4",
+        "type": "set",
+        "name": "set default status value",
+        "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getA1PolicyType executed successfully' />",
+        "comments": "",
+        "x": 715.0001068115234,
+        "y": 135.1108684539795,
+        "z": "6e7c5307.c398cc",
+        "wires": []
+    },
+    {
+        "id": "fa97dc4d.7c138",
+        "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": 715,
+        "y": 188.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "da98d4e7.a42728",
+        "type": "block",
+        "name": "A1 Mediator RestAPI Invocation",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 739.0001525878906,
+        "y": 274.11086416244507,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "9c119178.a1023",
+                "41a9420e.fea09c",
+                "26bb74a4.cb368c",
+                "8c9e0855.a2d458"
+            ]
+        ]
+    },
+    {
+        "id": "9c119178.a1023",
+        "type": "set",
+        "name": "set tmp variables for A1 Mediator REST API call",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$get-a1-policy-type-input.near-rt-ric-url`\"/>",
+        "comments": "",
+        "x": 1129.00146484375,
+        "y": 77,
+        "z": "6e7c5307.c398cc",
+        "wires": []
+    },
+    {
+        "id": "41a9420e.fea09c",
+        "type": "execute",
+        "name": "Get Policy Types",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"GET\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"convertResponse\" value=\"true\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1025.0006103515625,
+        "y": 448.1212463378906,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "e1975678.7e4028",
+                "5c4ab5f9.8d989c"
+            ]
+        ]
+    },
+    {
+        "id": "e1975678.7e4028",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1206.0000610351562,
+        "y": 506.1109890937805,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "1085e0df.71c62f"
+            ]
+        ]
+    },
+    {
+        "id": "5c4ab5f9.8d989c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1207.0002136230469,
+        "y": 402.11088848114014,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "1dcf580c.db4cb8"
+            ]
+        ]
+    },
+    {
+        "id": "44796ff4.052ba",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "x": 1495.0006103515625,
+        "y": 540.1109924316406,
+        "z": "6e7c5307.c398cc",
+        "wires": []
+    },
+    {
+        "id": "1dcf580c.db4cb8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1370.9998779296875,
+        "y": 376.1109313964844,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "93fea594.fd7eb8",
+                "bae47d21.8afde",
+                "e3f3a0ff.75db5"
+            ]
+        ]
+    },
+    {
+        "id": "93fea594.fd7eb8",
+        "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=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>\n<parameter name='field3' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='field4' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1542.9999694824219,
+        "y": 380.11084842681885,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b3f7367b.d92278",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>\n",
+        "comments": "",
+        "x": 1477.75390625,
+        "y": 480.11480712890625,
+        "z": "6e7c5307.c398cc",
+        "wires": []
+    },
+    {
+        "id": "746426a9.66e6a8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 662.7539367675781,
+        "y": 541.1148681640625,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "ba0df99.5bb8508"
+            ]
+        ]
+    },
+    {
+        "id": "ba0df99.5bb8508",
+        "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": 877.7540283203125,
+        "y": 541.1148071289062,
+        "z": "6e7c5307.c398cc",
+        "wires": []
+    },
+    {
+        "id": "1085e0df.71c62f",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1334.0039367675781,
+        "y": 508.1147885322571,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "44796ff4.052ba",
+                "b3f7367b.d92278"
+            ]
+        ]
+    },
+    {
+        "id": "26bb74a4.cb368c",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Type.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1000.9998779296875,
+        "y": 384.1108703613281,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bae47d21.8afde",
+        "type": "execute",
+        "name": "set",
+        "xml": "<set>\n<parameter name='responseBody' value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1544.0000915527344,
+        "y": 435.1108589172363,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e3f3a0ff.75db5",
+        "type": "execute",
+        "name": "execute",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n    <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n    <parameter name=\"target\" value=\"\\n\"/>\n    <parameter name=\"replacement\" value=\"\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1545.9999694824219,
+        "y": 331.11084842681885,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "649cc87b.b1d558",
+        "type": "execute",
+        "name": "split near-rt-ric URL",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n    <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 2080,
+        "y": 174.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ff7f26f0.209c88",
+        "type": "for",
+        "name": "for",
+        "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 2046,
+        "y": 244.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "9714621a.586e5"
+            ]
+        ]
+    },
+    {
+        "id": "9714621a.586e5",
+        "type": "execute",
+        "name": "set concat url",
+        "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2224,
+        "y": 244.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "40760e50.fa874",
+        "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: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2046,
+        "y": 301.1108703613281,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "25cac3e6.2bbd4c",
+        "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: No proxy found on properties file \"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1850,
+        "y": 210.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f41d0523.4fd778",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1842,
+        "y": 278.1108703613281,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "649cc87b.b1d558",
+                "ff7f26f0.209c88",
+                "40760e50.fa874",
+                "b59bb4c8.e299f8"
+            ]
+        ]
+    },
+    {
+        "id": "b59bb4c8.e299f8",
+        "type": "set",
+        "name": "set variables for A1 Mediator with proxy url",
+        "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
+        "comments": "",
+        "x": 2156,
+        "y": 357.1108703613281,
+        "z": "6e7c5307.c398cc",
+        "wires": []
+    },
+    {
+        "id": "7dffc679.74af28",
+        "type": "outcome",
+        "name": "No proxy URL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1682,
+        "y": 210.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "25cac3e6.2bbd4c"
+            ]
+        ]
+    },
+    {
+        "id": "900e04b1.441648",
+        "type": "outcome",
+        "name": "Otherwise",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1678,
+        "y": 278.1108703613281,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "f41d0523.4fd778"
+            ]
+        ]
+    },
+    {
+        "id": "9b05f4ee.4d7bf8",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test='`$tmp.proxy-url`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1503,
+        "y": 244.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "7dffc679.74af28",
+                "900e04b1.441648"
+            ]
+        ]
+    },
+    {
+        "id": "105ce637.9dcaaa",
+        "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: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1504,
+        "y": 161.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b655047a.625108",
+        "type": "set",
+        "name": "set tmp url variables with proxy information",
+        "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
+        "comments": "",
+        "x": 1621,
+        "y": 86.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": []
+    },
+    {
+        "id": "8c9e0855.a2d458",
+        "type": "block",
+        "name": "block Substitute proxy address if available",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1108,
+        "y": 236.11087036132812,
+        "z": "6e7c5307.c398cc",
+        "wires": [
+            [
+                "b655047a.625108",
+                "105ce637.9dcaaa",
+                "9b05f4ee.4d7bf8"
+            ]
+        ]
+    }
 ]
 \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json
index e7cdfdab..293d09c6 100644
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": "a6683616.46e428",
+        "id": "f0b343f7.2be9e",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,463 +8,475 @@
         "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": 209,
-        "y": 202,
-        "z": "7db096e2.c70bf8",
+        "x": 171,
+        "y": 158.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "55ac3f1d.94381"
+                "2678a73a.39c8f8"
             ]
         ]
     },
     {
-        "id": "55ac3f1d.94381",
+        "id": "2678a73a.39c8f8",
         "type": "method",
         "name": "method putA1Policy",
         "xml": "<method rpc='putA1Policy' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 196,
-        "y": 271,
-        "z": "7db096e2.c70bf8",
+        "x": 158,
+        "y": 227.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "dcec6661.43fb88"
+                "d272b5cc.a1b7f8"
             ]
         ]
     },
     {
-        "id": "b9d05c94.6e887",
+        "id": "12301d8a.e4f432",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Put A1 Policy :\"/>\n<parameter name=\"field2\" value=\"`$put-a1-policy-input.near-rt-ric-url`\"/>\n<parameter name=\"field3\" value=\"`$put-a1-policy-input.body`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 510,
-        "y": 239,
-        "z": "7db096e2.c70bf8",
+        "x": 472,
+        "y": 195.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             []
         ]
     },
     {
-        "id": "dcec6661.43fb88",
+        "id": "d272b5cc.a1b7f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 260,
-        "y": 338,
-        "z": "7db096e2.c70bf8",
+        "x": 222,
+        "y": 294.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "b9d05c94.6e887",
-                "5edc5dc0.aa7554",
-                "de4ae81.e69d418",
-                "c913644.23cbe98"
+                "12301d8a.e4f432",
+                "bc37eadd.393f78",
+                "f048e341.89262",
+                "71eb89dc.50c988"
             ]
         ]
     },
     {
-        "id": "6234cc0e.af53d4",
+        "id": "3f8d81.fa4c128",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 137,
-        "y": 140,
-        "z": "7db096e2.c70bf8",
+        "x": 99,
+        "y": 96.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "a6683616.46e428"
+                "f0b343f7.2be9e"
             ]
         ]
     },
     {
-        "id": "5edc5dc0.aa7554",
+        "id": "bc37eadd.393f78",
         "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": 544,
-        "y": 337,
-        "z": "7db096e2.c70bf8",
+        "x": 506,
+        "y": 293.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             []
         ]
     },
     {
-        "id": "cfebc3e6.36acd",
+        "id": "7ab1678d.f80c88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1026.0001220703125,
-        "y": 415.00006103515625,
-        "z": "7db096e2.c70bf8",
+        "x": 988.0001220703125,
+        "y": 371.1109619140625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "42f98b0.e003174"
+                "3fb495cc.83461a"
             ]
         ]
     },
     {
-        "id": "6387e9e5.fcf6e8",
+        "id": "95b564a6.d15fe8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1033.0003051757812,
-        "y": 505.0000457763672,
-        "z": "7db096e2.c70bf8",
+        "x": 995.0003051757812,
+        "y": 461.11094665527344,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "38ff960.c37ae6a"
+                "433e6f59.30f93"
             ]
         ]
     },
     {
-        "id": "38ff960.c37ae6a",
+        "id": "433e6f59.30f93",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1174.9999389648438,
-        "y": 501.00006103515625,
-        "z": "7db096e2.c70bf8",
+        "x": 1136.9999389648438,
+        "y": 457.1109619140625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "13a7ce3e.7474d2"
+                "7ae91a72.664794",
+                "913c45bf.182ef8"
             ]
         ]
     },
     {
-        "id": "6cc48a1a.2c90b4",
+        "id": "a42156e5.b04b38",
         "type": "set",
         "name": "set tmp variables for input RPC parms",
         "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$put-a1-policy-input.near-rt-ric-url`\"/>\n<parameter name=\"tmp.body\" value=\"`$put-a1-policy-input.body`\"/>",
         "comments": "",
-        "x": 928.0010375976562,
-        "y": 63.88909912109375,
-        "z": "7db096e2.c70bf8",
+        "x": 890.0010375976562,
+        "y": 20,
+        "z": "4a7b9942.c07f28",
         "wires": []
     },
     {
-        "id": "41cd845d.cbb3bc",
+        "id": "382bcbbf.30d774",
         "type": "execute",
         "name": "Put A1 Policy",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"PUT\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"requestBody\" value=\"`$tmp.body`\"/>\n<parameter name=\"convertResponse\" value=\"false\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 849.00048828125,
-        "y": 463.0103759765625,
-        "z": "7db096e2.c70bf8",
+        "x": 811.00048828125,
+        "y": 419.12127685546875,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "cfebc3e6.36acd",
-                "6387e9e5.fcf6e8"
+                "7ab1678d.f80c88",
+                "95b564a6.d15fe8"
             ]
         ]
     },
     {
-        "id": "c913644.23cbe98",
+        "id": "71eb89dc.50c988",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 580.0000305175781,
-        "y": 402.00006103515625,
-        "z": "7db096e2.c70bf8",
+        "x": 542.0000305175781,
+        "y": 358.1109619140625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "1f2f09a.5ad55f6",
-                "6cc48a1a.2c90b4",
-                "41cd845d.cbb3bc",
-                "378c77.9a4d338a"
+                "33f22af5.30a6a6",
+                "a42156e5.b04b38",
+                "382bcbbf.30d774",
+                "f58a390e.bb1448"
             ]
         ]
     },
     {
-        "id": "1f2f09a.5ad55f6",
+        "id": "33f22af5.30a6a6",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for Put A1 Policy.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.body`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 830.0000610351562,
-        "y": 417,
-        "z": "7db096e2.c70bf8",
+        "x": 792.0000610351562,
+        "y": 373.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             []
         ]
     },
     {
-        "id": "13a7ce3e.7474d2",
+        "id": "7ae91a72.664794",
         "type": "record",
         "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Policy Instance Created.\"/>",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Policy Instance Created.\"/>\n<parameter name='field2' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='field3' value='`$a1MediatorRsp.response-message`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1331,
-        "y": 500.00006103515625,
-        "z": "7db096e2.c70bf8",
+        "x": 1293,
+        "y": 456.1109619140625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e390699.7a2918",
+        "id": "2a1d66c6.e2c83a",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"response-code\" value=\"404\" />\n<parameter name=\"response-message\" value=\"Error creating A1 Policy. Aborting A1 Policy creation\" />",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
         "comments": "",
-        "x": 1324,
-        "y": 453,
-        "z": "7db096e2.c70bf8",
+        "x": 1286,
+        "y": 409.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": []
     },
     {
-        "id": "de4ae81.e69d418",
+        "id": "f048e341.89262",
         "type": "set",
         "name": "set default status value",
         "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Put A1 Policy executed successfully' />",
         "comments": "",
-        "x": 555,
-        "y": 292,
-        "z": "7db096e2.c70bf8",
+        "x": 517,
+        "y": 248.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": []
     },
     {
-        "id": "42f98b0.e003174",
+        "id": "3fb495cc.83461a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1162,
-        "y": 413,
-        "z": "7db096e2.c70bf8",
+        "x": 1124,
+        "y": 369.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "45242a9a.990c74",
-                "5e390699.7a2918"
+                "2b1ad7ca.a27288",
+                "2a1d66c6.e2c83a"
             ]
         ]
     },
     {
-        "id": "45242a9a.990c74",
+        "id": "2b1ad7ca.a27288",
         "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",
+        "xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>\n",
         "comments": "",
-        "x": 1306,
-        "y": 359,
-        "z": "7db096e2.c70bf8",
+        "x": 1268,
+        "y": 315.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": []
     },
     {
-        "id": "6a96fe57.d042e",
+        "id": "4e18beb6.1fd51",
         "type": "execute",
         "name": "split near-rt-ric URL",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n    <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1878,
-        "y": 180,
-        "z": "7db096e2.c70bf8",
+        "x": 1840,
+        "y": 136.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             []
         ]
     },
     {
-        "id": "bba56b28.73aad8",
+        "id": "942f87e2.c78888",
         "type": "for",
         "name": "for",
         "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1844,
-        "y": 250,
-        "z": "7db096e2.c70bf8",
+        "x": 1806,
+        "y": 206.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "efb1667d.1585f8"
+                "d1411417.1b3fd8"
             ]
         ]
     },
     {
-        "id": "efb1667d.1585f8",
+        "id": "d1411417.1b3fd8",
         "type": "execute",
         "name": "set concat url",
         "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2022,
-        "y": 250,
-        "z": "7db096e2.c70bf8",
+        "x": 1984,
+        "y": 206.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             []
         ]
     },
     {
-        "id": "d31b610e.4b717",
+        "id": "71b2d26a.47135c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Put A1 Policy: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1844,
-        "y": 307,
-        "z": "7db096e2.c70bf8",
+        "x": 1806,
+        "y": 263.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             []
         ]
     },
     {
-        "id": "10f86c59.93f224",
+        "id": "65d0298a.e1aef8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Put A1 Policy: No proxy found on properties file \"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648,
-        "y": 216,
-        "z": "7db096e2.c70bf8",
+        "x": 1610,
+        "y": 172.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             []
         ]
     },
     {
-        "id": "a1eabac4.71c208",
+        "id": "500c1a89.8dca64",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1640,
-        "y": 284,
-        "z": "7db096e2.c70bf8",
+        "x": 1602,
+        "y": 240.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "6a96fe57.d042e",
-                "bba56b28.73aad8",
-                "d31b610e.4b717",
-                "2462752b.bd93aa"
+                "4e18beb6.1fd51",
+                "942f87e2.c78888",
+                "71b2d26a.47135c",
+                "1970005a.3ee34"
             ]
         ]
     },
     {
-        "id": "2462752b.bd93aa",
+        "id": "1970005a.3ee34",
         "type": "set",
         "name": "set variables for A1 Mediator with proxy url",
         "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
         "comments": "",
-        "x": 1954,
-        "y": 363,
-        "z": "7db096e2.c70bf8",
+        "x": 1916,
+        "y": 319.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": []
     },
     {
-        "id": "8b5f261e.23f748",
+        "id": "31a126f2.88900a",
         "type": "outcome",
         "name": "No proxy URL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1480,
-        "y": 216,
-        "z": "7db096e2.c70bf8",
+        "x": 1442,
+        "y": 172.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "10f86c59.93f224"
+                "65d0298a.e1aef8"
             ]
         ]
     },
     {
-        "id": "fcbbd2a7.10f08",
+        "id": "3f7e5430.1f4f6c",
         "type": "outcome",
         "name": "Otherwise",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1476,
-        "y": 284,
-        "z": "7db096e2.c70bf8",
+        "x": 1438,
+        "y": 240.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "a1eabac4.71c208"
+                "500c1a89.8dca64"
             ]
         ]
     },
     {
-        "id": "921d95cc.6097d8",
+        "id": "7ec42ee0.b7f28",
         "type": "set",
         "name": "set tmp url variables with proxy information",
         "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
         "comments": "",
-        "x": 1419,
-        "y": 92,
-        "z": "7db096e2.c70bf8",
+        "x": 1381,
+        "y": 48.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": []
     },
     {
-        "id": "1fb088e3.0e4167",
+        "id": "c930a111.4cc59",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Put A1 Policy: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1302,
-        "y": 167,
-        "z": "7db096e2.c70bf8",
+        "x": 1264,
+        "y": 123.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             []
         ]
     },
     {
-        "id": "cea9d686.3a7118",
+        "id": "bbe2ee18.70915",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$tmp.proxy-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1301,
-        "y": 250,
-        "z": "7db096e2.c70bf8",
+        "x": 1263,
+        "y": 206.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "8b5f261e.23f748",
-                "fcbbd2a7.10f08"
+                "31a126f2.88900a",
+                "3f7e5430.1f4f6c"
             ]
         ]
     },
     {
-        "id": "378c77.9a4d338a",
+        "id": "f58a390e.bb1448",
         "type": "block",
         "name": "block Substitute proxy address if available",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 964,
-        "y": 249,
-        "z": "7db096e2.c70bf8",
+        "x": 926,
+        "y": 205.11090087890625,
+        "z": "4a7b9942.c07f28",
         "wires": [
             [
-                "921d95cc.6097d8",
-                "1fb088e3.0e4167",
-                "cea9d686.3a7118"
+                "7ec42ee0.b7f28",
+                "c930a111.4cc59",
+                "bbe2ee18.70915"
             ]
         ]
+    },
+    {
+        "id": "913c45bf.182ef8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
+        "comments": "",
+        "x": 1308,
+        "y": 514,
+        "z": "4a7b9942.c07f28",
+        "wires": []
     }
 ]
 \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml
index 3f264e57..2c1e67f6 100644
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml
@@ -1,121 +1,125 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='deleteA1Policy' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Delete A1 Policy:"/>
-                <parameter name="field2" value="`$delete-a1-policy-input.near-rt-ric-url`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='deletePolicy executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <block atomic='true'>
-                <set>
-                    <parameter name="tmp.near-rt-ric-url" value="`$delete-a1-policy-input.near-rt-ric-url`"/>
-                </set>
-                <block>
-                    <set>
-                        <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Delete A1 Policy: Check for proxy url: "/>
-                        <parameter name="field2" value="`$tmp.proxy-url`"/>
-                    </record>
-                    <switch test='`$tmp.proxy-url`'>
-                        <outcome value=''>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Delete A1 Policy: No proxy found on properties file "/>
-                            </record>
-                        </outcome>
-                        <outcome value='Other'>
-                            <block>
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                    <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
-                                    <parameter name="regex" value="/"/>
-                                    <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
-                                </execute>
-                                <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
-                                    <set>
-                                        <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
-                                    </set>
-                                </for>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="Delete A1 Policy: Url with proxy: "/>
-                                    <parameter name="field2" value="`$tmp.proxy-url`"/>
-                                </record>
-                                <set>
-                                    <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
-                                </set>
-                            </block>
-                        </outcome>
-                    </switch>
-                </block>
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                    <parameter name="level" value="info" />
-                    <parameter name="field1" value="Setting variables for A1 Adapter Delete Policy Instance."/>
-                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
-                </record>
-                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
-                    <parameter name="format" value="json"/>
-                    <parameter name="httpMethod" value="DELETE"/>
-                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                    <parameter name='contentType' value='application/json' />
-                    <parameter name='accept' value='application/json' />
-                    <parameter name="convertResponse" value="false"/>
-                    <outcome value='success'>
-                        <block>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="A1 Delete Policy Information "/>
-                                <parameter name="field2" value="`$a1MediatorRsp.httpResponse`"/>
-                            </record>
-                            <set>
-                                <parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>
-                            </set>
-                        </block>
-                    </outcome>
-                    <outcome value='failure'>
-                        <block>
-                            <set>
-                                <parameter name='response-code' value='500'/>
-                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                            </set>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="response-code" value="404" />
-                                <parameter name="response-message" value="Error in Deleting A1 Policy Instance. Aborting" />
-                            </return>
-                        </block>
-                    </outcome>
-                </execute>
-            </block>
-            <block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='deletePolicyInstance executed successfully'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>
+    <method rpc='deleteA1Policy' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Delete A1 Policy:"/>
+                <parameter name="field2" value="`$delete-a1-policy-input.near-rt-ric-url`"/>
+            </record>
+            <set>
+                <parameter name='response-code' value='200' />
+                <parameter name='response-message' value='deletePolicy executed successfully' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <block atomic='true'>
+                <set>
+                    <parameter name="tmp.near-rt-ric-url" value="`$delete-a1-policy-input.near-rt-ric-url`"/>
+                </set>
+                <block>
+                    <set>
+                        <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
+                    </set>
+                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                        <parameter name="level" value="info" />
+                        <parameter name="field1" value="Delete A1 Policy: Check for proxy url: "/>
+                        <parameter name="field2" value="`$tmp.proxy-url`"/>
+                    </record>
+                    <switch test='`$tmp.proxy-url`'>
+                        <outcome value=''>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Delete A1 Policy: No proxy found on properties file "/>
+                            </record>
+                        </outcome>
+                        <outcome value='Other'>
+                            <block>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                    <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
+                                    <parameter name="regex" value="/"/>
+                                    <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
+                                </execute>
+                                <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
+                                    <set>
+                                        <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
+                                    </set>
+                                </for>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="Delete A1 Policy: Url with proxy: "/>
+                                    <parameter name="field2" value="`$tmp.proxy-url`"/>
+                                </record>
+                                <set>
+                                    <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Setting variables for A1 Adapter Delete Policy Instance."/>
+                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
+                    <parameter name="format" value="json"/>
+                    <parameter name="httpMethod" value="DELETE"/>
+                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="convertResponse" value="false"/>
+                    <outcome value='success'>
+                        <block>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="A1 Delete Policy Information "/>
+                                <parameter name="field2" value="`$a1MediatorRsp.httpResponse`"/>
+                                <parameter name='field3' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='field4' value='`$a1MediatorRsp.response-message`'/>
+                            </record>
+                            <set>
+                                <parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </set>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
+            <block>
+                <return status='success'>
+                    <parameter name="ack-final-indicator" value="Y" />
+                    <parameter name="error-code" value="200" />
+                    <parameter name="error-message" value="`$error-message`" />
+                    <parameter name='response-code' value='200' />
+                    <parameter name='response-message' value='deletePolicyInstance executed successfully'/>
+                    <parameter name='ack-final' value='Y'/>
+                </return>
+            </block>
+        </block>
+    </method>
 </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1Policy.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1Policy.xml
index 2cedc9ca..e7d18878 100644
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1Policy.xml
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1Policy.xml
@@ -1,127 +1,131 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='getA1Policy' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Get A1 Policy:"/>
-                <parameter name="field2" value="`$get-a1-policy-input.near-rt-ric-url`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='Get A1 Policy executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <block atomic='true'>
-                <set>
-                    <parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-input.near-rt-ric-url`"/>
-                </set>
-                <block>
-                    <set>
-                        <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="A1 Get Policy Information: Check for proxy url: "/>
-                        <parameter name="field2" value="`$tmp.proxy-url`"/>
-                    </record>
-                    <switch test='`$tmp.proxy-url`'>
-                        <outcome value=''>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="A1 Get Policy Information: No proxy found on properties file "/>
-                            </record>
-                        </outcome>
-                        <outcome value='Other'>
-                            <block>
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                    <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
-                                    <parameter name="regex" value="/"/>
-                                    <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
-                                </execute>
-                                <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
-                                    <set>
-                                        <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
-                                    </set>
-                                </for>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="A1 Get Policy Information: Url with proxy: "/>
-                                    <parameter name="field2" value="`$tmp.proxy-url`"/>
-                                </record>
-                                <set>
-                                    <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
-                                </set>
-                            </block>
-                        </outcome>
-                    </switch>
-                </block>
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                    <parameter name="level" value="info" />
-                    <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Instance."/>
-                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
-                </record>
-                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
-                    <parameter name="format" value="json"/>
-                    <parameter name="httpMethod" value="GET"/>
-                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                    <parameter name='contentType' value='application/json' />
-                    <parameter name='accept' value='application/json' />
-                    <parameter name="convertResponse" value="false"/>
-                    <outcome value='success'>
-                        <block>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
-                                <parameter name="source" value="`$a1MediatorRsp.httpResponse`"/>
-                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.httpResponse"/>
-                                <parameter name="target" value="\n"/>
-                                <parameter name="replacement" value=""/>
-                            </execute>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="A1 Get Policy Information "/>
-                                <parameter name="field2" value="`$tmp.a1-mediator-restapi.httpResponse`"/>
-                            </record>
-                            <set>
-                                <parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>
-                            </set>
-                        </block>
-                    </outcome>
-                    <outcome value='failure'>
-                        <block>
-                            <set>
-                                <parameter name='response-code' value='500'/>
-                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                            </set>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="response-code" value="500" />
-                                <parameter name="response-message" value="Error in Getting A1 Policy Instance. Aborting" />
-                            </return>
-                        </block>
-                    </outcome>
-                </execute>
-            </block>
-            <block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='Get PolicyInstance executed successfully'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>
+    <method rpc='getA1Policy' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Get A1 Policy:"/>
+                <parameter name="field2" value="`$get-a1-policy-input.near-rt-ric-url`"/>
+            </record>
+            <set>
+                <parameter name='response-code' value='200' />
+                <parameter name='response-message' value='Get A1 Policy executed successfully' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <block atomic='true'>
+                <set>
+                    <parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-input.near-rt-ric-url`"/>
+                </set>
+                <block>
+                    <set>
+                        <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
+                    </set>
+                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                        <parameter name="level" value="info" />
+                        <parameter name="field1" value="A1 Get Policy Information: Check for proxy url: "/>
+                        <parameter name="field2" value="`$tmp.proxy-url`"/>
+                    </record>
+                    <switch test='`$tmp.proxy-url`'>
+                        <outcome value=''>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="A1 Get Policy Information: No proxy found on properties file "/>
+                            </record>
+                        </outcome>
+                        <outcome value='Other'>
+                            <block>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                    <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
+                                    <parameter name="regex" value="/"/>
+                                    <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
+                                </execute>
+                                <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
+                                    <set>
+                                        <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
+                                    </set>
+                                </for>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="A1 Get Policy Information: Url with proxy: "/>
+                                    <parameter name="field2" value="`$tmp.proxy-url`"/>
+                                </record>
+                                <set>
+                                    <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Instance."/>
+                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
+                    <parameter name="format" value="json"/>
+                    <parameter name="httpMethod" value="GET"/>
+                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="convertResponse" value="false"/>
+                    <outcome value='success'>
+                        <block>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
+                                <parameter name="source" value="`$a1MediatorRsp.httpResponse`"/>
+                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.httpResponse"/>
+                                <parameter name="target" value="\n"/>
+                                <parameter name="replacement" value=""/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="A1 Get Policy Information "/>
+                                <parameter name="field2" value="`$tmp.a1-mediator-restapi.httpResponse`"/>
+                                <parameter name='field3' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='field4' value='`$a1MediatorRsp.response-message`'/>
+                            </record>
+                            <set>
+                                <parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </set>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
+            <block>
+                <return status='success'>
+                    <parameter name="ack-final-indicator" value="Y" />
+                    <parameter name="error-code" value="200" />
+                    <parameter name="error-message" value="`$error-message`" />
+                    <parameter name='response-code' value='200' />
+                    <parameter name='response-message' value='Get PolicyInstance executed successfully'/>
+                    <parameter name='ack-final' value='Y'/>
+                </return>
+            </block>
+        </block>
+    </method>
 </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml
index 5750c528..fb68b0aa 100644
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml
@@ -1,127 +1,131 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='getA1PolicyStatus' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Get A1 Policy Status:"/>
-                <parameter name="field2" value="`$get-a1-policy-status-input.near-rt-ric-url`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='Get A1 Policy executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <block atomic='true'>
-                <set>
-                    <parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-status-input.near-rt-ric-url`"/>
-                </set>
-                <block>
-                    <set>
-                        <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Get A1 Policy Status: Check for proxy url: "/>
-                        <parameter name="field2" value="`$tmp.proxy-url`"/>
-                    </record>
-                    <switch test='`$tmp.proxy-url`'>
-                        <outcome value=''>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Get A1 Policy Status: No proxy found on properties file "/>
-                            </record>
-                        </outcome>
-                        <outcome value='Other'>
-                            <block>
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                    <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
-                                    <parameter name="regex" value="/"/>
-                                    <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
-                                </execute>
-                                <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
-                                    <set>
-                                        <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
-                                    </set>
-                                </for>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="Get A1 Policy Status: Url with proxy: "/>
-                                    <parameter name="field2" value="`$tmp.proxy-url`"/>
-                                </record>
-                                <set>
-                                    <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
-                                </set>
-                            </block>
-                        </outcome>
-                    </switch>
-                </block>
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                    <parameter name="level" value="info" />
-                    <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Status."/>
-                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
-                </record>
-                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
-                    <parameter name="format" value="json"/>
-                    <parameter name="httpMethod" value="GET"/>
-                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                    <parameter name='contentType' value='application/json' />
-                    <parameter name='accept' value='application/json' />
-                    <parameter name="convertResponse" value="true"/>
-                    <outcome value='success'>
-                        <block>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
-                                <parameter name="source" value="`$a1MediatorRsp.httpResponse`"/>
-                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.httpResponse"/>
-                                <parameter name="target" value="\n"/>
-                                <parameter name="replacement" value=""/>
-                            </execute>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="A1 Get Policy Status "/>
-                                <parameter name="field2" value="`$tmp.a1-mediator-restapi.httpResponse`"/>
-                            </record>
-                            <set>
-                                <parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>
-                            </set>
-                        </block>
-                    </outcome>
-                    <outcome value='failure'>
-                        <block>
-                            <set>
-                                <parameter name='response-code' value='500'/>
-                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                            </set>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="response-code" value="404" />
-                                <parameter name="response-message" value="Error in Getting A1 Policy Status. Aborting" />
-                            </return>
-                        </block>
-                    </outcome>
-                </execute>
-            </block>
-            <block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='Get Policy Status executed successfully'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>
+    <method rpc='getA1PolicyStatus' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Get A1 Policy Status:"/>
+                <parameter name="field2" value="`$get-a1-policy-status-input.near-rt-ric-url`"/>
+            </record>
+            <set>
+                <parameter name='response-code' value='200' />
+                <parameter name='response-message' value='Get A1 Policy executed successfully' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <block atomic='true'>
+                <set>
+                    <parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-status-input.near-rt-ric-url`"/>
+                </set>
+                <block>
+                    <set>
+                        <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
+                    </set>
+                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                        <parameter name="level" value="info" />
+                        <parameter name="field1" value="Get A1 Policy Status: Check for proxy url: "/>
+                        <parameter name="field2" value="`$tmp.proxy-url`"/>
+                    </record>
+                    <switch test='`$tmp.proxy-url`'>
+                        <outcome value=''>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Get A1 Policy Status: No proxy found on properties file "/>
+                            </record>
+                        </outcome>
+                        <outcome value='Other'>
+                            <block>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                    <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
+                                    <parameter name="regex" value="/"/>
+                                    <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
+                                </execute>
+                                <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
+                                    <set>
+                                        <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
+                                    </set>
+                                </for>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="Get A1 Policy Status: Url with proxy: "/>
+                                    <parameter name="field2" value="`$tmp.proxy-url`"/>
+                                </record>
+                                <set>
+                                    <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Status."/>
+                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
+                    <parameter name="format" value="json"/>
+                    <parameter name="httpMethod" value="GET"/>
+                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="convertResponse" value="true"/>
+                    <outcome value='success'>
+                        <block>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
+                                <parameter name="source" value="`$a1MediatorRsp.httpResponse`"/>
+                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.httpResponse"/>
+                                <parameter name="target" value="\n"/>
+                                <parameter name="replacement" value=""/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="A1 Get Policy Status "/>
+                                <parameter name="field2" value="`$tmp.a1-mediator-restapi.httpResponse`"/>
+                                <parameter name='field3' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='field4' value='`$a1MediatorRsp.response-message`'/>
+                            </record>
+                            <set>
+                                <parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </set>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
+            <block>
+                <return status='success'>
+                    <parameter name="ack-final-indicator" value="Y" />
+                    <parameter name="error-code" value="200" />
+                    <parameter name="error-message" value="`$error-message`" />
+                    <parameter name='response-code' value='200' />
+                    <parameter name='response-message' value='Get Policy Status executed successfully'/>
+                    <parameter name='ack-final' value='Y'/>
+                </return>
+            </block>
+        </block>
+    </method>
 </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyType.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyType.xml
index 41091e0a..70d1aa21 100644
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyType.xml
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyType.xml
@@ -1,128 +1,132 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='getA1PolicyType' mode='sync'>
-        <block atomic='true'>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                <parameter name="level" value="info" />
-                <parameter name="field1" value="Get Policy Type:"/>
-                <parameter name="field2" value="`$get-a1-policy-type-input.near-rt-ric-url`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='getA1PolicyType executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <block atomic='true'>
-                <set>
-                    <parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-type-input.near-rt-ric-url`"/>
-                </set>
-                <block>
-                    <set>
-                        <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Get Policy Type: Check for proxy url: "/>
-                        <parameter name="field2" value="`$tmp.proxy-url`"/>
-                    </record>
-                    <switch test='`$tmp.proxy-url`'>
-                        <outcome value=''>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Get Policy Type: No proxy found on properties file "/>
-                            </record>
-                        </outcome>
-                        <outcome value='Other'>
-                            <block>
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                    <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
-                                    <parameter name="regex" value="/"/>
-                                    <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
-                                </execute>
-                                <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
-                                    <set>
-                                        <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
-                                    </set>
-                                </for>
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                    <parameter name="level" value="info" />
-                                    <parameter name="field1" value="Get Policy Type: Url with proxy: "/>
-                                    <parameter name="field2" value="`$tmp.proxy-url`"/>
-                                </record>
-                                <set>
-                                    <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
-                                </set>
-                            </block>
-                        </outcome>
-                    </switch>
-                </block>
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                    <parameter name="level" value="info" />
-                    <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Type."/>
-                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
-                </record>
-                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
-                    <parameter name="format" value="json"/>
-                    <parameter name="httpMethod" value="GET"/>
-                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                    <parameter name='contentType' value='application/json' />
-                    <parameter name='accept' value='application/json' />
-                    <parameter name="convertResponse" value="true"/>
-                    <outcome value='success'>
-                        <block>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
-                                <parameter name="source" value="`$a1MediatorRsp.httpResponse`"/>
-                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.httpResponse"/>
-                                <parameter name="target" value="\n"/>
-                                <parameter name="replacement" value=""/>
-                            </execute>
-                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="A1 Policy Type Information "/>
-                                <parameter name="field2" value="`$tmp.a1-mediator-restapi.httpResponse`"/>
-                            </record>
-                            <set>
-                                <parameter name='responseBody' value="`$tmp.a1-mediator-restapi.httpResponse`"/>
-                            </set>
-                        </block>
-                    </outcome>
-                    <outcome value='failure'>
-                        <block>
-                            <set>
-                                <parameter name='response-code' value='500'/>
-                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                            </set>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="response-code" value="404" />
-                                <parameter name="response-message" value="Error in Getting A1 Policy Type. Aborting" />
-                            </return>
-                        </block>
-                    </outcome>
-                </execute>
-            </block>
-            <block>
-                <return status='success'>
-                    <parameter name="ack-final-indicator" value="Y" />
-                    <parameter name="error-code" value="200" />
-                    <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='A1 Adapter is healthy'/>
-                    <parameter name='health-status' value='200'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>
+    <method rpc='getA1PolicyType' mode='sync'>
+        <block atomic='true'>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="Get Policy Type:"/>
+                <parameter name="field2" value="`$get-a1-policy-type-input.near-rt-ric-url`"/>
+            </record>
+            <set>
+                <parameter name='response-code' value='200' />
+                <parameter name='response-message' value='getA1PolicyType executed successfully' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <block atomic='true'>
+                <set>
+                    <parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-type-input.near-rt-ric-url`"/>
+                </set>
+                <block>
+                    <set>
+                        <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
+                    </set>
+                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                        <parameter name="level" value="info" />
+                        <parameter name="field1" value="Get Policy Type: Check for proxy url: "/>
+                        <parameter name="field2" value="`$tmp.proxy-url`"/>
+                    </record>
+                    <switch test='`$tmp.proxy-url`'>
+                        <outcome value=''>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Get Policy Type: No proxy found on properties file "/>
+                            </record>
+                        </outcome>
+                        <outcome value='Other'>
+                            <block>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                    <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
+                                    <parameter name="regex" value="/"/>
+                                    <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
+                                </execute>
+                                <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
+                                    <set>
+                                        <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
+                                    </set>
+                                </for>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="Get Policy Type: Url with proxy: "/>
+                                    <parameter name="field2" value="`$tmp.proxy-url`"/>
+                                </record>
+                                <set>
+                                    <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Setting variables for A1 Adapter Get Policy Type."/>
+                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
+                    <parameter name="format" value="json"/>
+                    <parameter name="httpMethod" value="GET"/>
+                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="convertResponse" value="true"/>
+                    <outcome value='success'>
+                        <block>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
+                                <parameter name="source" value="`$a1MediatorRsp.httpResponse`"/>
+                                <parameter name="outputPath" value="tmp.a1-mediator-restapi.httpResponse"/>
+                                <parameter name="target" value="\n"/>
+                                <parameter name="replacement" value=""/>
+                            </execute>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="A1 Policy Type Information "/>
+                                <parameter name="field2" value="`$tmp.a1-mediator-restapi.httpResponse`"/>
+                                <parameter name='field3' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='field4' value='`$a1MediatorRsp.response-message`'/>
+                            </record>
+                            <set>
+                                <parameter name='responseBody' value="`$tmp.a1-mediator-restapi.httpResponse`"/>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </set>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
+            <block>
+                <return status='success'>
+                    <parameter name="ack-final-indicator" value="Y" />
+                    <parameter name="error-code" value="200" />
+                    <parameter name="error-message" value="`$error-message`" />
+                    <parameter name='response-code' value='200' />
+                    <parameter name='response-message' value='A1 Adapter is healthy'/>
+                    <parameter name='health-status' value='200'/>
+                    <parameter name='ack-final' value='Y'/>
+                </return>
+            </block>
+        </block>
+    </method>
 </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml
index 2f6abb89..a9afa852 100644
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml
@@ -85,13 +85,13 @@
                     <outcome value='failure'>
                         <block>
                             <set>
-                                <parameter name='response-code' value='500'/>
-                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
                             </set>
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
-                                <parameter name="response-code" value="404" />
-                                <parameter name="response-message" value="Error creating A1 Policy. Aborting A1 Policy creation" />
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
                             </return>
                         </block>
                     </outcome>
@@ -101,7 +101,13 @@
                                 <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
                                 <parameter name="level" value="info" />
                                 <parameter name="field1" value="A1 Policy Instance Created."/>
+                                <parameter name='field2' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='field3' value='`$a1MediatorRsp.response-message`'/>
                             </record>
+                            <set>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </set>
                         </block>
                     </outcome>
                 </execute>
author	Lathish <lathishbabu.ganesan@est.tech>	2021-09-06 16:10:50 +0100
committer	Lathish <lathishbabu.ganesan@est.tech>	2021-09-07 15:07:20 +0100
commit	f906377369016ed5d82dd1f458b4b8cdcc2778b7 (patch)
tree	6a32d40a7a98b179d2ecf69d30d1fd5ea2a1a465 /platform-logic
parent	d39df59d0b50a60922ca790699cecc93258ed519 (diff)