Bug Fix- Update DG to add proxy support

[ccsdk/distribution.git] / platform-logic / a1Adapter-api / src / main / xml / A1-ADAPTER-API_getA1PolicyType.xml

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 70d1aa2..0f8c587 100644 (file)
--- 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'>\r
                 <set>\r
                     <parameter name="tmp.near-rt-ric-url" value="`$get-a1-policy-type-input.near-rt-ric-url`"/>\r
+                    <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>\r
                 </set>\r
                 <block>\r
-                    <set>\r
-                        <parameter name="tmp.proxy-url" value="`$prop.a1Mediator.proxy.url`"/>\r
-                    </set>\r
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />\r
-                        <parameter name="level" value="info" />\r
-                        <parameter name="field1" value="Get Policy Type: Check for proxy url: "/>\r
-                        <parameter name="field2" value="`$tmp.proxy-url`"/>\r
-                    </record>\r
                     <switch test='`$tmp.proxy-url`'>\r
                         <outcome value=''>\r
                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
@@ -40,27 +32,12 @@
                             </record>\r
                         </outcome>\r
                         <outcome value='Other'>\r
-                            <block>\r
-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\r
-                                    <parameter name="original_string" value="`$tmp.near-rt-ric-url`" />\r
-                                    <parameter name="regex" value="/"/>\r
-                                    <parameter name="ctx_memory_result_key" value="tmp.near-rt-ric-url-splitList"/>\r
-                                </execute>\r
-                                <for index='idx' start='3' end="`$tmp.near-rt-ric-url-splitList_length`" >\r
-                                    <set>\r
-                                        <parameter name='tmp.proxy-url' value="`$tmp.proxy-url +'/' + $tmp.near-rt-ric-url-splitList[$idx] `" />\r
-                                    </set>\r
-                                </for>\r
-                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                    <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />\r
-                                    <parameter name="level" value="info" />\r
-                                    <parameter name="field1" value="Get Policy Type: Url with proxy: "/>\r
-                                    <parameter name="field2" value="`$tmp.proxy-url`"/>\r
-                                </record>\r
-                                <set>\r
-                                    <parameter name="tmp.near-rt-ric-url" value="`$tmp.proxy-url`"/>\r
-                                </set>\r
-                            </block>\r
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />\r
+                                <parameter name="level" value="info" />\r
+                                <parameter name="field1" value="Get Policy Type: Proxy url: "/>\r
+                                <parameter name="field2" value="`$tmp.proxy-url`"/>\r
+                            </record>\r
                         </outcome>\r
                     </switch>\r
                 </block>\r
@@ -78,6 +55,7 @@
                     <parameter name='contentType' value='application/json' />\r
                     <parameter name='accept' value='application/json' />\r
                     <parameter name="convertResponse" value="true"/>\r
+                    <parameter name="proxyUrl" value="`$tmp.proxy-url`"/>\r
                     <outcome value='success'>\r
                         <block>\r
                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replaceAll' >\r