X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fa1Adapter-api%2Fsrc%2Fmain%2Fxml%2FA1-ADAPTER-API_getA1PolicyType.xml;h=cea0bc5fe8fda0fb4ac5f94dbfc848046b2e0d9e;hb=refs%2Fheads%2Fmaster;hp=70d1aa21dd9037907025e727d1e51d33e628ed87;hpb=f906377369016ed5d82dd1f458b4b8cdcc2778b7;p=ccsdk%2Fdistribution.git

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..56341f95 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
@@ -10,7 +10,7 @@
                 <parameter name="field2" value="`$get-a1-policy-type-input.near-rt-ric-url`"/>
             </record>
             <set>
-                <parameter name='response-code' value='200' />
+                <parameter name='tmp-response-code' value='200' />
                 <parameter name='response-message' value='getA1PolicyType executed successfully' />
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
@@ -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' >
@@ -96,7 +74,7 @@
                             </record>
                             <set>
                                 <parameter name='responseBody' value="`$tmp.a1-mediator-restapi.httpResponse`"/>
-                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='tmp-response-code' value='`$a1MediatorRsp.response-code`'/>
                                 <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
                             </set>
                         </block>
@@ -121,8 +99,8 @@
                     <parameter name="ack-final-indicator" value="Y" />
                     <parameter name="error-code" value="200" />
                     <parameter name="error-message" value="`$error-message`" />
-                    <parameter name='response-code' value='200' />
-                    <parameter name='response-message' value='A1 Adapter is healthy'/>
+                    <parameter name='response-code' value="`$tmp-response-code`" />
+                    <parameter name='response-message' value='Get A1 Policy Type Information successfully'/>
                     <parameter name='health-status' value='200'/>
                     <parameter name='ack-final' value='Y'/>
                 </return>