Bug Fix- Updated the http response code/ response message

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

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 3f264e5..2c1e67f 100644 (file)
--- 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
@@ -1,121 +1,125 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>
-    <method rpc='deleteA1Policy' mode='sync'>
-        <block atomic='true'>
-            <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:"/>
-                <parameter name="field2" value="`$delete-a1-policy-input.near-rt-ric-url`"/>
-            </record>
-            <set>
-                <parameter name='response-code' value='200' />
-                <parameter name='response-message' value='deletePolicy executed successfully' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <block atomic='true'>
-                <set>
-                    <parameter name="tmp.near-rt-ric-url" value="`$delete-a1-policy-input.near-rt-ric-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">
-                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />
-                                <parameter name="level" value="info" />
-                                <parameter name="field1" value="Delete A1 Policy: No proxy found on properties file "/>
-                            </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>
-                        </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" />
-                    <parameter name="field1" value="Setting variables for A1 Adapter Delete Policy Instance."/>
-                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>
-                </record>
-                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>
-                    <parameter name="format" value="json"/>
-                    <parameter name="httpMethod" value="DELETE"/>
-                    <parameter name="responsePrefix" value="a1MediatorRsp"/>
-                    <parameter name='contentType' value='application/json' />
-                    <parameter name='accept' value='application/json' />
-                    <parameter name="convertResponse" value="false"/>
-                    <outcome value='success'>
-                        <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 Delete Policy Information "/>
-                                <parameter name="field2" value="`$a1MediatorRsp.httpResponse`"/>
-                            </record>
-                            <set>
-                                <parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>
-                            </set>
-                        </block>
-                    </outcome>
-                    <outcome value='failure'>
-                        <block>
-                            <set>
-                                <parameter name='response-code' value='500'/>
-                                <parameter name='response-message' value='Seems A1 Mediator Not Healthy'/>
-                            </set>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="response-code" value="404" />
-                                <parameter name="response-message" value="Error in Deleting A1 Policy Instance. Aborting" />
-                            </return>
-                        </block>
-                    </outcome>
-                </execute>
-            </block>
-            <block>
-                <return status='success'>
-                    <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='deletePolicyInstance executed successfully'/>
-                    <parameter name='ack-final' value='Y'/>
-                </return>
-            </block>
-        </block>
-    </method>
+<service-logic\r
+    xmlns='http://www.onap.org/sdnc/svclogic'\r
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>\r
+    <method rpc='deleteA1Policy' mode='sync'>\r
+        <block atomic='true'>\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="Delete A1 Policy:"/>\r
+                <parameter name="field2" value="`$delete-a1-policy-input.near-rt-ric-url`"/>\r
+            </record>\r
+            <set>\r
+                <parameter name='response-code' value='200' />\r
+                <parameter name='response-message' value='deletePolicy executed successfully' />\r
+            </set>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                <parameter name='fileName' value='/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties' />\r
+                <parameter name='contextPrefix' value='prop' />\r
+            </execute>\r
+            <block atomic='true'>\r
+                <set>\r
+                    <parameter name="tmp.near-rt-ric-url" value="`$delete-a1-policy-input.near-rt-ric-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="Delete A1 Policy: 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
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/A1-Adapter.log" />\r
+                                <parameter name="level" value="info" />\r
+                                <parameter name="field1" value="Delete A1 Policy: No proxy found on properties file "/>\r
+                            </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="Delete A1 Policy: 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
+                        </outcome>\r
+                    </switch>\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="Setting variables for A1 Adapter Delete Policy Instance."/>\r
+                    <parameter name="field2" value="`$tmp.near-rt-ric-url`"/>\r
+                </record>\r
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                    <parameter name="restapiUrl" value="`$tmp.near-rt-ric-url`"/>\r
+                    <parameter name="format" value="json"/>\r
+                    <parameter name="httpMethod" value="DELETE"/>\r
+                    <parameter name="responsePrefix" value="a1MediatorRsp"/>\r
+                    <parameter name='contentType' value='application/json' />\r
+                    <parameter name='accept' value='application/json' />\r
+                    <parameter name="convertResponse" value="false"/>\r
+                    <outcome value='success'>\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="A1 Delete Policy Information "/>\r
+                                <parameter name="field2" value="`$a1MediatorRsp.httpResponse`"/>\r
+                                <parameter name='field3' value='`$a1MediatorRsp.response-code`'/>\r
+                                <parameter name='field4' value='`$a1MediatorRsp.response-message`'/>\r
+                            </record>\r
+                            <set>\r
+                                <parameter name='body' value='`$a1MediatorRsp.httpResponse`'/>\r
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\r
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>\r
+                            </set>\r
+                        </block>\r
+                    </outcome>\r
+                    <outcome value='failure'>\r
+                        <block>\r
+                            <set>\r
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\r
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>\r
+                            </set>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name='response-code' value='`$a1MediatorRsp.response-code`'/>\r
+                                <parameter name='response-message' value='`$a1MediatorRsp.response-message`'/>\r
+                            </return>\r
+                        </block>\r
+                    </outcome>\r
+                </execute>\r
+            </block>\r
+            <block>\r
+                <return status='success'>\r
+                    <parameter name="ack-final-indicator" value="Y" />\r
+                    <parameter name="error-code" value="200" />\r
+                    <parameter name="error-message" value="`$error-message`" />\r
+                    <parameter name='response-code' value='200' />\r
+                    <parameter name='response-message' value='deletePolicyInstance executed successfully'/>\r
+                    <parameter name='ack-final' value='Y'/>\r
+                </return>\r
+            </block>\r
+        </block>\r
+    </method>\r
 </service-logic>
\ No newline at end of file