X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Flcm%2Fsrc%2Fmain%2Fxml%2FLCM_upgrade-software.xml;h=cbdb8be24aa2437a316070aecbd5995384da167e;hb=93a7ad8c9fa1d9631fcaaad359f32e956ac984ed;hp=af0ee715baf0338644b6059cdf10ae8f023a22db;hpb=f5a63c57879141bd9e1054de41a901cdbd802e7f;p=sdnc%2Foam.git

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 af0ee715..cbdb8be2 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -20,11 +20,24 @@
             </execute>
             <switch test='`$payloadJson.pnf-flag`'>
                 <outcome value='true'>
-                    <set>
-                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
-                        <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>
-                        <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
-                    </set>
+                    <block>
+                        <set>
+                            <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                            <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
+                        </set>
+                        <switch test='`$payloadJson.playbook-name`'>
+                            <outcome value=''>
+                                <set>
+                                    <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>
+                                </set>
+                            </outcome>
+                            <outcome value='Other'>
+                                <set>
+                                    <parameter name='playbookname' value='`$payloadJson.playbook-name`'/>
+                                </set>
+                            </outcome>
+                        </switch>
+                    </block>
                 </outcome>
                 <outcome value='Other'>
                     <block>
@@ -281,43 +294,26 @@
                                             <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
                                             <parameter name='outputPath' value='outputPayload' />
                                         </execute>
+                                        <set>
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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>
                                         <switch test='`$outputPayload`'>
-                                            <outcome value=''>
-                                                <set>
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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>
@@ -387,43 +383,26 @@
                                             <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
                                             <parameter name='outputPath' value='outputPayload' />
                                         </execute>
+                                        <set>
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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>
                                         <switch test='`$outputPayload`'>
-                                            <outcome value=''>
-                                                <set>
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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-software-input.common-header.request-id + '-' + $upgrade-software-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-software'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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>