summaryrefslogtreecommitdiffstats
path: root/platform-logic
diff options
context:
space:
mode:
authorychacon <yennifer.chacon@est.tech>2021-09-07 22:44:21 +0200
committerychacon <yennifer.chacon@est.tech>2021-09-07 22:44:21 +0200
commit85ddb75c2a52cd1ac07c9f881b2f275afe340fa0 (patch)
treee2dd0a786b364cb0766f8329a29823d37ae815e6 /platform-logic
parentf906377369016ed5d82dd1f458b4b8cdcc2778b7 (diff)
Bug Fix- Update DG to add proxy support
Issue-ID: CCSDK-3438 Signed-off-by: ychacon <yennifer.chacon@est.tech> Change-Id: Id7978289ce728c49fab7cf90316c2eba014478b8
Diffstat (limited to 'platform-logic')
-rw-r--r--platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json378
-rw-r--r--platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1Policy.json388
-rw-r--r--platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json388
-rw-r--r--platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json386
-rw-r--r--platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json358
-rw-r--r--platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml38
-rw-r--r--platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1Policy.xml38
-rw-r--r--platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml38
-rw-r--r--platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyType.xml38
-rw-r--r--platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml38
10 files changed, 734 insertions, 1354 deletions
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json
index 8534f6d9..9335cac5 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": "a447a452.635fa8",
+ "id": "e4c21709.3d35e8",
"type": "service-logic",
"name": "A1-ADAPTER-API ${project.version}",
"module": "A1-ADAPTER-API",
@@ -8,506 +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": 148,
- "y": 146.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 187,
+ "y": 256.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "aa9f057c.f13598"
+ "7351113d.4dc8d"
]
]
},
{
- "id": "aa9f057c.f13598",
+ "id": "7351113d.4dc8d",
"type": "method",
"name": "method deleteA1Policy",
"xml": "<method rpc='deleteA1Policy' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 208,
- "y": 266.1108703613281,
- "z": "b095413b.d2f8d",
+ "x": 247,
+ "y": 376.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "5c8824d3.f2344c"
+ "a6106995.99c388"
]
]
},
{
- "id": "9fb06523.31d628",
+ "id": "1fdea711.7bf739",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy:\"/>\n<parameter name=\"field2\" value=\"`$delete-a1-policy-input.near-rt-ric-url`\"/>",
"comments": "",
"outputs": 1,
- "x": 672,
- "y": 80.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 711,
+ "y": 190.11087036132812,
+ "z": "9f3fc64.f80e438",
"wires": [
[]
]
},
{
- "id": "5c8824d3.f2344c",
+ "id": "a6106995.99c388",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 413,
- "y": 220.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 452,
+ "y": 330.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "9fb06523.31d628",
- "23fdd8fa.63f2d8",
- "1c180e5.366e5f2",
- "36348c30.bf23e4",
- "233e808.6a2288"
+ "1fdea711.7bf739",
+ "df6f8931.8d6ba8",
+ "bf53837.9af008",
+ "779d5e07.992c3",
+ "ab7a89c3.e79ca8"
]
]
},
{
- "id": "5d0de73d.0e8098",
+ "id": "eca34eaa.ef167",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 80,
- "y": 82.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 119,
+ "y": 192.11087036132812,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "a447a452.635fa8"
+ "e4c21709.3d35e8"
]
]
},
{
- "id": "233e808.6a2288",
+ "id": "ab7a89c3.e79ca8",
"type": "set",
"name": "set default status value",
"xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicy executed successfully' />",
"comments": "",
- "x": 713.0000610351562,
- "y": 135.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 752.0000610351562,
+ "y": 245.11087036132812,
+ "z": "9f3fc64.f80e438",
"wires": []
},
{
- "id": "23fdd8fa.63f2d8",
+ "id": "df6f8931.8d6ba8",
"type": "execute",
"name": "execute Properties",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 712,
- "y": 188.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 751,
+ "y": 298.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[]
]
},
{
- "id": "36348c30.bf23e4",
+ "id": "779d5e07.992c3",
"type": "block",
"name": "A1 Mediator RestAPI Invocation",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 742.0001220703125,
- "y": 272.1108703613281,
- "z": "b095413b.d2f8d",
+ "x": 781.0001220703125,
+ "y": 382.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "67c4647.5e9d39c",
- "137a540e.529a0c",
- "5d1ae490.dcddcc",
- "5d1a137e.2dac4c"
+ "a2a8e78a.0a5698",
+ "11e3f573.11084b",
+ "d83ec9ce.0707c8",
+ "7a6201b8.1f6e"
]
]
},
{
- "id": "137a540e.529a0c",
+ "id": "11e3f573.11084b",
"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`\"/>",
+ "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": 1115.00146484375,
- "y": 46,
- "z": "b095413b.d2f8d",
+ "x": 1156.00146484375,
+ "y": 265,
+ "z": "9f3fc64.f80e438",
"wires": []
},
{
- "id": "67c4647.5e9d39c",
+ "id": "a2a8e78a.0a5698",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Delete Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
"comments": "",
"outputs": 1,
- "x": 1010.0001220703125,
- "y": 370.1108703613281,
- "z": "b095413b.d2f8d",
+ "x": 1032.0001220703125,
+ "y": 432.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[]
]
},
{
- "id": "5d1ae490.dcddcc",
+ "id": "d83ec9ce.0707c8",
"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\"/>",
+ "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": 1050.0006103515625,
- "y": 445.12127685546875,
- "z": "b095413b.d2f8d",
+ "x": 1089.0006103515625,
+ "y": 555.1212768554688,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "af85ffea.175b3",
- "d620d649.a947c8"
+ "7aaf8bd7.b90fd4",
+ "5d03cdff.c8b994"
]
]
},
{
- "id": "af85ffea.175b3",
+ "id": "7aaf8bd7.b90fd4",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1279,
- "y": 534.1109924316406,
- "z": "b095413b.d2f8d",
+ "x": 1318,
+ "y": 644.1109924316406,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "56ddc908.6336c8"
+ "699e69ac.ce1b08"
]
]
},
{
- "id": "d620d649.a947c8",
+ "id": "5d03cdff.c8b994",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1269.000244140625,
- "y": 379.11090087890625,
- "z": "b095413b.d2f8d",
+ "x": 1308.000244140625,
+ "y": 489.11090087890625,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "def3924e.1551b"
+ "7e838704.3bc158"
]
]
},
{
- "id": "2e291aaf.e9f6b6",
+ "id": "a25d170c.4028a8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
- "x": 1602.0006103515625,
- "y": 589.1109313964844,
- "z": "b095413b.d2f8d",
+ "x": 1641.0006103515625,
+ "y": 699.1109313964844,
+ "z": "9f3fc64.f80e438",
"wires": []
},
{
- "id": "def3924e.1551b",
+ "id": "7e838704.3bc158",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1442.9998779296875,
- "y": 379.1109313964844,
- "z": "b095413b.d2f8d",
+ "x": 1481.9998779296875,
+ "y": 489.1109313964844,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "2b3c81b8.a1a58e",
- "5e3d39b8.e4f438"
+ "c956702b.47c63",
+ "f40ed653.cbf8d8"
]
]
},
{
- "id": "2b3c81b8.a1a58e",
+ "id": "c956702b.47c63",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Delete Policy Information \"/>\n<parameter name=\"field2\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n<parameter name='field3' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='field4' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
"outputs": 1,
- "x": 1600,
- "y": 325.1108703613281,
- "z": "b095413b.d2f8d",
+ "x": 1639,
+ "y": 435.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[]
]
},
{
- "id": "58e12f5b.03ab6",
+ "id": "d9f032dc.714c2",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>\n",
"comments": "",
- "x": 1575.75390625,
- "y": 482.1147766113281,
- "z": "b095413b.d2f8d",
+ "x": 1614.75390625,
+ "y": 592.1147766113281,
+ "z": "9f3fc64.f80e438",
"wires": []
},
{
- "id": "1c180e5.366e5f2",
+ "id": "bf53837.9af008",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 651.75390625,
- "y": 454.1147766113281,
- "z": "b095413b.d2f8d",
+ "x": 690.75390625,
+ "y": 564.1147766113281,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "d4c1291b.ee9338"
+ "b470d2cd.36f17"
]
]
},
{
- "id": "d4c1291b.ee9338",
+ "id": "b470d2cd.36f17",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='deletePolicyInstance executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
"comments": "",
- "x": 812.7539672851562,
- "y": 454.1148376464844,
- "z": "b095413b.d2f8d",
+ "x": 851.7539672851562,
+ "y": 564.1148376464844,
+ "z": "9f3fc64.f80e438",
"wires": []
},
{
- "id": "56ddc908.6336c8",
+ "id": "699e69ac.ce1b08",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1434.00390625,
- "y": 533.1148071289062,
- "z": "b095413b.d2f8d",
+ "x": 1473.00390625,
+ "y": 643.1148071289062,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "58e12f5b.03ab6",
- "2e291aaf.e9f6b6"
+ "a25d170c.4028a8",
+ "d9f032dc.714c2"
]
]
},
{
- "id": "5e3d39b8.e4f438",
+ "id": "f40ed653.cbf8d8",
"type": "execute",
"name": "set",
"xml": "<set>\n<parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
"outputs": 1,
- "x": 1606,
- "y": 429.1108703613281,
- "z": "b095413b.d2f8d",
+ "x": 1645,
+ "y": 539.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[]
]
},
{
- "id": "8784b71f.4102c8",
- "type": "execute",
- "name": "split near-rt-ric URL",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n <parameter name=\"regex\" value=\"/\"/>\n <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
- "comments": "",
- "outputs": 1,
- "x": 2009,
- "y": 161.11087036132812,
- "z": "b095413b.d2f8d",
- "wires": [
- []
- ]
- },
- {
- "id": "4a62f928.6bd3f8",
- "type": "for",
- "name": "for",
- "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
- "comments": "",
- "outputs": 1,
- "x": 1975,
- "y": 231.11087036132812,
- "z": "b095413b.d2f8d",
- "wires": [
- [
- "70dc997b.0486a8"
- ]
- ]
- },
- {
- "id": "70dc997b.0486a8",
- "type": "execute",
- "name": "set concat url",
- "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 2153,
- "y": 231.11087036132812,
- "z": "b095413b.d2f8d",
- "wires": [
- []
- ]
- },
- {
- "id": "9476835d.fd86",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
- "comments": "",
- "outputs": 1,
- "x": 1975,
- "y": 285.1108703613281,
- "z": "b095413b.d2f8d",
- "wires": [
- []
- ]
- },
- {
- "id": "f3d9622e.f23b9",
+ "id": "65ead593.3fe92c",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Delete A1 Policy: No proxy found on properties file \"/>\n",
"comments": "",
"outputs": 1,
- "x": 1779,
- "y": 197.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 1818,
+ "y": 307.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[]
]
},
{
- "id": "19526cfe.e22a53",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1771,
- "y": 265.1108703613281,
- "z": "b095413b.d2f8d",
- "wires": [
- [
- "8784b71f.4102c8",
- "4a62f928.6bd3f8",
- "9476835d.fd86",
- "fdf5e62e.ff4588"
- ]
- ]
- },
- {
- "id": "fdf5e62e.ff4588",
- "type": "set",
- "name": "set variables for A1 Mediator with proxy url",
- "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
- "comments": "",
- "x": 2085,
- "y": 344.1108703613281,
- "z": "b095413b.d2f8d",
- "wires": []
- },
- {
- "id": "c4aac840.55b728",
+ "id": "7a4b5616.141bb8",
"type": "outcome",
"name": "No proxy URL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1611,
- "y": 197.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 1650,
+ "y": 307.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "f3d9622e.f23b9"
+ "65ead593.3fe92c"
]
]
},
{
- "id": "6f2cfaad.7863b4",
+ "id": "14b993ce.6d780c",
"type": "outcome",
"name": "Otherwise",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1607,
- "y": 265.1108703613281,
- "z": "b095413b.d2f8d",
+ "x": 1646,
+ "y": 375.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "19526cfe.e22a53"
+ "13deae40.f06f42"
]
]
},
{
- "id": "4a770dc4.985ed4",
- "type": "set",
- "name": "set tmp url variables with proxy information",
- "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
- "comments": "",
- "x": 1550,
- "y": 73.11087036132812,
- "z": "b095413b.d2f8d",
- "wires": []
- },
- {
- "id": "49b752da.8fb6bc",
+ "id": "13deae40.f06f42",
"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",
+ "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": 1433,
- "y": 148.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 1805,
+ "y": 376.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[]
]
},
{
- "id": "aa685353.a5b32",
+ "id": "b270170d.e4d2e8",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$tmp.proxy-url`'>\n",
"comments": "",
"outputs": 1,
- "x": 1432,
- "y": 231.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 1471,
+ "y": 341.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "c4aac840.55b728",
- "6f2cfaad.7863b4"
+ "7a4b5616.141bb8",
+ "14b993ce.6d780c"
]
]
},
{
- "id": "5d1a137e.2dac4c",
+ "id": "7a6201b8.1f6e",
"type": "block",
- "name": "block Substitute proxy address if available",
+ "name": "block check if proxy address is available",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1095,
- "y": 230.11087036132812,
- "z": "b095413b.d2f8d",
+ "x": 1134,
+ "y": 340.1108703613281,
+ "z": "9f3fc64.f80e438",
"wires": [
[
- "4a770dc4.985ed4",
- "49b752da.8fb6bc",
- "aa685353.a5b32"
+ "b270170d.e4d2e8"
]
]
}
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 f8a716f0..900b041a 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": "6b8e8ac6.27c604",
+ "id": "10e97b34.bcf315",
"type": "service-logic",
"name": "A1-ADAPTER-API ${project.version}",
"module": "A1-ADAPTER-API",
@@ -8,522 +8,420 @@
"comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
"outputs": 1,
- "x": 147,
- "y": 150,
- "z": "545d3747.09bc48",
+ "x": 166,
+ "y": 257,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "f3000999.b457c8"
+ "34cf59af.6236f6"
]
]
},
{
- "id": "f3000999.b457c8",
+ "id": "34cf59af.6236f6",
"type": "method",
"name": "method getA1Policy",
"xml": "<method rpc='getA1Policy' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 206,
- "y": 271,
- "z": "545d3747.09bc48",
+ "x": 225,
+ "y": 378,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "fd6ab97c.15c398"
+ "d016778f.76d178"
]
]
},
{
- "id": "b0630652.2b2fd8",
+ "id": "237a560f.9552ba",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-input.near-rt-ric-url`\"/>",
"comments": "",
"outputs": 1,
- "x": 667,
- "y": 72,
- "z": "545d3747.09bc48",
+ "x": 686,
+ "y": 179,
+ "z": "f36dd077.0bd7e",
"wires": [
[]
]
},
{
- "id": "fd6ab97c.15c398",
+ "id": "d016778f.76d178",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 411,
- "y": 225,
- "z": "545d3747.09bc48",
+ "x": 430,
+ "y": 332,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "b0630652.2b2fd8",
- "4adbc81e.0b0048",
- "4fe0b14e.770ba",
- "edc9dec.2ed5c2",
- "b199f172.85d81"
+ "237a560f.9552ba",
+ "88a7e3f8.aef34",
+ "fa770c9c.fa8f4",
+ "b82e4819.e59fa8",
+ "3c47174a.181888"
]
]
},
{
- "id": "f5e8f571.ccf0c8",
+ "id": "48fb0377.e5bbdc",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 78,
- "y": 87,
- "z": "545d3747.09bc48",
+ "x": 97,
+ "y": 194,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "6b8e8ac6.27c604"
+ "10e97b34.bcf315"
]
]
},
{
- "id": "b199f172.85d81",
+ "id": "3c47174a.181888",
"type": "set",
"name": "set default status value",
"xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get A1 Policy executed successfully' />",
"comments": "",
- "x": 711.0000610351562,
- "y": 140,
- "z": "545d3747.09bc48",
+ "x": 730.0000610351562,
+ "y": 247,
+ "z": "f36dd077.0bd7e",
"wires": []
},
{
- "id": "4adbc81e.0b0048",
+ "id": "88a7e3f8.aef34",
"type": "execute",
"name": "execute Properties",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 710,
- "y": 193,
- "z": "545d3747.09bc48",
+ "x": 729,
+ "y": 300,
+ "z": "f36dd077.0bd7e",
"wires": [
[]
]
},
{
- "id": "edc9dec.2ed5c2",
+ "id": "b82e4819.e59fa8",
"type": "block",
"name": "A1 Mediator RestAPI Invocation",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 740.0001220703125,
- "y": 277,
- "z": "545d3747.09bc48",
+ "x": 759.0001220703125,
+ "y": 384,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "39a6720a.10988e",
- "33dfeef0.7d5242",
- "7a4641c.b4572c",
- "df6fc431.781608"
+ "8c55c732.d89748",
+ "ad49f33b.d3377",
+ "8027c342.f7a8",
+ "fcd99fa2.71eae"
]
]
},
{
- "id": "33dfeef0.7d5242",
+ "id": "ad49f33b.d3377",
"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`\"/>",
+ "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": 1111.00146484375,
- "y": 71.88912963867188,
- "z": "545d3747.09bc48",
+ "x": 1138.00146484375,
+ "y": 256.8891296386719,
+ "z": "f36dd077.0bd7e",
"wires": []
},
{
- "id": "39a6720a.10988e",
+ "id": "8c55c732.d89748",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Instance.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
"comments": "",
"outputs": 1,
- "x": 996.0001220703125,
- "y": 276,
- "z": "545d3747.09bc48",
+ "x": 1019.0001220703125,
+ "y": 456,
+ "z": "f36dd077.0bd7e",
"wires": [
[]
]
},
{
- "id": "7a4641c.b4572c",
+ "id": "8027c342.f7a8",
"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\"/>",
+ "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": 1029.0006103515625,
- "y": 424.0104064941406,
- "z": "545d3747.09bc48",
+ "x": 1048.0006103515625,
+ "y": 531.0104064941406,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "928c2359.89c87",
- "db81e29d.785cf"
+ "9897b12a.32ced",
+ "e71419ff.61bbb8"
]
]
},
{
- "id": "928c2359.89c87",
+ "id": "9897b12a.32ced",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1239,
- "y": 522.0001220703125,
- "z": "545d3747.09bc48",
+ "x": 1258,
+ "y": 629.0001220703125,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "5dfae475.8705bc"
+ "1c9ae028.670bf"
]
]
},
{
- "id": "db81e29d.785cf",
+ "id": "e71419ff.61bbb8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1246.000244140625,
- "y": 423.0000305175781,
- "z": "545d3747.09bc48",
+ "x": 1265.000244140625,
+ "y": 530.0000305175781,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "26c1647d.47560c"
+ "afc5b777.009a08"
]
]
},
{
- "id": "c3778115.31514",
+ "id": "f3898b18.20aed8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
- "x": 1563.0006103515625,
- "y": 632.0000610351562,
- "z": "545d3747.09bc48",
+ "x": 1582.0006103515625,
+ "y": 739.0000610351562,
+ "z": "f36dd077.0bd7e",
"wires": []
},
{
- "id": "26c1647d.47560c",
+ "id": "afc5b777.009a08",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1402.9998779296875,
- "y": 422.00006103515625,
- "z": "545d3747.09bc48",
+ "x": 1421.9998779296875,
+ "y": 529.0000610351562,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "dc2efa73.54ac98",
- "64acc423.194b8c",
- "a368a134.d9d3"
+ "9ba38f90.43984",
+ "5c8a496b.1d4158",
+ "7164a263.76f1bc"
]
]
},
{
- "id": "dc2efa73.54ac98",
+ "id": "9ba38f90.43984",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information \"/>\n<parameter name=\"field2\" value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>\n<parameter name='field3' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='field4' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
"outputs": 1,
- "x": 1554,
- "y": 420,
- "z": "545d3747.09bc48",
+ "x": 1573,
+ "y": 527,
+ "z": "f36dd077.0bd7e",
"wires": [
[]
]
},
{
- "id": "352d49a0.502856",
+ "id": "2fae5a38.614356",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
- "x": 1553.75390625,
- "y": 548.00390625,
- "z": "545d3747.09bc48",
+ "x": 1572.75390625,
+ "y": 655.00390625,
+ "z": "f36dd077.0bd7e",
"wires": []
},
{
- "id": "4fe0b14e.770ba",
+ "id": "fa770c9c.fa8f4",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 673.75390625,
- "y": 449.00390625,
- "z": "545d3747.09bc48",
+ "x": 692.75390625,
+ "y": 556.00390625,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "2868e6a6.21dd1a"
+ "f52c3841.f4dc38"
]
]
},
{
- "id": "2868e6a6.21dd1a",
+ "id": "f52c3841.f4dc38",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get PolicyInstance executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
"comments": "",
- "x": 834.7539672851562,
- "y": 449.00396728515625,
- "z": "545d3747.09bc48",
+ "x": 853.7539672851562,
+ "y": 556.0039672851562,
+ "z": "f36dd077.0bd7e",
"wires": []
},
{
- "id": "5dfae475.8705bc",
+ "id": "1c9ae028.670bf",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1399.00390625,
- "y": 586.00390625,
- "z": "545d3747.09bc48",
+ "x": 1418.00390625,
+ "y": 693.00390625,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "352d49a0.502856",
- "c3778115.31514"
+ "2fae5a38.614356",
+ "f3898b18.20aed8"
]
]
},
{
- "id": "64acc423.194b8c",
+ "id": "5c8a496b.1d4158",
"type": "execute",
"name": "set",
"xml": "<set>\n<parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
"outputs": 1,
- "x": 1554,
- "y": 465,
- "z": "545d3747.09bc48",
+ "x": 1573,
+ "y": 572,
+ "z": "f36dd077.0bd7e",
"wires": [
[]
]
},
{
- "id": "a368a134.d9d3",
+ "id": "7164a263.76f1bc",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n <parameter name=\"target\" value=\"\\n\"/>\n <parameter name=\"replacement\" value=\"\"/>",
"comments": "",
"outputs": 1,
- "x": 1559,
- "y": 371,
- "z": "545d3747.09bc48",
+ "x": 1578,
+ "y": 478,
+ "z": "f36dd077.0bd7e",
"wires": [
[]
]
},
{
- "id": "df6fc431.781608",
+ "id": "fcd99fa2.71eae",
"type": "block",
- "name": "block Substitute proxy address if available",
+ "name": "block check if proxy address is available",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1116,
- "y": 185,
- "z": "545d3747.09bc48",
+ "x": 1132,
+ "y": 329,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "1289f0de.0acddf",
- "3504c3f2.901f0c",
- "4102f074.51249"
+ "682992.2dd0967"
]
]
},
{
- "id": "1289f0de.0acddf",
- "type": "set",
- "name": "set tmp url variables with proxy information",
- "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
- "comments": "",
- "x": 1518,
- "y": 62,
- "z": "545d3747.09bc48",
- "wires": []
- },
- {
- "id": "3504c3f2.901f0c",
+ "id": "74ebffed.36e5d",
"type": "record",
"name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
- "comments": "",
- "outputs": 1,
- "x": 1401,
- "y": 137,
- "z": "545d3747.09bc48",
- "wires": [
- []
- ]
- },
- {
- "id": "8911bb5d.b025b8",
- "type": "execute",
- "name": "split near-rt-ric URL",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n <parameter name=\"regex\" value=\"/\"/>\n <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
+ "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": 1950,
- "y": 219,
- "z": "545d3747.09bc48",
+ "x": 1751,
+ "y": 360,
+ "z": "f36dd077.0bd7e",
"wires": [
[]
]
},
{
- "id": "e6ae7ab5.9009e8",
- "type": "for",
- "name": "for",
- "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
- "comments": "",
- "outputs": 1,
- "x": 1916,
- "y": 289,
- "z": "545d3747.09bc48",
- "wires": [
- [
- "a8f7d018.65cc3"
- ]
- ]
- },
- {
- "id": "a8f7d018.65cc3",
- "type": "execute",
- "name": "set concat url",
- "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 2094,
- "y": 289,
- "z": "545d3747.09bc48",
- "wires": [
- []
- ]
- },
- {
- "id": "d03c0ffe.7fff9",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
- "comments": "",
- "outputs": 1,
- "x": 1916,
- "y": 352,
- "z": "545d3747.09bc48",
- "wires": [
- []
- ]
- },
- {
- "id": "4102f074.51249",
+ "id": "682992.2dd0967",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$tmp.proxy-url`'>\n",
"comments": "",
"outputs": 1,
- "x": 1400,
- "y": 220,
- "z": "545d3747.09bc48",
+ "x": 1419,
+ "y": 327,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "442627aa.ecfb28",
- "7f1b2e0f.e847e"
+ "1ffdd50c.057bdb",
+ "dcf5e334.20da6"
]
]
},
{
- "id": "442627aa.ecfb28",
+ "id": "1ffdd50c.057bdb",
"type": "outcome",
"name": "No proxy URL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1579,
- "y": 186,
- "z": "545d3747.09bc48",
+ "x": 1598,
+ "y": 293,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "3c8e8474.1813cc"
+ "5af6fc8b.6b28b4"
]
]
},
{
- "id": "3c8e8474.1813cc",
+ "id": "5af6fc8b.6b28b4",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Information: No proxy found on properties file \"/>\n",
"comments": "",
"outputs": 1,
- "x": 1747,
- "y": 186,
- "z": "545d3747.09bc48",
+ "x": 1766,
+ "y": 293,
+ "z": "f36dd077.0bd7e",
"wires": [
[]
]
},
{
- "id": "7f1b2e0f.e847e",
+ "id": "dcf5e334.20da6",
"type": "outcome",
"name": "Otherwise",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1575,
- "y": 254,
- "z": "545d3747.09bc48",
+ "x": 1594,
+ "y": 361,
+ "z": "f36dd077.0bd7e",
"wires": [
[
- "39d6481.0e40eb8"
+ "74ebffed.36e5d"
]
]
- },
- {
- "id": "39d6481.0e40eb8",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1739,
- "y": 254,
- "z": "545d3747.09bc48",
- "wires": [
- [
- "8911bb5d.b025b8",
- "e6ae7ab5.9009e8",
- "d03c0ffe.7fff9",
- "958535d2.70fcf8"
- ]
- ]
- },
- {
- "id": "958535d2.70fcf8",
- "type": "set",
- "name": "set variables for A1 Mediator with proxy url",
- "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
- "comments": "",
- "x": 2026,
- "y": 413,
- "z": "545d3747.09bc48",
- "wires": []
}
] \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json
index 5ae0f374..2a6c92c7 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": "1f03ae12.22b482",
+ "id": "7c350fad.38b66",
"type": "service-logic",
"name": "A1-ADAPTER-API ${project.version}",
"module": "A1-ADAPTER-API",
@@ -8,521 +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": 162,
- "y": 133,
- "z": "82264c28.fa865",
+ "x": 177,
+ "y": 218,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "8bd7382e.5951c8"
+ "19b27448.2b723c"
]
]
},
{
- "id": "8bd7382e.5951c8",
+ "id": "19b27448.2b723c",
"type": "method",
"name": "method getA1PolicyStatus",
"xml": "<method rpc='getA1PolicyStatus' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 221,
- "y": 254,
- "z": "82264c28.fa865",
+ "x": 236,
+ "y": 339,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "79d72e28.bcc54"
+ "310cf291.4f5d3e"
]
]
},
{
- "id": "e61b6ee5.b949b",
+ "id": "83efabcd.4dd618",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-status-input.near-rt-ric-url`\"/>",
"comments": "",
"outputs": 1,
- "x": 685,
- "y": 68,
- "z": "82264c28.fa865",
+ "x": 700,
+ "y": 153,
+ "z": "4625f4a8.985c2c",
"wires": [
[]
]
},
{
- "id": "79d72e28.bcc54",
+ "id": "310cf291.4f5d3e",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 426,
- "y": 208,
- "z": "82264c28.fa865",
+ "x": 441,
+ "y": 293,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "e61b6ee5.b949b",
- "577dc417.5a651c",
- "7cb48c00.8ced04",
- "eee487dc.9ea2f8",
- "57df804c.8c393"
+ "83efabcd.4dd618",
+ "9d749d26.ebe4a",
+ "ddb1f38.9ac071",
+ "2570c18d.2d6dee",
+ "7e2d427e.fb9bbc"
]
]
},
{
- "id": "bfa9b29.612d95",
+ "id": "701d74fb.dfe40c",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 93,
- "y": 70,
- "z": "82264c28.fa865",
+ "x": 108,
+ "y": 155,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "1f03ae12.22b482"
+ "7c350fad.38b66"
]
]
},
{
- "id": "57df804c.8c393",
+ "id": "7e2d427e.fb9bbc",
"type": "set",
"name": "set default status value",
"xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get A1 Policy executed successfully' />",
"comments": "",
- "x": 726.0000610351562,
- "y": 123,
- "z": "82264c28.fa865",
+ "x": 741.0000610351562,
+ "y": 208,
+ "z": "4625f4a8.985c2c",
"wires": []
},
{
- "id": "577dc417.5a651c",
+ "id": "9d749d26.ebe4a",
"type": "execute",
"name": "execute Properties",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 725,
- "y": 176,
- "z": "82264c28.fa865",
+ "x": 740,
+ "y": 261,
+ "z": "4625f4a8.985c2c",
"wires": [
[]
]
},
{
- "id": "eee487dc.9ea2f8",
+ "id": "2570c18d.2d6dee",
"type": "block",
"name": "A1 Mediator RestAPI Invocation",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 755.0001220703125,
- "y": 260,
- "z": "82264c28.fa865",
+ "x": 770.0001220703125,
+ "y": 345,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "95f961b6.beecd",
- "a037b233.bd226",
- "64616aa3.fae654",
- "321db38.935fb4c"
+ "1d60f60b.a9b00a",
+ "3d73b30b.b1f39c",
+ "88733351.38598",
+ "e804fc09.010ed"
]
]
},
{
- "id": "a037b233.bd226",
+ "id": "3d73b30b.b1f39c",
"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`\"/>",
+ "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": 1128.00146484375,
- "y": 157.88912963867188,
- "z": "82264c28.fa865",
+ "x": 1143.00146484375,
+ "y": 242.88912963867188,
+ "z": "4625f4a8.985c2c",
"wires": []
},
{
- "id": "95f961b6.beecd",
+ "id": "1d60f60b.a9b00a",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Status.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
"comments": "",
"outputs": 1,
- "x": 1005.0001220703125,
- "y": 336,
- "z": "82264c28.fa865",
+ "x": 1020.0001220703125,
+ "y": 421,
+ "z": "4625f4a8.985c2c",
"wires": [
[]
]
},
{
- "id": "64616aa3.fae654",
+ "id": "88733351.38598",
"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\"/>",
+ "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": 1069.0006103515625,
- "y": 464.0103759765625,
- "z": "82264c28.fa865",
+ "x": 1084.0006103515625,
+ "y": 549.0103759765625,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "c0ddbe62.cabd8",
- "c22e34cd.633688"
+ "d2d7b31.70bc05",
+ "819e4409.feff38"
]
]
},
{
- "id": "c0ddbe62.cabd8",
+ "id": "d2d7b31.70bc05",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1293,
- "y": 544.0001220703125,
- "z": "82264c28.fa865",
+ "x": 1308,
+ "y": 629.0001220703125,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "4c3581c9.8dd8c"
+ "84aea1ff.acb6c"
]
]
},
{
- "id": "c22e34cd.633688",
+ "id": "819e4409.feff38",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1297.000244140625,
- "y": 390.0000305175781,
- "z": "82264c28.fa865",
+ "x": 1312.000244140625,
+ "y": 475.0000305175781,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "731c889.917be78"
+ "c9d3e245.debc5"
]
]
},
{
- "id": "81538b07.beae38",
+ "id": "6a999bcc.eb2b74",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
- "x": 1600.0006103515625,
- "y": 599.0000610351562,
- "z": "82264c28.fa865",
+ "x": 1615.0006103515625,
+ "y": 684.0000610351562,
+ "z": "4625f4a8.985c2c",
"wires": []
},
{
- "id": "731c889.917be78",
+ "id": "c9d3e245.debc5",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1440.9998779296875,
- "y": 390.00006103515625,
- "z": "82264c28.fa865",
+ "x": 1455.9998779296875,
+ "y": 475.00006103515625,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "ad128057.33ef5",
- "622953f6.7f580c",
- "3768e233.b0e54e"
+ "1154b965.2bce37",
+ "4a098571.4acf5c",
+ "ce829e00.7d38f"
]
]
},
{
- "id": "ad128057.33ef5",
+ "id": "1154b965.2bce37",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Get Policy Status \"/>\n<parameter name=\"field2\" value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>\n<parameter name='field3' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='field4' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
"outputs": 1,
- "x": 1602,
- "y": 389,
- "z": "82264c28.fa865",
+ "x": 1617,
+ "y": 474,
+ "z": "4625f4a8.985c2c",
"wires": [
[]
]
},
{
- "id": "d1a2e2f7.325b4",
+ "id": "875ba0c0.31d41",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>\n",
"comments": "",
- "x": 1573.75390625,
- "y": 492.00390625,
- "z": "82264c28.fa865",
+ "x": 1588.75390625,
+ "y": 577.00390625,
+ "z": "4625f4a8.985c2c",
"wires": []
},
{
- "id": "7cb48c00.8ced04",
+ "id": "ddb1f38.9ac071",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 688.75390625,
- "y": 480.00390625,
- "z": "82264c28.fa865",
+ "x": 703.75390625,
+ "y": 565.00390625,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "d4ec5ef4.1fe0c"
+ "76ed31f9.64a93"
]
]
},
{
- "id": "d4ec5ef4.1fe0c",
+ "id": "76ed31f9.64a93",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Get Policy Status executed successfully'/>\n<parameter name='ack-final' value='Y'/>\n",
"comments": "",
- "x": 849.7539672851562,
- "y": 480.00396728515625,
- "z": "82264c28.fa865",
+ "x": 864.7539672851562,
+ "y": 565.0039672851562,
+ "z": "4625f4a8.985c2c",
"wires": []
},
{
- "id": "4c3581c9.8dd8c",
+ "id": "84aea1ff.acb6c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1432.00390625,
- "y": 544.0039367675781,
- "z": "82264c28.fa865",
+ "x": 1447.00390625,
+ "y": 629.0039367675781,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "d1a2e2f7.325b4",
- "81538b07.beae38"
+ "875ba0c0.31d41",
+ "6a999bcc.eb2b74"
]
]
},
{
- "id": "622953f6.7f580c",
+ "id": "4a098571.4acf5c",
"type": "execute",
"name": "set",
"xml": "<set>\n<parameter name='responseBody' value='`$tmp.a1-mediator-restapi.httpResponse`'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
"outputs": 1,
- "x": 1604,
- "y": 440,
- "z": "82264c28.fa865",
+ "x": 1619,
+ "y": 525,
+ "z": "4625f4a8.985c2c",
"wires": [
[]
]
},
{
- "id": "3768e233.b0e54e",
+ "id": "ce829e00.7d38f",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n <parameter name=\"target\" value=\"\\n\"/>\n <parameter name=\"replacement\" value=\"\"/>",
"comments": "",
"outputs": 1,
- "x": 1606,
- "y": 346,
- "z": "82264c28.fa865",
+ "x": 1621,
+ "y": 431,
+ "z": "4625f4a8.985c2c",
"wires": [
[]
]
},
{
- "id": "54b03a04.8e9294",
- "type": "execute",
- "name": "split near-rt-ric URL",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n <parameter name=\"regex\" value=\"/\"/>\n <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
- "comments": "",
- "outputs": 1,
- "x": 1984,
- "y": 238,
- "z": "82264c28.fa865",
- "wires": [
- []
- ]
- },
- {
- "id": "15d0daec.fa9565",
- "type": "for",
- "name": "for",
- "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
- "comments": "",
- "outputs": 1,
- "x": 1950,
- "y": 308,
- "z": "82264c28.fa865",
- "wires": [
- [
- "b8eadff3.5b547"
- ]
- ]
- },
- {
- "id": "b8eadff3.5b547",
- "type": "execute",
- "name": "set concat url",
- "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 2128,
- "y": 308,
- "z": "82264c28.fa865",
- "wires": [
- []
- ]
- },
- {
- "id": "403fcfda.caf91",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
- "comments": "",
- "outputs": 1,
- "x": 1950,
- "y": 371,
- "z": "82264c28.fa865",
- "wires": [
- []
- ]
- },
- {
- "id": "b78a829f.08531",
+ "id": "5fb0527b.74655c",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status: No proxy found on properties file \"/>\n",
"comments": "",
"outputs": 1,
- "x": 1781,
- "y": 205,
- "z": "82264c28.fa865",
+ "x": 1796,
+ "y": 290,
+ "z": "4625f4a8.985c2c",
"wires": [
[]
]
},
{
- "id": "a39978a8.b502b8",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1773,
- "y": 273,
- "z": "82264c28.fa865",
- "wires": [
- [
- "54b03a04.8e9294",
- "15d0daec.fa9565",
- "403fcfda.caf91",
- "10e3a2b.3a8635d"
- ]
- ]
- },
- {
- "id": "10e3a2b.3a8635d",
- "type": "set",
- "name": "set variables for A1 Mediator with proxy url",
- "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
- "comments": "",
- "x": 2060,
- "y": 432,
- "z": "82264c28.fa865",
- "wires": []
- },
- {
- "id": "c2e7e2c1.1efa3",
+ "id": "aa63c9cd.555b38",
"type": "outcome",
"name": "Otherwise",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1609,
- "y": 273,
- "z": "82264c28.fa865",
+ "x": 1624,
+ "y": 358,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "a39978a8.b502b8"
+ "2a68aa17.88a926"
]
]
},
{
- "id": "351e35ee.b9fb4a",
+ "id": "337f8172.242f2e",
"type": "outcome",
"name": "No proxy URL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1613,
- "y": 205,
- "z": "82264c28.fa865",
+ "x": 1628,
+ "y": 290,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "b78a829f.08531"
+ "5fb0527b.74655c"
]
]
},
{
- "id": "b187a08d.4a91",
+ "id": "124eb317.931f9d",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$tmp.proxy-url`'>\n",
"comments": "",
"outputs": 1,
- "x": 1434,
- "y": 239,
- "z": "82264c28.fa865",
+ "x": 1449,
+ "y": 324,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "351e35ee.b9fb4a",
- "c2e7e2c1.1efa3"
+ "337f8172.242f2e",
+ "aa63c9cd.555b38"
]
]
},
{
- "id": "762e23e5.f9bb9c",
+ "id": "2a68aa17.88a926",
"type": "record",
"name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get A1 Policy Status: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+ "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": 1435,
- "y": 156,
- "z": "82264c28.fa865",
+ "x": 1778,
+ "y": 359,
+ "z": "4625f4a8.985c2c",
"wires": [
[]
]
},
{
- "id": "eec4f452.eb64e8",
- "type": "set",
- "name": "set tmp url variables with proxy information",
- "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
- "comments": "",
- "x": 1552,
- "y": 81,
- "z": "82264c28.fa865",
- "wires": []
- },
- {
- "id": "321db38.935fb4c",
+ "id": "e804fc09.010ed",
"type": "block",
- "name": "block Substitute proxy address if available",
+ "name": "block check if proxy address is available",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1107,
- "y": 246,
- "z": "82264c28.fa865",
+ "x": 1122,
+ "y": 326,
+ "z": "4625f4a8.985c2c",
"wires": [
[
- "eec4f452.eb64e8",
- "762e23e5.f9bb9c",
- "b187a08d.4a91"
+ "124eb317.931f9d"
]
]
}
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 144a1b7b..d72ef917 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": "8c265fc3.6b9c2",
+ "id": "2f4671b1.4a364e",
"type": "service-logic",
"name": "A1-ADAPTER-API ${project.version}",
"module": "A1-ADAPTER-API",
@@ -8,521 +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": 150,
- "y": 146.11087036132812,
- "z": "6e7c5307.c398cc",
+ "x": 173,
+ "y": 202.11087036132812,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "6e5c6f18.9dc93"
+ "74d6a6f.e349e58"
]
]
},
{
- "id": "6e5c6f18.9dc93",
+ "id": "74d6a6f.e349e58",
"type": "method",
"name": "method getA1PolicyType",
"xml": "<method rpc='getA1PolicyType' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 213.00000762939453,
- "y": 269.1108798980713,
- "z": "6e7c5307.c398cc",
+ "x": 236.00000762939453,
+ "y": 325.1108798980713,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "de58383c.7e1718"
+ "f761005e.026d4"
]
]
},
{
- "id": "ae2a0098.f258c",
+ "id": "ded0e1ed.d90b8",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get Policy Type:\"/>\n<parameter name=\"field2\" value=\"`$get-a1-policy-type-input.near-rt-ric-url`\"/>",
"comments": "",
"outputs": 1,
- "x": 678.0000267028809,
- "y": 82.11086940765381,
- "z": "6e7c5307.c398cc",
+ "x": 701.0000267028809,
+ "y": 138.1108694076538,
+ "z": "1f7e4863.a496f8",
"wires": [
[]
]
},
{
- "id": "de58383c.7e1718",
+ "id": "f761005e.026d4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 416,
- "y": 220.11087036132812,
- "z": "6e7c5307.c398cc",
+ "x": 439,
+ "y": 276.1108703613281,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "ae2a0098.f258c",
- "53b03c05.963dc4",
- "fa97dc4d.7c138",
- "746426a9.66e6a8",
- "da98d4e7.a42728"
+ "ded0e1ed.d90b8",
+ "2baff500.547f5c",
+ "fe3000ed.24c2b",
+ "16444abc.b89ea5",
+ "8cd7c8b3.03d4d8"
]
]
},
{
- "id": "8f9cdc00.4e19c8",
+ "id": "a30ec915.db69b8",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 83,
- "y": 82.11087036132812,
- "z": "6e7c5307.c398cc",
+ "x": 106,
+ "y": 138.11087036132812,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "8c265fc3.6b9c2"
+ "2f4671b1.4a364e"
]
]
},
{
- "id": "53b03c05.963dc4",
+ "id": "2baff500.547f5c",
"type": "set",
"name": "set default status value",
"xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='getA1PolicyType executed successfully' />",
"comments": "",
- "x": 715.0001068115234,
- "y": 135.1108684539795,
- "z": "6e7c5307.c398cc",
+ "x": 738.0001068115234,
+ "y": 191.1108684539795,
+ "z": "1f7e4863.a496f8",
"wires": []
},
{
- "id": "fa97dc4d.7c138",
+ "id": "fe3000ed.24c2b",
"type": "execute",
"name": "execute Properties",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 715,
- "y": 188.11087036132812,
- "z": "6e7c5307.c398cc",
+ "x": 738,
+ "y": 244.11087036132812,
+ "z": "1f7e4863.a496f8",
"wires": [
[]
]
},
{
- "id": "da98d4e7.a42728",
+ "id": "8cd7c8b3.03d4d8",
"type": "block",
"name": "A1 Mediator RestAPI Invocation",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 739.0001525878906,
- "y": 274.11086416244507,
- "z": "6e7c5307.c398cc",
+ "x": 762.0001525878906,
+ "y": 330.11086416244507,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "9c119178.a1023",
- "41a9420e.fea09c",
- "26bb74a4.cb368c",
- "8c9e0855.a2d458"
+ "176964cc.05c21b",
+ "a874e667.eb9a98",
+ "f71606ee.f54688",
+ "63821578.3e8abc"
]
]
},
{
- "id": "9c119178.a1023",
+ "id": "176964cc.05c21b",
"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`\"/>",
+ "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": 1129.00146484375,
- "y": 77,
- "z": "6e7c5307.c398cc",
+ "x": 1149.00146484375,
+ "y": 225,
+ "z": "1f7e4863.a496f8",
"wires": []
},
{
- "id": "41a9420e.fea09c",
+ "id": "a874e667.eb9a98",
"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\"/>",
+ "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": 1025.0006103515625,
- "y": 448.1212463378906,
- "z": "6e7c5307.c398cc",
+ "x": 1048.0006103515625,
+ "y": 504.1212463378906,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "e1975678.7e4028",
- "5c4ab5f9.8d989c"
+ "526251db.acb75",
+ "6f33632a.dc1fac"
]
]
},
{
- "id": "e1975678.7e4028",
+ "id": "526251db.acb75",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1206.0000610351562,
- "y": 506.1109890937805,
- "z": "6e7c5307.c398cc",
+ "x": 1229.0000610351562,
+ "y": 562.1109890937805,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "1085e0df.71c62f"
+ "b5ba372c.92ad48"
]
]
},
{
- "id": "5c4ab5f9.8d989c",
+ "id": "6f33632a.dc1fac",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1207.0002136230469,
- "y": 402.11088848114014,
- "z": "6e7c5307.c398cc",
+ "x": 1230.0002136230469,
+ "y": 458.11088848114014,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "1dcf580c.db4cb8"
+ "3914e552.85e15a"
]
]
},
{
- "id": "44796ff4.052ba",
+ "id": "fef8b587.543ac8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
- "x": 1495.0006103515625,
- "y": 540.1109924316406,
- "z": "6e7c5307.c398cc",
+ "x": 1518.0006103515625,
+ "y": 596.1109924316406,
+ "z": "1f7e4863.a496f8",
"wires": []
},
{
- "id": "1dcf580c.db4cb8",
+ "id": "3914e552.85e15a",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1370.9998779296875,
- "y": 376.1109313964844,
- "z": "6e7c5307.c398cc",
+ "x": 1393.9998779296875,
+ "y": 432.1109313964844,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "93fea594.fd7eb8",
- "bae47d21.8afde",
- "e3f3a0ff.75db5"
+ "a2b706cb.13b4b8",
+ "90dda7a5.529068",
+ "85fe9dc4.e41ff"
]
]
},
{
- "id": "93fea594.fd7eb8",
+ "id": "a2b706cb.13b4b8",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Policy Type Information \"/>\n<parameter name=\"field2\" value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>\n<parameter name='field3' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='field4' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
"outputs": 1,
- "x": 1542.9999694824219,
- "y": 380.11084842681885,
- "z": "6e7c5307.c398cc",
+ "x": 1565.9999694824219,
+ "y": 436.11084842681885,
+ "z": "1f7e4863.a496f8",
"wires": [
[]
]
},
{
- "id": "b3f7367b.d92278",
+ "id": "e91418e5.8658e8",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>\n",
"comments": "",
- "x": 1477.75390625,
- "y": 480.11480712890625,
- "z": "6e7c5307.c398cc",
+ "x": 1500.75390625,
+ "y": 536.1148071289062,
+ "z": "1f7e4863.a496f8",
"wires": []
},
{
- "id": "746426a9.66e6a8",
+ "id": "16444abc.b89ea5",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 662.7539367675781,
- "y": 541.1148681640625,
- "z": "6e7c5307.c398cc",
+ "x": 685.7539367675781,
+ "y": 597.1148681640625,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "ba0df99.5bb8508"
+ "35da5f95.df0a6"
]
]
},
{
- "id": "ba0df99.5bb8508",
+ "id": "35da5f95.df0a6",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 Adapter is healthy'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>\n",
"comments": "",
- "x": 877.7540283203125,
- "y": 541.1148071289062,
- "z": "6e7c5307.c398cc",
+ "x": 900.7540283203125,
+ "y": 597.1148071289062,
+ "z": "1f7e4863.a496f8",
"wires": []
},
{
- "id": "1085e0df.71c62f",
+ "id": "b5ba372c.92ad48",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1334.0039367675781,
- "y": 508.1147885322571,
- "z": "6e7c5307.c398cc",
+ "x": 1357.0039367675781,
+ "y": 564.1147885322571,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "44796ff4.052ba",
- "b3f7367b.d92278"
+ "fef8b587.543ac8",
+ "e91418e5.8658e8"
]
]
},
{
- "id": "26bb74a4.cb368c",
+ "id": "f71606ee.f54688",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for A1 Adapter Get Policy Type.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>",
"comments": "",
"outputs": 1,
- "x": 1000.9998779296875,
- "y": 384.1108703613281,
- "z": "6e7c5307.c398cc",
+ "x": 1023.9998779296875,
+ "y": 440.1108703613281,
+ "z": "1f7e4863.a496f8",
"wires": [
[]
]
},
{
- "id": "bae47d21.8afde",
+ "id": "90dda7a5.529068",
"type": "execute",
"name": "set",
"xml": "<set>\n<parameter name='responseBody' value=\"`$tmp.a1-mediator-restapi.httpResponse`\"/>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
"outputs": 1,
- "x": 1544.0000915527344,
- "y": 435.1108589172363,
- "z": "6e7c5307.c398cc",
+ "x": 1567.0000915527344,
+ "y": 491.1108589172363,
+ "z": "1f7e4863.a496f8",
"wires": [
[]
]
},
{
- "id": "e3f3a0ff.75db5",
+ "id": "85fe9dc4.e41ff",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\n <parameter name=\"source\" value=\"`$a1MediatorRsp.httpResponse`\"/>\n <parameter name=\"outputPath\" value=\"tmp.a1-mediator-restapi.httpResponse\"/>\n <parameter name=\"target\" value=\"\\n\"/>\n <parameter name=\"replacement\" value=\"\"/>",
"comments": "",
"outputs": 1,
- "x": 1545.9999694824219,
- "y": 331.11084842681885,
- "z": "6e7c5307.c398cc",
- "wires": [
- []
- ]
- },
- {
- "id": "649cc87b.b1d558",
- "type": "execute",
- "name": "split near-rt-ric URL",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n <parameter name=\"regex\" value=\"/\"/>\n <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
- "comments": "",
- "outputs": 1,
- "x": 2080,
- "y": 174.11087036132812,
- "z": "6e7c5307.c398cc",
- "wires": [
- []
- ]
- },
- {
- "id": "ff7f26f0.209c88",
- "type": "for",
- "name": "for",
- "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
- "comments": "",
- "outputs": 1,
- "x": 2046,
- "y": 244.11087036132812,
- "z": "6e7c5307.c398cc",
- "wires": [
- [
- "9714621a.586e5"
- ]
- ]
- },
- {
- "id": "9714621a.586e5",
- "type": "execute",
- "name": "set concat url",
- "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 2224,
- "y": 244.11087036132812,
- "z": "6e7c5307.c398cc",
+ "x": 1568.9999694824219,
+ "y": 387.11084842681885,
+ "z": "1f7e4863.a496f8",
"wires": [
[]
]
},
{
- "id": "40760e50.fa874",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get Policy Type: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
- "comments": "",
- "outputs": 1,
- "x": 2046,
- "y": 301.1108703613281,
- "z": "6e7c5307.c398cc",
- "wires": [
- []
- ]
- },
- {
- "id": "25cac3e6.2bbd4c",
+ "id": "46ef0e6f.ac078",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get Policy Type: No proxy found on properties file \"/>\n",
"comments": "",
"outputs": 1,
- "x": 1850,
- "y": 210.11087036132812,
- "z": "6e7c5307.c398cc",
+ "x": 1745,
+ "y": 258.1108703613281,
+ "z": "1f7e4863.a496f8",
"wires": [
[]
]
},
{
- "id": "f41d0523.4fd778",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1842,
- "y": 278.1108703613281,
- "z": "6e7c5307.c398cc",
- "wires": [
- [
- "649cc87b.b1d558",
- "ff7f26f0.209c88",
- "40760e50.fa874",
- "b59bb4c8.e299f8"
- ]
- ]
- },
- {
- "id": "b59bb4c8.e299f8",
- "type": "set",
- "name": "set variables for A1 Mediator with proxy url",
- "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
- "comments": "",
- "x": 2156,
- "y": 357.1108703613281,
- "z": "6e7c5307.c398cc",
- "wires": []
- },
- {
- "id": "7dffc679.74af28",
+ "id": "77d9a0fa.cb6ed",
"type": "outcome",
"name": "No proxy URL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1682,
- "y": 210.11087036132812,
- "z": "6e7c5307.c398cc",
+ "x": 1577,
+ "y": 258.1108703613281,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "25cac3e6.2bbd4c"
+ "46ef0e6f.ac078"
]
]
},
{
- "id": "900e04b1.441648",
+ "id": "4908d507.106ffc",
"type": "outcome",
"name": "Otherwise",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1678,
- "y": 278.1108703613281,
- "z": "6e7c5307.c398cc",
+ "x": 1573,
+ "y": 326.1108703613281,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "f41d0523.4fd778"
+ "57e4f785.2a2818"
]
]
},
{
- "id": "9b05f4ee.4d7bf8",
+ "id": "9126aa92.42c718",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$tmp.proxy-url`'>\n",
"comments": "",
"outputs": 1,
- "x": 1503,
- "y": 244.11087036132812,
- "z": "6e7c5307.c398cc",
+ "x": 1398,
+ "y": 292.1108703613281,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "7dffc679.74af28",
- "900e04b1.441648"
+ "77d9a0fa.cb6ed",
+ "4908d507.106ffc"
]
]
},
{
- "id": "105ce637.9dcaaa",
+ "id": "57e4f785.2a2818",
"type": "record",
"name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Get Policy Type: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+ "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": 1504,
- "y": 161.11087036132812,
- "z": "6e7c5307.c398cc",
+ "x": 1727,
+ "y": 326.1108703613281,
+ "z": "1f7e4863.a496f8",
"wires": [
[]
]
},
{
- "id": "b655047a.625108",
- "type": "set",
- "name": "set tmp url variables with proxy information",
- "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
- "comments": "",
- "x": 1621,
- "y": 86.11087036132812,
- "z": "6e7c5307.c398cc",
- "wires": []
- },
- {
- "id": "8c9e0855.a2d458",
+ "id": "63821578.3e8abc",
"type": "block",
"name": "block Substitute proxy address if available",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1108,
- "y": 236.11087036132812,
- "z": "6e7c5307.c398cc",
+ "x": 1131,
+ "y": 292.1108703613281,
+ "z": "1f7e4863.a496f8",
"wires": [
[
- "b655047a.625108",
- "105ce637.9dcaaa",
- "9b05f4ee.4d7bf8"
+ "9126aa92.42c718"
]
]
}
diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json
index 293d09c6..27669a90 100644
--- a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json
+++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json
@@ -1,6 +1,6 @@
[
{
- "id": "f0b343f7.2be9e",
+ "id": "6fe6315.c6a1bd",
"type": "service-logic",
"name": "A1-ADAPTER-API ${project.version}",
"module": "A1-ADAPTER-API",
@@ -8,475 +8,373 @@
"comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>",
"outputs": 1,
- "x": 171,
- "y": 158.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 177,
+ "y": 269.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "2678a73a.39c8f8"
+ "fb2e5825.9a3128"
]
]
},
{
- "id": "2678a73a.39c8f8",
+ "id": "fb2e5825.9a3128",
"type": "method",
"name": "method putA1Policy",
"xml": "<method rpc='putA1Policy' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 158,
- "y": 227.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 164,
+ "y": 338.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "d272b5cc.a1b7f8"
+ "df682f6a.462ce"
]
]
},
{
- "id": "12301d8a.e4f432",
+ "id": "915488d9.7845e8",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Put A1 Policy :\"/>\n<parameter name=\"field2\" value=\"`$put-a1-policy-input.near-rt-ric-url`\"/>\n<parameter name=\"field3\" value=\"`$put-a1-policy-input.body`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 472,
- "y": 195.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 478,
+ "y": 306.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[]
]
},
{
- "id": "d272b5cc.a1b7f8",
+ "id": "df682f6a.462ce",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 222,
- "y": 294.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 228,
+ "y": 405.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "12301d8a.e4f432",
- "bc37eadd.393f78",
- "f048e341.89262",
- "71eb89dc.50c988"
+ "915488d9.7845e8",
+ "e2505a8d.6cb778",
+ "a9158c4b.092d",
+ "d3227515.2a39c8"
]
]
},
{
- "id": "3f8d81.fa4c128",
+ "id": "7b9fa46b.caaa3c",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 99,
- "y": 96.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 105,
+ "y": 207.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "f0b343f7.2be9e"
+ "6fe6315.c6a1bd"
]
]
},
{
- "id": "bc37eadd.393f78",
+ "id": "e2505a8d.6cb778",
"type": "execute",
"name": "execute Properties",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n",
"comments": "",
"outputs": 1,
- "x": 506,
- "y": 293.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 512,
+ "y": 404.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[]
]
},
{
- "id": "7ab1678d.f80c88",
+ "id": "895a1021.a1ea2",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 988.0001220703125,
- "y": 371.1109619140625,
- "z": "4a7b9942.c07f28",
+ "x": 994.0001220703125,
+ "y": 482.1109619140625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "3fb495cc.83461a"
+ "43219d41.f548b4"
]
]
},
{
- "id": "95b564a6.d15fe8",
+ "id": "75925e3d.bab",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 995.0003051757812,
- "y": 461.11094665527344,
- "z": "4a7b9942.c07f28",
+ "x": 1001.0003051757812,
+ "y": 572.1109466552734,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "433e6f59.30f93"
+ "1675a1d6.64adbe"
]
]
},
{
- "id": "433e6f59.30f93",
+ "id": "1675a1d6.64adbe",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1136.9999389648438,
- "y": 457.1109619140625,
- "z": "4a7b9942.c07f28",
+ "x": 1143.9998779296875,
+ "y": 572.1109619140625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "7ae91a72.664794",
- "913c45bf.182ef8"
+ "c6e4bee1.82c53",
+ "d89555ac.557618"
]
]
},
{
- "id": "a42156e5.b04b38",
+ "id": "f498cd2f.096d9",
"type": "set",
"name": "set tmp variables for input RPC parms",
- "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$put-a1-policy-input.near-rt-ric-url`\"/>\n<parameter name=\"tmp.body\" value=\"`$put-a1-policy-input.body`\"/>",
+ "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$put-a1-policy-input.near-rt-ric-url`\"/>\n<parameter name=\"tmp.body\" value=\"`$put-a1-policy-input.body`\"/>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
"comments": "",
- "x": 890.0010375976562,
- "y": 20,
- "z": "4a7b9942.c07f28",
+ "x": 922.0010375976562,
+ "y": 254,
+ "z": "ef1ae006.6efce",
"wires": []
},
{
- "id": "382bcbbf.30d774",
+ "id": "adc43a9e.a48a18",
"type": "execute",
"name": "Put A1 Policy",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"PUT\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"requestBody\" value=\"`$tmp.body`\"/>\n<parameter name=\"convertResponse\" value=\"false\"/>\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"PUT\"/>\n<parameter name=\"responsePrefix\" value=\"a1MediatorRsp\"/>\n<parameter name='contentType' value='application/json' />\n<parameter name='accept' value='application/json' />\n<parameter name=\"requestBody\" value=\"`$tmp.body`\"/>\n<parameter name=\"convertResponse\" value=\"false\"/>\n<parameter name=\"proxyUrl\" value=\"`$tmp.proxy-url`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 811.00048828125,
- "y": 419.12127685546875,
- "z": "4a7b9942.c07f28",
+ "x": 817.00048828125,
+ "y": 530.1212768554688,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "7ab1678d.f80c88",
- "95b564a6.d15fe8"
+ "895a1021.a1ea2",
+ "75925e3d.bab"
]
]
},
{
- "id": "71eb89dc.50c988",
+ "id": "d3227515.2a39c8",
"type": "block",
"name": "A1 Mediator RestAPI Invocation",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 542.0000305175781,
- "y": 358.1109619140625,
- "z": "4a7b9942.c07f28",
+ "x": 548.0000305175781,
+ "y": 469.1109619140625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "33f22af5.30a6a6",
- "a42156e5.b04b38",
- "382bcbbf.30d774",
- "f58a390e.bb1448"
+ "65624437.a307ac",
+ "f498cd2f.096d9",
+ "adc43a9e.a48a18",
+ "72384bae.e338a4"
]
]
},
{
- "id": "33f22af5.30a6a6",
+ "id": "65624437.a307ac",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Setting variables for Put A1 Policy.\"/>\n<parameter name=\"field2\" value=\"`$tmp.near-rt-ric-url`\"/>\n<parameter name=\"field3\" value=\"`$tmp.body`\"/>",
"comments": "",
"outputs": 1,
- "x": 792.0000610351562,
- "y": 373.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 820.0000610351562,
+ "y": 419.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[]
]
},
{
- "id": "7ae91a72.664794",
+ "id": "c6e4bee1.82c53",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"A1 Policy Instance Created.\"/>\n<parameter name='field2' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='field3' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
"outputs": 1,
- "x": 1293,
- "y": 456.1109619140625,
- "z": "4a7b9942.c07f28",
+ "x": 1282,
+ "y": 550.1109619140625,
+ "z": "ef1ae006.6efce",
"wires": [
[]
]
},
{
- "id": "2a1d66c6.e2c83a",
+ "id": "4aa855d3.13558c",
"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": 1286,
- "y": 409.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 1292,
+ "y": 509.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": []
},
{
- "id": "f048e341.89262",
+ "id": "a9158c4b.092d",
"type": "set",
"name": "set default status value",
"xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='Put A1 Policy executed successfully' />",
"comments": "",
- "x": 517,
- "y": 248.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 523,
+ "y": 359.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": []
},
{
- "id": "3fb495cc.83461a",
+ "id": "43219d41.f548b4",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1124,
- "y": 369.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 1133,
+ "y": 482.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "2b1ad7ca.a27288",
- "2a1d66c6.e2c83a"
+ "20980396.38371c",
+ "4aa855d3.13558c"
]
]
},
{
- "id": "2b1ad7ca.a27288",
+ "id": "20980396.38371c",
"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": 1268,
- "y": 315.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 1278,
+ "y": 447.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": []
},
{
- "id": "4e18beb6.1fd51",
- "type": "execute",
- "name": "split near-rt-ric URL",
- "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n <parameter name=\"original_string\" value=\"`$tmp.near-rt-ric-url`\" />\n <parameter name=\"regex\" value=\"/\"/>\n <parameter name=\"ctx_memory_result_key\" value=\"tmp.near-rt-ric-url-splitList\"/>",
- "comments": "",
- "outputs": 1,
- "x": 1840,
- "y": 136.11090087890625,
- "z": "4a7b9942.c07f28",
- "wires": [
- []
- ]
- },
- {
- "id": "942f87e2.c78888",
- "type": "for",
- "name": "for",
- "xml": "<for index='idx' start='3' end=\"`$tmp.near-rt-ric-url-splitList_length`\" >",
- "comments": "",
- "outputs": 1,
- "x": 1806,
- "y": 206.11090087890625,
- "z": "4a7b9942.c07f28",
- "wires": [
- [
- "d1411417.1b3fd8"
- ]
- ]
- },
- {
- "id": "d1411417.1b3fd8",
- "type": "execute",
- "name": "set concat url",
- "xml": "<set>\n<parameter name='tmp.proxy-url' value=\"`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `\" />\n\n\n",
- "comments": "",
- "outputs": 1,
- "x": 1984,
- "y": 206.11090087890625,
- "z": "4a7b9942.c07f28",
- "wires": [
- []
- ]
- },
- {
- "id": "71b2d26a.47135c",
- "type": "record",
- "name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Put A1 Policy: Url with proxy: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
- "comments": "",
- "outputs": 1,
- "x": 1806,
- "y": 263.11090087890625,
- "z": "4a7b9942.c07f28",
- "wires": [
- []
- ]
- },
- {
- "id": "65d0298a.e1aef8",
+ "id": "ebc637df.f0ef88",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Put A1 Policy: No proxy found on properties file \"/>\n",
"comments": "",
"outputs": 1,
- "x": 1610,
- "y": 172.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 1616,
+ "y": 283.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[]
]
},
{
- "id": "500c1a89.8dca64",
- "type": "block",
- "name": "block",
- "xml": "<block>\n",
- "atomic": "false",
- "comments": "",
- "outputs": 1,
- "x": 1602,
- "y": 240.11090087890625,
- "z": "4a7b9942.c07f28",
- "wires": [
- [
- "4e18beb6.1fd51",
- "942f87e2.c78888",
- "71b2d26a.47135c",
- "1970005a.3ee34"
- ]
- ]
- },
- {
- "id": "1970005a.3ee34",
- "type": "set",
- "name": "set variables for A1 Mediator with proxy url",
- "xml": "<set>\n<parameter name=\"tmp.near-rt-ric-url\" value=\"`$tmp.proxy-url`\"/>",
- "comments": "",
- "x": 1916,
- "y": 319.11090087890625,
- "z": "4a7b9942.c07f28",
- "wires": []
- },
- {
- "id": "31a126f2.88900a",
+ "id": "b876b8ea.d136b8",
"type": "outcome",
"name": "No proxy URL",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1442,
- "y": 172.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 1448,
+ "y": 283.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "65d0298a.e1aef8"
+ "ebc637df.f0ef88"
]
]
},
{
- "id": "3f7e5430.1f4f6c",
+ "id": "dfb1d01a.73a1e",
"type": "outcome",
"name": "Otherwise",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1438,
- "y": 240.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 1444,
+ "y": 351.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "500c1a89.8dca64"
+ "d9a8bda2.1b53c"
]
]
},
{
- "id": "7ec42ee0.b7f28",
- "type": "set",
- "name": "set tmp url variables with proxy information",
- "xml": "<set>\n<parameter name=\"tmp.proxy-url\" value=\"`$prop.a1Mediator.proxy.url`\"/>",
- "comments": "",
- "x": 1381,
- "y": 48.11090087890625,
- "z": "4a7b9942.c07f28",
- "wires": []
- },
- {
- "id": "c930a111.4cc59",
+ "id": "d9a8bda2.1b53c",
"type": "record",
"name": "record",
- "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Put A1 Policy: Check for proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
+ "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/A1-Adapter.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Put A1 Policy: Proxy url: \"/>\n<parameter name=\"field2\" value=\"`$tmp.proxy-url`\"/>\n\n",
"comments": "",
"outputs": 1,
- "x": 1264,
- "y": 123.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 1609,
+ "y": 352.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[]
]
},
{
- "id": "bbe2ee18.70915",
+ "id": "7cba1ce8.66a944",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$tmp.proxy-url`'>\n",
"comments": "",
"outputs": 1,
- "x": 1263,
- "y": 206.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 1269,
+ "y": 317.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "31a126f2.88900a",
- "3f7e5430.1f4f6c"
+ "b876b8ea.d136b8",
+ "dfb1d01a.73a1e"
]
]
},
{
- "id": "f58a390e.bb1448",
+ "id": "72384bae.e338a4",
"type": "block",
- "name": "block Substitute proxy address if available",
+ "name": "block check if proxy address is available",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 926,
- "y": 205.11090087890625,
- "z": "4a7b9942.c07f28",
+ "x": 932,
+ "y": 316.11090087890625,
+ "z": "ef1ae006.6efce",
"wires": [
[
- "7ec42ee0.b7f28",
- "c930a111.4cc59",
- "bbe2ee18.70915"
+ "7cba1ce8.66a944"
]
]
},
{
- "id": "913c45bf.182ef8",
+ "id": "d89555ac.557618",
"type": "set",
"name": "set",
"xml": "<set>\n<parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\n<parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>",
"comments": "",
- "x": 1308,
- "y": 514,
- "z": "4a7b9942.c07f28",
+ "x": 1281,
+ "y": 598,
+ "z": "ef1ae006.6efce",
"wires": []
}
] \ No newline at end of file
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml
index 2c1e67f6..760a84da 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
@@ -20,17 +20,9 @@
<block atomic='true'>
<set>
<parameter name="tmp.near-rt-ric-url" value="`$delete-a1-policy-input.near-rt-ric-url`"/>
+ <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
</set>
<block>
- <set>
- <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
- </set>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="Delete A1 Policy: Check for proxy url: "/>
- <parameter name="field2" value="`$tmp.proxy-url`"/>
- </record>
<switch test='`$tmp.proxy-url`'>
<outcome value=''>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -40,27 +32,12 @@
</record>
</outcome>
<outcome value='Other'>
- <block>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
- <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
- <parameter name="regex" value="/"/>
- <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
- </execute>
- <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
- <set>
- <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
- </set>
- </for>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="Delete A1 Policy: Url with proxy: "/>
- <parameter name="field2" value="`$tmp.proxy-url`"/>
- </record>
- <set>
- <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
- </set>
- </block>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+ <parameter name="level" value="info" />
+ <parameter name="field1" value="Delete A1 Policy: Proxy url: "/>
+ <parameter name="field2" value="`$tmp.proxy-url`"/>
+ </record>
</outcome>
</switch>
</block>
@@ -78,6 +55,7 @@
<parameter name='contentType' value='application/json' />
<parameter name='accept' value='application/json' />
<parameter name="convertResponse" value="false"/>
+ <parameter name="proxyUrl" value="`$tmp.proxy-url`"/>
<outcome value='success'>
<block>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
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 e7d18878..5b8e46d1 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
@@ -20,17 +20,9 @@
<block atomic='true'>
<set>
<parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-input.near-rt-ric-url`"/>
+ <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
</set>
<block>
- <set>
- <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
- </set>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="A1 Get Policy Information: Check for proxy url: "/>
- <parameter name="field2" value="`$tmp.proxy-url`"/>
- </record>
<switch test='`$tmp.proxy-url`'>
<outcome value=''>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -40,27 +32,12 @@
</record>
</outcome>
<outcome value='Other'>
- <block>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
- <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
- <parameter name="regex" value="/"/>
- <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
- </execute>
- <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
- <set>
- <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
- </set>
- </for>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="A1 Get Policy Information: Url with proxy: "/>
- <parameter name="field2" value="`$tmp.proxy-url`"/>
- </record>
- <set>
- <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
- </set>
- </block>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+ <parameter name="level" value="info" />
+ <parameter name="field1" value="A1 Get Policy Information: Proxy url: "/>
+ <parameter name="field2" value="`$tmp.proxy-url`"/>
+ </record>
</outcome>
</switch>
</block>
@@ -78,6 +55,7 @@
<parameter name='contentType' value='application/json' />
<parameter name='accept' value='application/json' />
<parameter name="convertResponse" value="false"/>
+ <parameter name="proxyUrl" value="`$tmp.proxy-url`"/>
<outcome value='success'>
<block>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
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 fb68b0aa..a96c5f10 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
@@ -20,17 +20,9 @@
<block atomic='true'>
<set>
<parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-status-input.near-rt-ric-url`"/>
+ <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
</set>
<block>
- <set>
- <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
- </set>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="Get A1 Policy Status: Check for proxy url: "/>
- <parameter name="field2" value="`$tmp.proxy-url`"/>
- </record>
<switch test='`$tmp.proxy-url`'>
<outcome value=''>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -40,27 +32,12 @@
</record>
</outcome>
<outcome value='Other'>
- <block>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
- <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
- <parameter name="regex" value="/"/>
- <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
- </execute>
- <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
- <set>
- <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
- </set>
- </for>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="Get A1 Policy Status: Url with proxy: "/>
- <parameter name="field2" value="`$tmp.proxy-url`"/>
- </record>
- <set>
- <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
- </set>
- </block>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+ <parameter name="level" value="info" />
+ <parameter name="field1" value="Get A1 Policy Status: Proxy url: "/>
+ <parameter name="field2" value="`$tmp.proxy-url`"/>
+ </record>
</outcome>
</switch>
</block>
@@ -78,6 +55,7 @@
<parameter name='contentType' value='application/json' />
<parameter name='accept' value='application/json' />
<parameter name="convertResponse" value="true"/>
+ <parameter name="proxyUrl" value="`$tmp.proxy-url`"/>
<outcome value='success'>
<block>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
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 70d1aa21..0f8c5875 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
@@ -20,17 +20,9 @@
<block atomic='true'>
<set>
<parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-type-input.near-rt-ric-url`"/>
+ <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
</set>
<block>
- <set>
- <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
- </set>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="Get Policy Type: Check for proxy url: "/>
- <parameter name="field2" value="`$tmp.proxy-url`"/>
- </record>
<switch test='`$tmp.proxy-url`'>
<outcome value=''>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -40,27 +32,12 @@
</record>
</outcome>
<outcome value='Other'>
- <block>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
- <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
- <parameter name="regex" value="/"/>
- <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
- </execute>
- <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
- <set>
- <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
- </set>
- </for>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="Get Policy Type: Url with proxy: "/>
- <parameter name="field2" value="`$tmp.proxy-url`"/>
- </record>
- <set>
- <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
- </set>
- </block>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+ <parameter name="level" value="info" />
+ <parameter name="field1" value="Get Policy Type: Proxy url: "/>
+ <parameter name="field2" value="`$tmp.proxy-url`"/>
+ </record>
</outcome>
</switch>
</block>
@@ -78,6 +55,7 @@
<parameter name='contentType' value='application/json' />
<parameter name='accept' value='application/json' />
<parameter name="convertResponse" value="true"/>
+ <parameter name="proxyUrl" value="`$tmp.proxy-url`"/>
<outcome value='success'>
<block>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >
diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml
index a9afa852..f1595de2 100644
--- a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml
+++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml
@@ -22,17 +22,9 @@
<set>
<parameter name="tmp.near-rt-ric-url" value="`$put-a1-policy-input.near-rt-ric-url`"/>
<parameter name="tmp.body" value="`$put-a1-policy-input.body`"/>
+ <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
</set>
<block>
- <set>
- <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>
- </set>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="Put A1 Policy: Check for proxy url: "/>
- <parameter name="field2" value="`$tmp.proxy-url`"/>
- </record>
<switch test='`$tmp.proxy-url`'>
<outcome value=''>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -42,27 +34,12 @@
</record>
</outcome>
<outcome value='Other'>
- <block>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
- <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />
- <parameter name="regex" value="/"/>
- <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>
- </execute>
- <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >
- <set>
- <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />
- </set>
- </for>
- <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
- <parameter name="level" value="info" />
- <parameter name="field1" value="Put A1 Policy: Url with proxy: "/>
- <parameter name="field2" value="`$tmp.proxy-url`"/>
- </record>
- <set>
- <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>
- </set>
- </block>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
+ <parameter name="level" value="info" />
+ <parameter name="field1" value="Put A1 Policy: Proxy url: "/>
+ <parameter name="field2" value="`$tmp.proxy-url`"/>
+ </record>
</outcome>
</switch>
</block>
@@ -82,6 +59,7 @@
<parameter name='accept' value='application/json' />
<parameter name="requestBody" value="`$tmp.body`"/>
<parameter name="convertResponse" value="false"/>
+ <parameter name="proxyUrl" value="`$tmp.proxy-url`"/>
<outcome value='failure'>
<block>
<set>