From: ychacon <yennifer.chacon@est.tech>
Date: Thu, 7 Oct 2021 06:47:21 +0000 (+0200)
Subject: Bug fix - Update http response code
X-Git-Tag: 1.3.1~26^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=49f5f04a369961a3e72cc5ba2167131caed42073

Bug fix - Update http response code

Issue-ID: CCSDK-3475

Signed-off-by: ychacon <yennifer.chacon@est.tech>
Change-Id: Ib591c350462fedb2076a18999c6ccf3541323e15
---

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 9335cac5..a330de56 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,6 +1,6 @@
 [
     {
-        "id": "e4c21709.3d35e8",
+        "id": "3126f726.6d8788",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,404 +8,404 @@
         "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": 187,
-        "y": 256.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 175,
+        "y": 189,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "7351113d.4dc8d"
+                "7cd4c332.cf493c"
             ]
         ]
     },
     {
-        "id": "7351113d.4dc8d",
+        "id": "7cd4c332.cf493c",
         "type": "method",
         "name": "method deleteA1Policy",
         "xml": "<method rpc='deleteA1Policy' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 247,
-        "y": 376.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 235,
+        "y": 309,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "a6106995.99c388"
+                "5e01b875.0fce28"
             ]
         ]
     },
     {
-        "id": "1fdea711.7bf739",
+        "id": "18e3aeab.0a9501",
         "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": 711,
-        "y": 190.11087036132812,
-        "z": "9f3fc64.f80e438",
+        "x": 699,
+        "y": 123,
+        "z": "d4d449e4.1dc098",
         "wires": [
             []
         ]
     },
     {
-        "id": "a6106995.99c388",
+        "id": "5e01b875.0fce28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 452,
-        "y": 330.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 440,
+        "y": 263,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "1fdea711.7bf739",
-                "df6f8931.8d6ba8",
-                "bf53837.9af008",
-                "779d5e07.992c3",
-                "ab7a89c3.e79ca8"
+                "18e3aeab.0a9501",
+                "f9be199e.774418",
+                "82330e2b.a13e8",
+                "ac25eb63.51eb88",
+                "e4e4f4d1.2a1618"
             ]
         ]
     },
     {
-        "id": "eca34eaa.ef167",
+        "id": "d2627729.2e22a8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 119,
-        "y": 192.11087036132812,
-        "z": "9f3fc64.f80e438",
+        "x": 107,
+        "y": 125,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "e4c21709.3d35e8"
+                "3126f726.6d8788"
             ]
         ]
     },
     {
-        "id": "ab7a89c3.e79ca8",
+        "id": "e4e4f4d1.2a1618",
         "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' />",
+        "xml": "<set>\n<parameter name='tmp-response-code' value='200' />\n<parameter name='response-message' value='deletePolicy executed successfully' />",
         "comments": "",
-        "x": 752.0000610351562,
-        "y": 245.11087036132812,
-        "z": "9f3fc64.f80e438",
+        "x": 740.0000610351562,
+        "y": 178,
+        "z": "d4d449e4.1dc098",
         "wires": []
     },
     {
-        "id": "df6f8931.8d6ba8",
+        "id": "f9be199e.774418",
         "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": 751,
-        "y": 298.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 739,
+        "y": 231,
+        "z": "d4d449e4.1dc098",
         "wires": [
             []
         ]
     },
     {
-        "id": "779d5e07.992c3",
+        "id": "ac25eb63.51eb88",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 781.0001220703125,
-        "y": 382.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 769.0001220703125,
+        "y": 315,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "a2a8e78a.0a5698",
-                "11e3f573.11084b",
-                "d83ec9ce.0707c8",
-                "7a6201b8.1f6e"
+                "1d9c2187.60039e",
+                "72876a4e.c6dd34",
+                "dc179566.3dbaa8",
+                "721cb7bd.4c7378"
             ]
         ]
     },
     {
-        "id": "11e3f573.11084b",
+        "id": "72876a4e.c6dd34",
         "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`\"/>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
         "comments": "",
-        "x": 1156.00146484375,
-        "y": 265,
-        "z": "9f3fc64.f80e438",
+        "x": 1144.00146484375,
+        "y": 197.88912963867188,
+        "z": "d4d449e4.1dc098",
         "wires": []
     },
     {
-        "id": "a2a8e78a.0a5698",
+        "id": "1d9c2187.60039e",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Delete Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1032.0001220703125,
-        "y": 432.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 1020.0001220703125,
+        "y": 365,
+        "z": "d4d449e4.1dc098",
         "wires": [
             []
         ]
     },
     {
-        "id": "d83ec9ce.0707c8",
+        "id": "dc179566.3dbaa8",
         "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\"/>\n<parameter name=\"proxyUrl\" value=\"`$tmp.proxy-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1089.0006103515625,
-        "y": 555.1212768554688,
-        "z": "9f3fc64.f80e438",
+        "x": 1077.0006103515625,
+        "y": 488.0104064941406,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "7aaf8bd7.b90fd4",
-                "5d03cdff.c8b994"
+                "ae2f84df.9a7208",
+                "55d2c250.8002bc"
             ]
         ]
     },
     {
-        "id": "7aaf8bd7.b90fd4",
+        "id": "ae2f84df.9a7208",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1318,
-        "y": 644.1109924316406,
-        "z": "9f3fc64.f80e438",
+        "x": 1306,
+        "y": 577.0001220703125,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "699e69ac.ce1b08"
+                "7877c8e8.14d078"
             ]
         ]
     },
     {
-        "id": "5d03cdff.c8b994",
+        "id": "55d2c250.8002bc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1308.000244140625,
-        "y": 489.11090087890625,
-        "z": "9f3fc64.f80e438",
+        "x": 1296.000244140625,
+        "y": 422.0000305175781,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "7e838704.3bc158"
+                "430ace39.bfbdd"
             ]
         ]
     },
     {
-        "id": "a25d170c.4028a8",
+        "id": "a5947e4.3e9fe8",
         "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": 1641.0006103515625,
-        "y": 699.1109313964844,
-        "z": "9f3fc64.f80e438",
+        "x": 1629.0006103515625,
+        "y": 632.0000610351562,
+        "z": "d4d449e4.1dc098",
         "wires": []
     },
     {
-        "id": "7e838704.3bc158",
+        "id": "430ace39.bfbdd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1481.9998779296875,
-        "y": 489.1109313964844,
-        "z": "9f3fc64.f80e438",
+        "x": 1469.9998779296875,
+        "y": 422.00006103515625,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "c956702b.47c63",
-                "f40ed653.cbf8d8"
+                "15daf4b9.fcd8bb",
+                "b245ee87.ae2d3"
             ]
         ]
     },
     {
-        "id": "c956702b.47c63",
+        "id": "15daf4b9.fcd8bb",
         "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": 1639,
-        "y": 435.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 1627,
+        "y": 368,
+        "z": "d4d449e4.1dc098",
         "wires": [
             []
         ]
     },
     {
-        "id": "d9f032dc.714c2",
+        "id": "827809a9.cdb878",
         "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": 1614.75390625,
-        "y": 592.1147766113281,
-        "z": "9f3fc64.f80e438",
+        "x": 1602.75390625,
+        "y": 525.00390625,
+        "z": "d4d449e4.1dc098",
         "wires": []
     },
     {
-        "id": "bf53837.9af008",
+        "id": "82330e2b.a13e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 690.75390625,
-        "y": 564.1147766113281,
-        "z": "9f3fc64.f80e438",
+        "x": 678.75390625,
+        "y": 497.00390625,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "b470d2cd.36f17"
+                "89826714.093eb8"
             ]
         ]
     },
     {
-        "id": "b470d2cd.36f17",
+        "id": "89826714.093eb8",
         "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",
+        "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=\"`$tmp-response-code`\" />\n<parameter name='response-message' value=\"Delete Policy Instance executed successfully\"/>\n<parameter name='ack-final' value='Y'/>\n\n",
         "comments": "",
-        "x": 851.7539672851562,
-        "y": 564.1148376464844,
-        "z": "9f3fc64.f80e438",
+        "x": 832.7539558410645,
+        "y": 497.00396251678467,
+        "z": "d4d449e4.1dc098",
         "wires": []
     },
     {
-        "id": "699e69ac.ce1b08",
+        "id": "7877c8e8.14d078",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1473.00390625,
-        "y": 643.1148071289062,
-        "z": "9f3fc64.f80e438",
+        "x": 1461.00390625,
+        "y": 576.0039367675781,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "a25d170c.4028a8",
-                "d9f032dc.714c2"
+                "a5947e4.3e9fe8",
+                "827809a9.cdb878"
             ]
         ]
     },
     {
-        "id": "f40ed653.cbf8d8",
+        "id": "b245ee87.ae2d3",
         "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`'/>",
+        "xml": "<set>\n<parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>\n<parameter name='tmp-response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1645,
-        "y": 539.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 1633,
+        "y": 472,
+        "z": "d4d449e4.1dc098",
         "wires": [
             []
         ]
     },
     {
-        "id": "65ead593.3fe92c",
+        "id": "fa663660.ae8428",
         "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": 1818,
-        "y": 307.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 1806,
+        "y": 240,
+        "z": "d4d449e4.1dc098",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a4b5616.141bb8",
+        "id": "eae848e.0c41fb8",
         "type": "outcome",
         "name": "No proxy URL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1650,
-        "y": 307.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 1638,
+        "y": 240,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "65ead593.3fe92c"
+                "fa663660.ae8428"
             ]
         ]
     },
     {
-        "id": "14b993ce.6d780c",
+        "id": "eb837f5.d346b8",
         "type": "outcome",
         "name": "Otherwise",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1646,
-        "y": 375.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 1634,
+        "y": 308,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "13deae40.f06f42"
+                "7bdd6ef8.1bdd9"
             ]
         ]
     },
     {
-        "id": "13deae40.f06f42",
+        "id": "7bdd6ef8.1bdd9",
         "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: Proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1805,
-        "y": 376.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 1793,
+        "y": 309,
+        "z": "d4d449e4.1dc098",
         "wires": [
             []
         ]
     },
     {
-        "id": "b270170d.e4d2e8",
+        "id": "d79ec746.1fab08",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$tmp.proxy-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1471,
-        "y": 341.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 1459,
+        "y": 274,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "7a4b5616.141bb8",
-                "14b993ce.6d780c"
+                "eae848e.0c41fb8",
+                "eb837f5.d346b8"
             ]
         ]
     },
     {
-        "id": "7a6201b8.1f6e",
+        "id": "721cb7bd.4c7378",
         "type": "block",
         "name": "block check if proxy address is available",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1134,
-        "y": 340.1108703613281,
-        "z": "9f3fc64.f80e438",
+        "x": 1122,
+        "y": 273,
+        "z": "d4d449e4.1dc098",
         "wires": [
             [
-                "b270170d.e4d2e8"
+                "d79ec746.1fab08"
             ]
         ]
     }
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 900b041a..068f49ee 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,6 +1,6 @@
 [
     {
-        "id": "10e97b34.bcf315",
+        "id": "bec86b4b.ba3328",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,419 +8,419 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 166,
-        "y": 257,
-        "z": "f36dd077.0bd7e",
+        "x": 178,
+        "y": 162,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "34cf59af.6236f6"
+                "40b3e4f0.5a940c"
             ]
         ]
     },
     {
-        "id": "34cf59af.6236f6",
+        "id": "40b3e4f0.5a940c",
         "type": "method",
         "name": "method getA1Policy",
         "xml": "<method rpc='getA1Policy' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 225,
-        "y": 378,
-        "z": "f36dd077.0bd7e",
+        "x": 237,
+        "y": 283,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "d016778f.76d178"
+                "2c58b14.20ee84e"
             ]
         ]
     },
     {
-        "id": "237a560f.9552ba",
+        "id": "cbe7f06b.6c19d",
         "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": 686,
-        "y": 179,
-        "z": "f36dd077.0bd7e",
+        "x": 698,
+        "y": 84,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d016778f.76d178",
+        "id": "2c58b14.20ee84e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 430,
-        "y": 332,
-        "z": "f36dd077.0bd7e",
+        "x": 442,
+        "y": 237,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "237a560f.9552ba",
-                "88a7e3f8.aef34",
-                "fa770c9c.fa8f4",
-                "b82e4819.e59fa8",
-                "3c47174a.181888"
+                "cbe7f06b.6c19d",
+                "47954dd7.8ff874",
+                "a9bf18c8.669f28",
+                "de6281f7.a2b8f",
+                "6237535d.14298c"
             ]
         ]
     },
     {
-        "id": "48fb0377.e5bbdc",
+        "id": "cec98e10.085a3",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 97,
-        "y": 194,
-        "z": "f36dd077.0bd7e",
+        "x": 109,
+        "y": 99,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "10e97b34.bcf315"
+                "bec86b4b.ba3328"
             ]
         ]
     },
     {
-        "id": "3c47174a.181888",
+        "id": "6237535d.14298c",
         "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' />",
+        "xml": "<set>\n<parameter name='tmp-response-code' value='200' />\n<parameter name='response-message' value='Get A1 Policy executed successfully' />",
         "comments": "",
-        "x": 730.0000610351562,
-        "y": 247,
-        "z": "f36dd077.0bd7e",
+        "x": 742.0000610351562,
+        "y": 152,
+        "z": "89b637c9.3cf8e8",
         "wires": []
     },
     {
-        "id": "88a7e3f8.aef34",
+        "id": "47954dd7.8ff874",
         "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": 729,
-        "y": 300,
-        "z": "f36dd077.0bd7e",
+        "x": 741,
+        "y": 205,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b82e4819.e59fa8",
+        "id": "de6281f7.a2b8f",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 759.0001220703125,
-        "y": 384,
-        "z": "f36dd077.0bd7e",
+        "x": 771.0001220703125,
+        "y": 289,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "8c55c732.d89748",
-                "ad49f33b.d3377",
-                "8027c342.f7a8",
-                "fcd99fa2.71eae"
+                "86e8102.231c3f",
+                "1e10a4f2.183f7b",
+                "7b93a0dc.5f888",
+                "294bdccf.e91f34"
             ]
         ]
     },
     {
-        "id": "ad49f33b.d3377",
+        "id": "1e10a4f2.183f7b",
         "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`\"/>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
         "comments": "",
-        "x": 1138.00146484375,
-        "y": 256.8891296386719,
-        "z": "f36dd077.0bd7e",
+        "x": 1150.00146484375,
+        "y": 161.88912963867188,
+        "z": "89b637c9.3cf8e8",
         "wires": []
     },
     {
-        "id": "8c55c732.d89748",
+        "id": "86e8102.231c3f",
         "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": 1019.0001220703125,
-        "y": 456,
-        "z": "f36dd077.0bd7e",
+        "x": 1031.0001220703125,
+        "y": 361,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8027c342.f7a8",
+        "id": "7b93a0dc.5f888",
         "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\"/>\n<parameter name=\"proxyUrl\" value=\"`$tmp.proxy-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1048.0006103515625,
-        "y": 531.0104064941406,
-        "z": "f36dd077.0bd7e",
+        "x": 1060.0006103515625,
+        "y": 436.0104064941406,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "9897b12a.32ced",
-                "e71419ff.61bbb8"
+                "8bafe9f1.1a33a8",
+                "fb3ab616.11d348"
             ]
         ]
     },
     {
-        "id": "9897b12a.32ced",
+        "id": "8bafe9f1.1a33a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1258,
-        "y": 629.0001220703125,
-        "z": "f36dd077.0bd7e",
+        "x": 1270,
+        "y": 534.0001220703125,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "1c9ae028.670bf"
+                "5f14ee4d.9f533"
             ]
         ]
     },
     {
-        "id": "e71419ff.61bbb8",
+        "id": "fb3ab616.11d348",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1265.000244140625,
-        "y": 530.0000305175781,
-        "z": "f36dd077.0bd7e",
+        "x": 1277.000244140625,
+        "y": 435.0000305175781,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "afc5b777.009a08"
+                "c0139db9.f37a1"
             ]
         ]
     },
     {
-        "id": "f3898b18.20aed8",
+        "id": "e7f0e32e.e3189",
         "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": 1582.0006103515625,
-        "y": 739.0000610351562,
-        "z": "f36dd077.0bd7e",
+        "x": 1594.0006103515625,
+        "y": 644.0000610351562,
+        "z": "89b637c9.3cf8e8",
         "wires": []
     },
     {
-        "id": "afc5b777.009a08",
+        "id": "c0139db9.f37a1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1421.9998779296875,
-        "y": 529.0000610351562,
-        "z": "f36dd077.0bd7e",
+        "x": 1433.9998779296875,
+        "y": 434.00006103515625,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "9ba38f90.43984",
-                "5c8a496b.1d4158",
-                "7164a263.76f1bc"
+                "be994933.35af78",
+                "95ed4634.c435e8",
+                "db2f8823.d15a78"
             ]
         ]
     },
     {
-        "id": "9ba38f90.43984",
+        "id": "be994933.35af78",
         "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": 1573,
-        "y": 527,
-        "z": "f36dd077.0bd7e",
+        "x": 1585,
+        "y": 432,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2fae5a38.614356",
+        "id": "732e181b.d6b9d8",
         "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": 1572.75390625,
-        "y": 655.00390625,
-        "z": "f36dd077.0bd7e",
+        "x": 1584.75390625,
+        "y": 560.00390625,
+        "z": "89b637c9.3cf8e8",
         "wires": []
     },
     {
-        "id": "fa770c9c.fa8f4",
+        "id": "a9bf18c8.669f28",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 692.75390625,
-        "y": 556.00390625,
-        "z": "f36dd077.0bd7e",
+        "x": 704.75390625,
+        "y": 461.00390625,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "f52c3841.f4dc38"
+                "d0d4fe14.ba524"
             ]
         ]
     },
     {
-        "id": "f52c3841.f4dc38",
+        "id": "d0d4fe14.ba524",
         "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",
+        "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=\"`$tmp-response-code`\" />\n<parameter name='response-message' value=\"Get PolicyInstance executed successfully\"/>\n<parameter name='ack-final' value='Y'/>\n",
         "comments": "",
-        "x": 853.7539672851562,
-        "y": 556.0039672851562,
-        "z": "f36dd077.0bd7e",
+        "x": 865.7539672851562,
+        "y": 461.00396728515625,
+        "z": "89b637c9.3cf8e8",
         "wires": []
     },
     {
-        "id": "1c9ae028.670bf",
+        "id": "5f14ee4d.9f533",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1418.00390625,
-        "y": 693.00390625,
-        "z": "f36dd077.0bd7e",
+        "x": 1430.00390625,
+        "y": 598.00390625,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "2fae5a38.614356",
-                "f3898b18.20aed8"
+                "732e181b.d6b9d8",
+                "e7f0e32e.e3189"
             ]
         ]
     },
     {
-        "id": "5c8a496b.1d4158",
+        "id": "95ed4634.c435e8",
         "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`'/>",
+        "xml": "<set>\n<parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>\n<parameter name='tmp-response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1573,
-        "y": 572,
-        "z": "f36dd077.0bd7e",
+        "x": 1585,
+        "y": 477,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7164a263.76f1bc",
+        "id": "db2f8823.d15a78",
         "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": 1578,
-        "y": 478,
-        "z": "f36dd077.0bd7e",
+        "x": 1590,
+        "y": 383,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fcd99fa2.71eae",
+        "id": "294bdccf.e91f34",
         "type": "block",
         "name": "block check if proxy address is available",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1132,
-        "y": 329,
-        "z": "f36dd077.0bd7e",
+        "x": 1144,
+        "y": 234,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "682992.2dd0967"
+                "a6ec8b06.48bfe8"
             ]
         ]
     },
     {
-        "id": "74ebffed.36e5d",
+        "id": "d5093ff.5c2bbc",
         "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: Proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1751,
-        "y": 360,
-        "z": "f36dd077.0bd7e",
+        "x": 1763,
+        "y": 265,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "682992.2dd0967",
+        "id": "a6ec8b06.48bfe8",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$tmp.proxy-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1419,
-        "y": 327,
-        "z": "f36dd077.0bd7e",
+        "x": 1431,
+        "y": 232,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "1ffdd50c.057bdb",
-                "dcf5e334.20da6"
+                "16ff777b.6f7569",
+                "7c0d754.e85938c"
             ]
         ]
     },
     {
-        "id": "1ffdd50c.057bdb",
+        "id": "16ff777b.6f7569",
         "type": "outcome",
         "name": "No proxy URL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1598,
-        "y": 293,
-        "z": "f36dd077.0bd7e",
+        "x": 1610,
+        "y": 198,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "5af6fc8b.6b28b4"
+                "b8c7fa11.eff4c8"
             ]
         ]
     },
     {
-        "id": "5af6fc8b.6b28b4",
+        "id": "b8c7fa11.eff4c8",
         "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": 1766,
-        "y": 293,
-        "z": "f36dd077.0bd7e",
+        "x": 1778,
+        "y": 198,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             []
         ]
     },
     {
-        "id": "dcf5e334.20da6",
+        "id": "7c0d754.e85938c",
         "type": "outcome",
         "name": "Otherwise",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1594,
-        "y": 361,
-        "z": "f36dd077.0bd7e",
+        "x": 1606,
+        "y": 266,
+        "z": "89b637c9.3cf8e8",
         "wires": [
             [
-                "74ebffed.36e5d"
+                "d5093ff.5c2bbc"
             ]
         ]
     }
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 2a6c92c7..de019676 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,6 +1,6 @@
 [
     {
-        "id": "7c350fad.38b66",
+        "id": "dab2ab82.fd4248",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,419 +8,419 @@
         "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": 177,
-        "y": 218,
-        "z": "4625f4a8.985c2c",
+        "x": 185,
+        "y": 165,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "19b27448.2b723c"
+                "acd63cd5.4e28a"
             ]
         ]
     },
     {
-        "id": "19b27448.2b723c",
+        "id": "acd63cd5.4e28a",
         "type": "method",
         "name": "method getA1PolicyStatus",
         "xml": "<method rpc='getA1PolicyStatus' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 236,
-        "y": 339,
-        "z": "4625f4a8.985c2c",
+        "x": 244,
+        "y": 286,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "310cf291.4f5d3e"
+                "69bbe470.58d95c"
             ]
         ]
     },
     {
-        "id": "83efabcd.4dd618",
+        "id": "f28cbd09.dd95c",
         "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": 700,
-        "y": 153,
-        "z": "4625f4a8.985c2c",
+        "x": 708,
+        "y": 100,
+        "z": "1c198b47.21d975",
         "wires": [
             []
         ]
     },
     {
-        "id": "310cf291.4f5d3e",
+        "id": "69bbe470.58d95c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 441,
-        "y": 293,
-        "z": "4625f4a8.985c2c",
+        "x": 449,
+        "y": 240,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "83efabcd.4dd618",
-                "9d749d26.ebe4a",
-                "ddb1f38.9ac071",
-                "2570c18d.2d6dee",
-                "7e2d427e.fb9bbc"
+                "f28cbd09.dd95c",
+                "ad55f1f9.177cc",
+                "623b811d.f0594",
+                "71d5205f.91348",
+                "f3017a71.256188"
             ]
         ]
     },
     {
-        "id": "701d74fb.dfe40c",
+        "id": "a236ca72.618658",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 108,
-        "y": 155,
-        "z": "4625f4a8.985c2c",
+        "x": 116,
+        "y": 102,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "7c350fad.38b66"
+                "dab2ab82.fd4248"
             ]
         ]
     },
     {
-        "id": "7e2d427e.fb9bbc",
+        "id": "f3017a71.256188",
         "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' />",
+        "xml": "<set>\n<parameter name='tmp-response-code' value='200' />\n<parameter name='response-message' value='Get A1 Policy executed successfully' />",
         "comments": "",
-        "x": 741.0000610351562,
-        "y": 208,
-        "z": "4625f4a8.985c2c",
+        "x": 749.0000610351562,
+        "y": 155,
+        "z": "1c198b47.21d975",
         "wires": []
     },
     {
-        "id": "9d749d26.ebe4a",
+        "id": "ad55f1f9.177cc",
         "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": 740,
-        "y": 261,
-        "z": "4625f4a8.985c2c",
+        "x": 748,
+        "y": 208,
+        "z": "1c198b47.21d975",
         "wires": [
             []
         ]
     },
     {
-        "id": "2570c18d.2d6dee",
+        "id": "71d5205f.91348",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 770.0001220703125,
-        "y": 345,
-        "z": "4625f4a8.985c2c",
+        "x": 778.0001220703125,
+        "y": 292,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "1d60f60b.a9b00a",
-                "3d73b30b.b1f39c",
-                "88733351.38598",
-                "e804fc09.010ed"
+                "2aff7d8f.dd4812",
+                "9cae0880.c0c0e8",
+                "8f121e72.f74e9",
+                "44aabed4.6f1cc"
             ]
         ]
     },
     {
-        "id": "3d73b30b.b1f39c",
+        "id": "9cae0880.c0c0e8",
         "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`\"/>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
         "comments": "",
-        "x": 1143.00146484375,
-        "y": 242.88912963867188,
-        "z": "4625f4a8.985c2c",
+        "x": 1151.00146484375,
+        "y": 189.88912963867188,
+        "z": "1c198b47.21d975",
         "wires": []
     },
     {
-        "id": "1d60f60b.a9b00a",
+        "id": "2aff7d8f.dd4812",
         "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": 1020.0001220703125,
-        "y": 421,
-        "z": "4625f4a8.985c2c",
+        "x": 1028.0001220703125,
+        "y": 368,
+        "z": "1c198b47.21d975",
         "wires": [
             []
         ]
     },
     {
-        "id": "88733351.38598",
+        "id": "8f121e72.f74e9",
         "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\"/>\n<parameter name=\"proxyUrl\" value=\"`$tmp.proxy-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1084.0006103515625,
-        "y": 549.0103759765625,
-        "z": "4625f4a8.985c2c",
+        "x": 1092.0006103515625,
+        "y": 496.0103759765625,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "d2d7b31.70bc05",
-                "819e4409.feff38"
+                "67e6b48.203664c",
+                "a0fbf653.8e93a8"
             ]
         ]
     },
     {
-        "id": "d2d7b31.70bc05",
+        "id": "67e6b48.203664c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1308,
-        "y": 629.0001220703125,
-        "z": "4625f4a8.985c2c",
+        "x": 1316,
+        "y": 576.0001220703125,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "84aea1ff.acb6c"
+                "505d1f0d.b7732"
             ]
         ]
     },
     {
-        "id": "819e4409.feff38",
+        "id": "a0fbf653.8e93a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1312.000244140625,
-        "y": 475.0000305175781,
-        "z": "4625f4a8.985c2c",
+        "x": 1320.000244140625,
+        "y": 422.0000305175781,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "c9d3e245.debc5"
+                "faec8947.57d5d8"
             ]
         ]
     },
     {
-        "id": "6a999bcc.eb2b74",
+        "id": "f9be32be.7e3b5",
         "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": 1615.0006103515625,
-        "y": 684.0000610351562,
-        "z": "4625f4a8.985c2c",
+        "x": 1623.0006103515625,
+        "y": 631.0000610351562,
+        "z": "1c198b47.21d975",
         "wires": []
     },
     {
-        "id": "c9d3e245.debc5",
+        "id": "faec8947.57d5d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1455.9998779296875,
-        "y": 475.00006103515625,
-        "z": "4625f4a8.985c2c",
+        "x": 1463.9998779296875,
+        "y": 422.00006103515625,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "1154b965.2bce37",
-                "4a098571.4acf5c",
-                "ce829e00.7d38f"
+                "8338ed01.5175e",
+                "ae45bc96.4d538",
+                "c9cba06f.dd2e"
             ]
         ]
     },
     {
-        "id": "1154b965.2bce37",
+        "id": "8338ed01.5175e",
         "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": 1617,
-        "y": 474,
-        "z": "4625f4a8.985c2c",
+        "x": 1625,
+        "y": 421,
+        "z": "1c198b47.21d975",
         "wires": [
             []
         ]
     },
     {
-        "id": "875ba0c0.31d41",
+        "id": "6faa502d.8c66f",
         "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": 1588.75390625,
-        "y": 577.00390625,
-        "z": "4625f4a8.985c2c",
+        "x": 1596.75390625,
+        "y": 524.00390625,
+        "z": "1c198b47.21d975",
         "wires": []
     },
     {
-        "id": "ddb1f38.9ac071",
+        "id": "623b811d.f0594",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 703.75390625,
-        "y": 565.00390625,
-        "z": "4625f4a8.985c2c",
+        "x": 711.75390625,
+        "y": 512.00390625,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "76ed31f9.64a93"
+                "b4e51d73.34b"
             ]
         ]
     },
     {
-        "id": "76ed31f9.64a93",
+        "id": "b4e51d73.34b",
         "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",
+        "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=\"`$tmp-response-code`\" />\n<parameter name='response-message' value='Get Policy Status executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
         "comments": "",
-        "x": 864.7539672851562,
-        "y": 565.0039672851562,
-        "z": "4625f4a8.985c2c",
+        "x": 872.7539672851562,
+        "y": 512.0039672851562,
+        "z": "1c198b47.21d975",
         "wires": []
     },
     {
-        "id": "84aea1ff.acb6c",
+        "id": "505d1f0d.b7732",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1447.00390625,
-        "y": 629.0039367675781,
-        "z": "4625f4a8.985c2c",
+        "x": 1455.00390625,
+        "y": 576.0039367675781,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "875ba0c0.31d41",
-                "6a999bcc.eb2b74"
+                "6faa502d.8c66f",
+                "f9be32be.7e3b5"
             ]
         ]
     },
     {
-        "id": "4a098571.4acf5c",
+        "id": "ae45bc96.4d538",
         "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`'/>",
+        "xml": "<set>\n<parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>\n<parameter name='tmp-response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1619,
-        "y": 525,
-        "z": "4625f4a8.985c2c",
+        "x": 1627,
+        "y": 472,
+        "z": "1c198b47.21d975",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce829e00.7d38f",
+        "id": "c9cba06f.dd2e",
         "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": 1621,
-        "y": 431,
-        "z": "4625f4a8.985c2c",
+        "x": 1629,
+        "y": 378,
+        "z": "1c198b47.21d975",
         "wires": [
             []
         ]
     },
     {
-        "id": "5fb0527b.74655c",
+        "id": "38a628bf.176938",
         "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": 1796,
-        "y": 290,
-        "z": "4625f4a8.985c2c",
+        "x": 1804,
+        "y": 237,
+        "z": "1c198b47.21d975",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa63c9cd.555b38",
+        "id": "da149457.18b3d8",
         "type": "outcome",
         "name": "Otherwise",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1624,
-        "y": 358,
-        "z": "4625f4a8.985c2c",
+        "x": 1632,
+        "y": 305,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "2a68aa17.88a926"
+                "cfd2acd.dcca35"
             ]
         ]
     },
     {
-        "id": "337f8172.242f2e",
+        "id": "4b079d54.1f9a04",
         "type": "outcome",
         "name": "No proxy URL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1628,
-        "y": 290,
-        "z": "4625f4a8.985c2c",
+        "x": 1636,
+        "y": 237,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "5fb0527b.74655c"
+                "38a628bf.176938"
             ]
         ]
     },
     {
-        "id": "124eb317.931f9d",
+        "id": "218e6162.18b38e",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$tmp.proxy-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1449,
-        "y": 324,
-        "z": "4625f4a8.985c2c",
+        "x": 1457,
+        "y": 271,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "337f8172.242f2e",
-                "aa63c9cd.555b38"
+                "4b079d54.1f9a04",
+                "da149457.18b3d8"
             ]
         ]
     },
     {
-        "id": "2a68aa17.88a926",
+        "id": "cfd2acd.dcca35",
         "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: Proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1778,
-        "y": 359,
-        "z": "4625f4a8.985c2c",
+        "x": 1786,
+        "y": 306,
+        "z": "1c198b47.21d975",
         "wires": [
             []
         ]
     },
     {
-        "id": "e804fc09.010ed",
+        "id": "44aabed4.6f1cc",
         "type": "block",
         "name": "block check if proxy address is available",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1122,
-        "y": 326,
-        "z": "4625f4a8.985c2c",
+        "x": 1130,
+        "y": 273,
+        "z": "1c198b47.21d975",
         "wires": [
             [
-                "124eb317.931f9d"
+                "218e6162.18b38e"
             ]
         ]
     }
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 d72ef917..47bfaf61 100644
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": "2f4671b1.4a364e",
+        "id": "a884e5ac.251158",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,419 +8,419 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 173,
-        "y": 202.11087036132812,
-        "z": "1f7e4863.a496f8",
+        "x": 185,
+        "y": 153.00000095367432,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "74d6a6f.e349e58"
+                "42aebba8.82c204"
             ]
         ]
     },
     {
-        "id": "74d6a6f.e349e58",
+        "id": "42aebba8.82c204",
         "type": "method",
         "name": "method getA1PolicyType",
         "xml": "<method rpc='getA1PolicyType' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 236.00000762939453,
-        "y": 325.1108798980713,
-        "z": "1f7e4863.a496f8",
+        "x": 248.00000762939453,
+        "y": 276.0000104904175,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "f761005e.026d4"
+                "54031caf.6d54d4"
             ]
         ]
     },
     {
-        "id": "ded0e1ed.d90b8",
+        "id": "41cd0d58.8c7fa4",
         "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": 701.0000267028809,
-        "y": 138.1108694076538,
-        "z": "1f7e4863.a496f8",
+        "x": 713.0000267028809,
+        "y": 89,
+        "z": "39c8aee4.0474d2",
         "wires": [
             []
         ]
     },
     {
-        "id": "f761005e.026d4",
+        "id": "54031caf.6d54d4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 439,
-        "y": 276.1108703613281,
-        "z": "1f7e4863.a496f8",
+        "x": 451,
+        "y": 227.00000095367432,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "ded0e1ed.d90b8",
-                "2baff500.547f5c",
-                "fe3000ed.24c2b",
-                "16444abc.b89ea5",
-                "8cd7c8b3.03d4d8"
+                "41cd0d58.8c7fa4",
+                "6e9f83a2.85506c",
+                "2b39d360.5b10ec",
+                "c34feb8.257e018",
+                "dcdb5333.1d66d"
             ]
         ]
     },
     {
-        "id": "a30ec915.db69b8",
+        "id": "ea6537ff.6bf4a8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 106,
-        "y": 138.11087036132812,
-        "z": "1f7e4863.a496f8",
+        "x": 118,
+        "y": 89.00000095367432,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "2f4671b1.4a364e"
+                "a884e5ac.251158"
             ]
         ]
     },
     {
-        "id": "2baff500.547f5c",
+        "id": "6e9f83a2.85506c",
         "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' />",
+        "xml": "<set>\n<parameter name='tmp-response-code' value='200' />\n<parameter name='response-message' value='getA1PolicyType executed successfully' />",
         "comments": "",
-        "x": 738.0001068115234,
-        "y": 191.1108684539795,
-        "z": "1f7e4863.a496f8",
+        "x": 750.0001068115234,
+        "y": 141.99999904632568,
+        "z": "39c8aee4.0474d2",
         "wires": []
     },
     {
-        "id": "fe3000ed.24c2b",
+        "id": "2b39d360.5b10ec",
         "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": 244.11087036132812,
-        "z": "1f7e4863.a496f8",
+        "x": 750,
+        "y": 195.00000095367432,
+        "z": "39c8aee4.0474d2",
         "wires": [
             []
         ]
     },
     {
-        "id": "8cd7c8b3.03d4d8",
+        "id": "dcdb5333.1d66d",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 762.0001525878906,
-        "y": 330.11086416244507,
-        "z": "1f7e4863.a496f8",
+        "x": 774.0001525878906,
+        "y": 280.99999475479126,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "176964cc.05c21b",
-                "a874e667.eb9a98",
-                "f71606ee.f54688",
-                "63821578.3e8abc"
+                "4ef43f72.de957",
+                "be4c1659.081a18",
+                "809ed869.5d5618",
+                "3356beda.d57472"
             ]
         ]
     },
     {
-        "id": "176964cc.05c21b",
+        "id": "4ef43f72.de957",
         "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`\"/>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
         "comments": "",
-        "x": 1149.00146484375,
-        "y": 225,
-        "z": "1f7e4863.a496f8",
+        "x": 1161.00146484375,
+        "y": 175.8891305923462,
+        "z": "39c8aee4.0474d2",
         "wires": []
     },
     {
-        "id": "a874e667.eb9a98",
+        "id": "be4c1659.081a18",
         "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\"/>\n<parameter name=\"proxyUrl\" value=\"`$tmp.proxy-url`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1048.0006103515625,
-        "y": 504.1212463378906,
-        "z": "1f7e4863.a496f8",
+        "x": 1060.0006103515625,
+        "y": 455.0103769302368,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "526251db.acb75",
-                "6f33632a.dc1fac"
+                "f106b203.8cc",
+                "fa54f56a.429858"
             ]
         ]
     },
     {
-        "id": "526251db.acb75",
+        "id": "f106b203.8cc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1229.0000610351562,
-        "y": 562.1109890937805,
-        "z": "1f7e4863.a496f8",
+        "x": 1241.0000610351562,
+        "y": 513.0001196861267,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "b5ba372c.92ad48"
+                "36845372.52ff4c"
             ]
         ]
     },
     {
-        "id": "6f33632a.dc1fac",
+        "id": "fa54f56a.429858",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1230.0002136230469,
-        "y": 458.11088848114014,
-        "z": "1f7e4863.a496f8",
+        "x": 1242.0002136230469,
+        "y": 409.0000190734863,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "3914e552.85e15a"
+                "5210a95b.1c9ac8"
             ]
         ]
     },
     {
-        "id": "fef8b587.543ac8",
+        "id": "573761d.3cf64a",
         "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": 1518.0006103515625,
-        "y": 596.1109924316406,
-        "z": "1f7e4863.a496f8",
+        "x": 1530.0006103515625,
+        "y": 547.0001230239868,
+        "z": "39c8aee4.0474d2",
         "wires": []
     },
     {
-        "id": "3914e552.85e15a",
+        "id": "5210a95b.1c9ac8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1393.9998779296875,
-        "y": 432.1109313964844,
-        "z": "1f7e4863.a496f8",
+        "x": 1405.9998779296875,
+        "y": 383.00006198883057,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "a2b706cb.13b4b8",
-                "90dda7a5.529068",
-                "85fe9dc4.e41ff"
+                "51c028b4.3be0f8",
+                "7ca5bd96.023584",
+                "d4f48451.ca4ac8"
             ]
         ]
     },
     {
-        "id": "a2b706cb.13b4b8",
+        "id": "51c028b4.3be0f8",
         "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": 1565.9999694824219,
-        "y": 436.11084842681885,
-        "z": "1f7e4863.a496f8",
+        "x": 1577.9999694824219,
+        "y": 386.99997901916504,
+        "z": "39c8aee4.0474d2",
         "wires": [
             []
         ]
     },
     {
-        "id": "e91418e5.8658e8",
+        "id": "66c2455.a8173bc",
         "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": 1500.75390625,
-        "y": 536.1148071289062,
-        "z": "1f7e4863.a496f8",
+        "x": 1512.75390625,
+        "y": 487.00393772125244,
+        "z": "39c8aee4.0474d2",
         "wires": []
     },
     {
-        "id": "16444abc.b89ea5",
+        "id": "c34feb8.257e018",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 685.7539367675781,
-        "y": 597.1148681640625,
-        "z": "1f7e4863.a496f8",
+        "x": 697.7539367675781,
+        "y": 548.0039987564087,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "35da5f95.df0a6"
+                "82742b10.d77588"
             ]
         ]
     },
     {
-        "id": "35da5f95.df0a6",
+        "id": "82742b10.d77588",
         "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",
+        "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=\"`$tmp-response-code`\" />\n<parameter name='response-message' value='Get A1 Policy Type Information successfully'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>\n",
         "comments": "",
-        "x": 900.7540283203125,
-        "y": 597.1148071289062,
-        "z": "1f7e4863.a496f8",
+        "x": 912.7540283203125,
+        "y": 548.0039377212524,
+        "z": "39c8aee4.0474d2",
         "wires": []
     },
     {
-        "id": "b5ba372c.92ad48",
+        "id": "36845372.52ff4c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1357.0039367675781,
-        "y": 564.1147885322571,
-        "z": "1f7e4863.a496f8",
+        "x": 1369.0039367675781,
+        "y": 515.0039191246033,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "fef8b587.543ac8",
-                "e91418e5.8658e8"
+                "573761d.3cf64a",
+                "66c2455.a8173bc"
             ]
         ]
     },
     {
-        "id": "f71606ee.f54688",
+        "id": "809ed869.5d5618",
         "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": 1023.9998779296875,
-        "y": 440.1108703613281,
-        "z": "1f7e4863.a496f8",
+        "x": 1035.9998779296875,
+        "y": 391.0000009536743,
+        "z": "39c8aee4.0474d2",
         "wires": [
             []
         ]
     },
     {
-        "id": "90dda7a5.529068",
+        "id": "7ca5bd96.023584",
         "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`'/>",
+        "xml": "<set>\n<parameter name='responseBody' value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>\n<parameter name='tmp-response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1567.0000915527344,
-        "y": 491.1108589172363,
-        "z": "1f7e4863.a496f8",
+        "x": 1579.0000915527344,
+        "y": 441.9999895095825,
+        "z": "39c8aee4.0474d2",
         "wires": [
             []
         ]
     },
     {
-        "id": "85fe9dc4.e41ff",
+        "id": "d4f48451.ca4ac8",
         "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": 1568.9999694824219,
-        "y": 387.11084842681885,
-        "z": "1f7e4863.a496f8",
+        "x": 1580.9999694824219,
+        "y": 337.99997901916504,
+        "z": "39c8aee4.0474d2",
         "wires": [
             []
         ]
     },
     {
-        "id": "46ef0e6f.ac078",
+        "id": "2b467907.02e336",
         "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": 1745,
-        "y": 258.1108703613281,
-        "z": "1f7e4863.a496f8",
+        "x": 1757,
+        "y": 209.00000095367432,
+        "z": "39c8aee4.0474d2",
         "wires": [
             []
         ]
     },
     {
-        "id": "77d9a0fa.cb6ed",
+        "id": "1117a7de.393308",
         "type": "outcome",
         "name": "No proxy URL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1577,
-        "y": 258.1108703613281,
-        "z": "1f7e4863.a496f8",
+        "x": 1589,
+        "y": 209.00000095367432,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "46ef0e6f.ac078"
+                "2b467907.02e336"
             ]
         ]
     },
     {
-        "id": "4908d507.106ffc",
+        "id": "877cbb7a.d37458",
         "type": "outcome",
         "name": "Otherwise",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1573,
-        "y": 326.1108703613281,
-        "z": "1f7e4863.a496f8",
+        "x": 1585,
+        "y": 277.0000009536743,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "57e4f785.2a2818"
+                "20df05b3.3b88ea"
             ]
         ]
     },
     {
-        "id": "9126aa92.42c718",
+        "id": "7e8df1d2.4ebed",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$tmp.proxy-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1398,
-        "y": 292.1108703613281,
-        "z": "1f7e4863.a496f8",
+        "x": 1410,
+        "y": 243.00000095367432,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "77d9a0fa.cb6ed",
-                "4908d507.106ffc"
+                "1117a7de.393308",
+                "877cbb7a.d37458"
             ]
         ]
     },
     {
-        "id": "57e4f785.2a2818",
+        "id": "20df05b3.3b88ea",
         "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: Proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1727,
-        "y": 326.1108703613281,
-        "z": "1f7e4863.a496f8",
+        "x": 1739,
+        "y": 277.0000009536743,
+        "z": "39c8aee4.0474d2",
         "wires": [
             []
         ]
     },
     {
-        "id": "63821578.3e8abc",
+        "id": "3356beda.d57472",
         "type": "block",
         "name": "block Substitute proxy address if available",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1131,
-        "y": 292.1108703613281,
-        "z": "1f7e4863.a496f8",
+        "x": 1143,
+        "y": 243.00000095367432,
+        "z": "39c8aee4.0474d2",
         "wires": [
             [
-                "9126aa92.42c718"
+                "7e8df1d2.4ebed"
             ]
         ]
     }
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 760a84da..feb3253b 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
@@ -10,7 +10,7 @@
                 <parameter name="field2" value="`$delete-a1-policy-input.near-rt-ric-url`"/>
             </record>
             <set>
-                <parameter name='response-code' value='200' />
+                <parameter name='tmp-response-code' value='200' />
                 <parameter name='response-message' value='deletePolicy executed successfully' />
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
@@ -68,7 +68,7 @@
                             </record>
                             <set>
                                 <parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>
-                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='tmp-response-code' value='`$a1MediatorRsp.response-code`'/>
                                 <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
                             </set>
                         </block>
@@ -93,8 +93,8 @@
                     <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='response-code' value="`$tmp-response-code`" />
+                    <parameter name='response-message' value="Delete Policy Instance executed successfully"/>
                     <parameter name='ack-final' value='Y'/>
                 </return>
             </block>
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 5b8e46d1..b299165d 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
@@ -10,7 +10,7 @@
                 <parameter name="field2" value="`$get-a1-policy-input.near-rt-ric-url`"/>
             </record>
             <set>
-                <parameter name='response-code' value='200' />
+                <parameter name='tmp-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' >
@@ -74,7 +74,7 @@
                             </record>
                             <set>
                                 <parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>
-                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='tmp-response-code' value='`$a1MediatorRsp.response-code`'/>
                                 <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
                             </set>
                         </block>
@@ -99,8 +99,8 @@
                     <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='response-code' value="`$tmp-response-code`" />
+                    <parameter name='response-message' value="Get PolicyInstance executed successfully"/>
                     <parameter name='ack-final' value='Y'/>
                 </return>
             </block>
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 a96c5f10..b41edafe 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
@@ -10,7 +10,7 @@
                 <parameter name="field2" value="`$get-a1-policy-status-input.near-rt-ric-url`"/>
             </record>
             <set>
-                <parameter name='response-code' value='200' />
+                <parameter name='tmp-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' >
@@ -74,7 +74,7 @@
                             </record>
                             <set>
                                 <parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>
-                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='tmp-response-code' value='`$a1MediatorRsp.response-code`'/>
                                 <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
                             </set>
                         </block>
@@ -99,7 +99,7 @@
                     <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-code' value="`$tmp-response-code`" />
                     <parameter name='response-message' value='Get Policy Status executed successfully'/>
                     <parameter name='ack-final' value='Y'/>
                 </return>
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 0f8c5875..56341f95 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
@@ -10,7 +10,7 @@
                 <parameter name="field2" value="`$get-a1-policy-type-input.near-rt-ric-url`"/>
             </record>
             <set>
-                <parameter name='response-code' value='200' />
+                <parameter name='tmp-response-code' value='200' />
                 <parameter name='response-message' value='getA1PolicyType executed successfully' />
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
@@ -74,7 +74,7 @@
                             </record>
                             <set>
                                 <parameter name='responseBody' value="`$tmp.a1-mediator-restapi.httpResponse`"/>
-                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='tmp-response-code' value='`$a1MediatorRsp.response-code`'/>
                                 <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
                             </set>
                         </block>
@@ -99,8 +99,8 @@
                     <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='response-code' value="`$tmp-response-code`" />
+                    <parameter name='response-message' value='Get A1 Policy Type Information successfully'/>
                     <parameter name='health-status' value='200'/>
                     <parameter name='ack-final' value='Y'/>
                 </return>