Bug Fix- Update DG to add proxy support

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

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 a9afa85..f1595de 100644 (file)
--- 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>