diff options
Diffstat (limited to 'platform-logic/lcm/src/main/xml')
3 files changed, 99 insertions, 111 deletions
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml index 0cea28f3..92016c83 100644 --- a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml +++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml @@ -9,10 +9,6 @@ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
<parameter name='contextPrefix' value='prop' />
</execute>
- <set>
- <parameter name='status.code' value='200' />
- <parameter name='status.message' value='unexpected return from DG' />
- </set>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
method='reqExec'>
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />
@@ -30,9 +26,9 @@ <outcome value='not-found'>
<block>
<set>
- <parameter name='$org.onap.appc.adapter.ansible.result.code'
- value='401' />
- <parameter name='org.onap.appc.adapter.ansible.message'
+ <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'
+ value='200' />
+ <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'
value='Ansible Adapter was not found' />
</set>
<block>
@@ -62,9 +58,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -85,9 +81,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</block>
@@ -120,9 +116,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -143,14 +139,14 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
<outcome value='Other'>
- <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">
<outcome value='101'>
<block>
<set>
@@ -179,9 +175,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -203,9 +199,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -237,9 +233,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -261,9 +257,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -310,9 +306,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -335,9 +331,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -369,9 +365,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -395,9 +391,9 @@ </execute>
<return status='success'>
<parameter name='status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml index 9eed5056..13ff4a68 100644 --- a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml +++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml @@ -9,10 +9,6 @@ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
<parameter name='contextPrefix' value='prop' />
</execute>
- <set>
- <parameter name='status.code' value='200' />
- <parameter name='status.message' value='unexpected return from DG' />
- </set>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
method='reqExec'>
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />
@@ -30,9 +26,9 @@ <outcome value='not-found'>
<block>
<set>
- <parameter name='org.onap.appc.adapter.ansible.result.code'
- value='401' />
- <parameter name='org.onap.appc.adapter.ansible.message'
+ <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'
+ value='200' />
+ <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'
value='Ansible Adapter was not found' />
</set>
<block>
@@ -62,9 +58,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -85,9 +81,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</block>
@@ -120,9 +116,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -143,14 +139,14 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
<outcome value='Other'>
- <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">
<outcome value='101'>
<block>
<set>
@@ -179,9 +175,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -203,9 +199,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -237,9 +233,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -261,9 +257,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -310,9 +306,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -335,9 +331,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -369,9 +365,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -395,9 +391,9 @@ </execute>
<return status='success'>
<parameter name='status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
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 96267890..07fcc82b 100644 --- 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' />
<parameter name='contextPrefix' value='prop' />
</execute>
- <set>
- <parameter name='status.code' value='200' />
- <parameter name='status.message' value='unexpected return from DG' />
- </set>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
method='reqExec'>
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />
@@ -30,9 +26,9 @@ <outcome value='not-found'>
<block>
<set>
- <parameter name='$org.onap.appc.adapter.ansible.result.code'
- value='401' />
- <parameter name='org.onap.appc.adapter.ansible.message'
+ <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'
+ value='200' />
+ <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'
value='Ansible Adapter was not found' />
</set>
<block>
@@ -62,9 +58,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -85,9 +81,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</block>
@@ -120,9 +116,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -143,14 +139,14 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
<outcome value='Other'>
- <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">
<outcome value='101'>
<block>
<set>
@@ -179,9 +175,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -203,9 +199,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -237,9 +233,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -261,9 +257,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -310,9 +306,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -335,9 +331,9 @@ </outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -369,9 +365,9 @@ <parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -395,9 +391,9 @@ </execute>
<return status='success'>
<parameter name='status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
|