diff options
author | 2019-05-06 17:04:47 -0400 | |
---|---|---|
committer | 2019-05-06 17:04:47 -0400 | |
commit | 8678b8107f69149491feee1ed756cb37fdaebc02 (patch) | |
tree | 6acf517a483598f3b3ed0d8ae4bb8a889771e535 /platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml | |
parent | 3bd83a42221c4f5c0cbaf586657e5310c8516018 (diff) |
Fix set nodelist in SW upgrade DGs
Change-Id: Ia789fcb16700f7c49f187b970daa114f8ae0eaf5
Issue-ID: SDNC-746
Signed-off-by: Marco Platania <platania@research.att.com>
Former-commit-id: 5431ff62543b099c6f3495454503bba06f03dfad
Diffstat (limited to 'platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml')
-rw-r--r-- | platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml | 215 |
1 files changed, 42 insertions, 173 deletions
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 28f7048e..6f89bfcf 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 @@ -57,7 +57,6 @@ <switch test='`$playbookname`'>
<outcome value=''>
<set>
- <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>
</set>
</outcome>
@@ -271,56 +270,23 @@ <parameter name='PlaybookName' value='`$playbookname`'/>
<outcome value='failure'>
<block>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
- <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
- <parameter name='outputPath' value='resultsJson' />
- <parameter name='isEscaped' value='false' />
- </execute>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
- <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
- <parameter name='outputPath' value='outputPayload' />
- </execute>
- <switch test='`$outputPayload`'>
- <outcome value=''>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- </set>
- </outcome>
- <outcome value='Other'>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
- </set>
- </outcome>
- </switch>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+ <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
<parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -337,96 +303,31 @@ </record>
</outcome>
</execute>
- <switch test='`$outputPayload`'>
- <outcome value=''>
- <switch test="`$org.onap.appc.adapter.ansible.result.code`">
- <outcome value='400'>
- <return status='success'>
- <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- </return>
- </outcome>
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
- </return>
- </outcome>
- </switch>
- </outcome>
- <outcome value='Other'>
- <switch test="`$org.onap.appc.adapter.ansible.result.code`">
- <outcome value='400'>
- <return status='success'>
- <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- <parameter name='payload' value='`$outputPayload`'/>
- </return>
- </outcome>
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
- <parameter name='payload' value='`$outputPayload`'/>
- </return>
- </outcome>
- </switch>
- </outcome>
- </switch>
+ <return status='failure'>
+ <parameter name='status.code' value='401' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+ </return>
</block>
</outcome>
<outcome value='success'>
<block>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
- <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
- <parameter name='outputPath' value='resultsJson' />
- <parameter name='isEscaped' value='false' />
- </execute>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
- <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
- <parameter name='outputPath' value='outputPayload' />
- </execute>
- <switch test='`$outputPayload`'>
- <outcome value=''>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- </set>
- </outcome>
- <outcome value='Other'>
- <set>
- <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
- <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
- <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
- <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
- <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
- <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
- <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
- <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
- <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
- <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
- <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
- <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
- </set>
- </outcome>
- </switch>
+ <set>
+ <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>
+ <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+ <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>
+ <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+ <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>
+ <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>
+ <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>
+ <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>
+ <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>
+ <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>
+ <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>
+ <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
<parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -443,42 +344,10 @@ </record>
</outcome>
</execute>
- <switch test='`$outputPayload`'>
- <outcome value=''>
- <switch test="`$org.onap.appc.adapter.ansible.result.code`">
- <outcome value='400'>
- <return status='success'>
- <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- </return>
- </outcome>
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
- </return>
- </outcome>
- </switch>
- </outcome>
- <outcome value='Other'>
- <switch test="`$org.onap.appc.adapter.ansible.result.code`">
- <outcome value='400'>
- <return status='success'>
- <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
- <parameter name='payload' value='`$outputPayload`'/>
- </return>
- </outcome>
- <outcome value='Other'>
- <return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
- <parameter name='payload' value='`$outputPayload`'/>
- </return>
- </outcome>
- </switch>
- </outcome>
- </switch>
+ <return status='success'>
+ <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+ </return>
</block>
</outcome>
</execute>
|