Wrong id used to retrieve status

[sdnc/oam.git] / platform-logic / lcm / src / main / xml / LCM_upgrade-software.xml

diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
index 9626789..07fcc82 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -9,10 +9,6 @@
                                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\r
                                <parameter name='contextPrefix' value='prop' />\r
                        </execute>\r
-                       <set>\r
-                               <parameter name='status.code' value='200' />\r
-                               <parameter name='status.message' value='unexpected return from DG' />\r
-                       </set>\r
                        <execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'\r
                                method='reqExec'>\r
                                <parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />\r
@@ -30,9 +26,9 @@
                                <outcome value='not-found'>\r
                                        <block>\r
                                                <set>\r
-                                                       <parameter name='$org.onap.appc.adapter.ansible.result.code'\r
-                                                               value='401' />\r
-                                                       <parameter name='org.onap.appc.adapter.ansible.message'\r
+                                                       <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'\r
+                                                               value='200' />\r
+                                                       <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'\r
                                                                value='Ansible Adapter was not found' />\r
                                                </set>\r
                                                <block>\r
@@ -62,9 +58,9 @@
                                                                <parameter name='lcm-dmaap.payload'\r
                                                                        value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                <parameter name='lcm-dmaap.status.code'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                <parameter name='lcm-dmaap.status.message'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                        </set>\r
                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                method='sendRequest'>\r
@@ -85,9 +81,9 @@
                                                                </outcome>\r
                                                        </execute>\r
                                                        <return status='failure'>\r
-                                                               <parameter name='status.code' value='401' />\r
-                                                               <parameter name='status.message'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                               <parameter name='error-code' value='200' />\r
+                                                               <parameter name='error-message'\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                        </return>\r
                                                </block>\r
                                        </block>\r
@@ -120,9 +116,9 @@
                                                        <parameter name='lcm-dmaap.payload'\r
                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                </set>\r
                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                        method='sendRequest'>\r
@@ -143,14 +139,14 @@
                                                        </outcome>\r
                                                </execute>\r
                                                <return status='failure'>\r
-                                                       <parameter name='status.code' value='401' />\r
-                                                       <parameter name='status.message'\r
-                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                       <parameter name='error-code' value='200' />\r
+                                                       <parameter name='error-message'\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                </return>\r
                                        </block>\r
                                </outcome>\r
                                <outcome value='Other'>\r
-                                       <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                       <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">\r
                                                <outcome value='101'>\r
                                                        <block>\r
                                                                <set>\r
@@ -179,9 +175,9 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -203,9 +199,9 @@
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='status.code' value='401' />\r
-                                                                       <parameter name='status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       <parameter name='error-code' value='200' />\r
+                                                                       <parameter name='error-message'\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
@@ -237,9 +233,9 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -261,9 +257,9 @@
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='status.code' value='401' />\r
-                                                                       <parameter name='status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       <parameter name='error-code' value='200' />\r
+                                                                       <parameter name='error-message'\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
@@ -310,9 +306,9 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -335,9 +331,9 @@
                                                                                        </outcome>\r
                                                                                </execute>\r
                                                                                <return status='failure'>\r
-                                                                                       <parameter name='status.code' value='401' />\r
-                                                                                       <parameter name='status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                       <parameter name='error-code' value='200' />\r
+                                                                                       <parameter name='error-message'\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r
@@ -369,9 +365,9 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -395,9 +391,9 @@
                                                                                </execute>\r
                                                                                <return status='success'>\r
                                                                                        <parameter name='status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r