fix odl patches

[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 d674abf..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,7 +22,27 @@
                 <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>
+                    <switch test='`$tmp.proxy-url`'>
+                        <outcome value=''>
+                            <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: No proxy found on properties file "/>
+                            </record>
+                        </outcome>
+                        <outcome value='Other'>
+                            <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>
                 <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" />
@@ -39,16 +59,17 @@
                     <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>
-                                <parameter name='response-code' value='500'/>
-                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
                             </set>
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
-                                <parameter name="response-code" value="404" />
-                                <parameter name="response-message" value="Error creating A1 Policy. Aborting A1 Policy creation" />
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
                             </return>
                         </block>
                     </outcome>
@@ -58,7 +79,13 @@
                                 <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
                                 <parameter name="level" value="info" />
                                 <parameter name="field1" value="A1 Policy Instance Created."/>
+                                <parameter name='field2' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='field3' value='`$a1MediatorRsp.response-message`'/>
                             </record>
+                            <set>
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>
+                            </set>
                         </block>
                     </outcome>
                 </execute>