X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fa1Adapter-api%2Fsrc%2Fmain%2Fjson%2FA1-ADAPTER-API_deleteA1Policy.json;h=bae3ba8670b5b2af49c21e4a9703f1d2c1dcb4a5;hb=98f8fdb9fc6ca51615e2a70614f43e19ad8bcafe;hp=89c14a88c826a7601b75ee275dbaacdacee1a22b;hpb=7cd7fe946ae07d21a3daf57a5f2868f4b4b2e7fc;p=ccsdk%2Fdistribution.git

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 89c14a88..bae3ba86 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": "7c435ae3.69565c",
+        "id": "40b94c2a.1d5be4",
         "type": "service-logic",
         "name": "A1-ADAPTER-API ${project.version}",
         "module": "A1-ADAPTER-API",
@@ -8,310 +8,507 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 188,
-        "y": 153,
-        "z": "cb244f73.c06648",
+        "x": 194,
+        "y": 237,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "710b1a71.cbae84"
+                "c8e7631.2112ba"
             ]
         ]
     },
     {
-        "id": "710b1a71.cbae84",
+        "id": "c8e7631.2112ba",
         "type": "method",
         "name": "method deleteA1Policy",
         "xml": "<method rpc='deleteA1Policy' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 248,
-        "y": 273,
-        "z": "cb244f73.c06648",
+        "x": 254,
+        "y": 357,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "4378a18e.7f739"
+                "4faf22ab.4c738c"
             ]
         ]
     },
     {
-        "id": "6ce20bdf.ad9a1c",
+        "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 Policy:\"/>\n<parameter name=\"field2\" value=\"`$delete-a1-policy-input.near-rt-ric-url`\"/>",
+        "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": 712,
-        "y": 87,
-        "z": "cb244f73.c06648",
+        "x": 718,
+        "y": 171,
+        "z": "5421e0da.e98ea",
         "wires": [
             []
         ]
     },
     {
-        "id": "4378a18e.7f739",
+        "id": "4faf22ab.4c738c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 453,
-        "y": 227,
-        "z": "cb244f73.c06648",
+        "x": 459,
+        "y": 311,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "6ce20bdf.ad9a1c",
-                "e5238148.fd374",
-                "bdf5754e.9b53f8",
-                "7e804e03.9c90b",
-                "fb64d04f.8f7d68"
+                "166f48b5.9a3a17",
+                "b2679b68.1462c8",
+                "4148a57a.c7efcc",
+                "f504796c.262f88",
+                "aba0ccb1.73758"
             ]
         ]
     },
     {
-        "id": "ee4edddb.f32858",
+        "id": "4e2bdc30.8909a4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 120,
-        "y": 89,
-        "z": "cb244f73.c06648",
+        "x": 126,
+        "y": 173,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "7c435ae3.69565c"
+                "40b94c2a.1d5be4"
             ]
         ]
     },
     {
-        "id": "e5238148.fd374",
+        "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": 753.0000610351562,
-        "y": 142,
-        "z": "cb244f73.c06648",
+        "x": 759.0000610351562,
+        "y": 226,
+        "z": "5421e0da.e98ea",
         "wires": []
     },
     {
-        "id": "bdf5754e.9b53f8",
+        "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": 752,
-        "y": 195,
-        "z": "cb244f73.c06648",
+        "x": 758,
+        "y": 279,
+        "z": "5421e0da.e98ea",
         "wires": [
             []
         ]
     },
     {
-        "id": "fb64d04f.8f7d68",
+        "id": "aba0ccb1.73758",
         "type": "block",
         "name": "A1 Mediator RestAPI Invocation",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 782.0001220703125,
-        "y": 279,
-        "z": "cb244f73.c06648",
+        "x": 788.0001220703125,
+        "y": 363,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "3f182409.0c3914",
-                "e320e99b.0be3e",
-                "a9c27d26.b87628"
+                "c6ab5263.f678d",
+                "5cd5776d.1e0278",
+                "628e7bf2.7d9964",
+                "793b4300.b8738c"
             ]
         ]
     },
     {
-        "id": "e320e99b.0be3e",
+        "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": 1144.00146484375,
-        "y": 171.88912963867188,
-        "z": "cb244f73.c06648",
+        "x": 1161.00146484375,
+        "y": 136.88912963867188,
+        "z": "5421e0da.e98ea",
         "wires": []
     },
     {
-        "id": "3f182409.0c3914",
+        "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": 1032.0001220703125,
-        "y": 261,
-        "z": "cb244f73.c06648",
+        "x": 1056.0001220703125,
+        "y": 461,
+        "z": "5421e0da.e98ea",
         "wires": [
             []
         ]
     },
     {
-        "id": "a9c27d26.b87628",
+        "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": 1077.0006103515625,
-        "y": 343.0104064941406,
-        "z": "cb244f73.c06648",
+        "x": 1096.0006103515625,
+        "y": 536.0104064941406,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "17d809ef.941376",
-                "c9c13643.42fb78"
+                "2eaa9315.f1267c",
+                "1b5b58af.e3d147"
             ]
         ]
     },
     {
-        "id": "17d809ef.941376",
+        "id": "2eaa9315.f1267c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1304,
-        "y": 412.0001220703125,
-        "z": "cb244f73.c06648",
+        "x": 1325,
+        "y": 625.0001220703125,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "8a649ed7.63deb"
+                "8fd194ab.4d6f48"
             ]
         ]
     },
     {
-        "id": "c9c13643.42fb78",
+        "id": "1b5b58af.e3d147",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1294.000244140625,
-        "y": 257.0000305175781,
-        "z": "cb244f73.c06648",
+        "x": 1315.000244140625,
+        "y": 470.0000305175781,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "d953eb99.f4fcc"
+                "4ca53b3d.e09944"
             ]
         ]
     },
     {
-        "id": "cafd39a2.e592f",
+        "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": 1627.0006103515625,
-        "y": 467.00006103515625,
-        "z": "cb244f73.c06648",
+        "x": 1648.0006103515625,
+        "y": 680.0000610351562,
+        "z": "5421e0da.e98ea",
         "wires": []
     },
     {
-        "id": "d953eb99.f4fcc",
+        "id": "4ca53b3d.e09944",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1467.9998779296875,
-        "y": 257.00006103515625,
-        "z": "cb244f73.c06648",
+        "x": 1488.9998779296875,
+        "y": 470.00006103515625,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "b7919ed2.bc4b8",
-                "76b0ec4a.812af4"
+                "e8211cdb.f1c0b",
+                "4e8c89de.7e4e78"
             ]
         ]
     },
     {
-        "id": "b7919ed2.bc4b8",
+        "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": 1625,
-        "y": 203,
-        "z": "cb244f73.c06648",
+        "x": 1646,
+        "y": 416,
+        "z": "5421e0da.e98ea",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d7fa547.79bee2",
+        "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": 1600.75390625,
-        "y": 360.00390625,
-        "z": "cb244f73.c06648",
+        "x": 1621.75390625,
+        "y": 573.00390625,
+        "z": "5421e0da.e98ea",
         "wires": []
     },
     {
-        "id": "7e804e03.9c90b",
+        "id": "f504796c.262f88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 715.75390625,
-        "y": 451.00390625,
-        "z": "cb244f73.c06648",
+        "x": 697.75390625,
+        "y": 545.00390625,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "23ec5862.ce8f7"
+                "2fbb20e3.ff965"
             ]
         ]
     },
     {
-        "id": "23ec5862.ce8f7",
+        "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": 876.7539672851562,
-        "y": 451.00396728515625,
-        "z": "cb244f73.c06648",
+        "x": 858.7539672851562,
+        "y": 545.0039672851562,
+        "z": "5421e0da.e98ea",
         "wires": []
     },
     {
-        "id": "8a649ed7.63deb",
+        "id": "8fd194ab.4d6f48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1459.00390625,
-        "y": 411.0039367675781,
-        "z": "cb244f73.c06648",
+        "x": 1480.00390625,
+        "y": 624.0039367675781,
+        "z": "5421e0da.e98ea",
         "wires": [
             [
-                "2d7fa547.79bee2",
-                "cafd39a2.e592f"
+                "ab28de1f.ae2e2",
+                "c96895f9.6920d8"
             ]
         ]
     },
     {
-        "id": "76b0ec4a.812af4",
+        "id": "4e8c89de.7e4e78",
         "type": "execute",
         "name": "set",
         "xml": "<set>\n<parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1631,
-        "y": 307,
-        "z": "cb244f73.c06648",
+        "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"
+            ]
+        ]
     }
 ]
\ No newline at end of file