Bug Fix- Update DG to add proxy support

Issue-ID: CCSDK-3438

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

5 files changed, 40 insertions, 150 deletions

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>