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=e4f818f76126fafeb180af450d9d15ab2f45f8d9;hpb=8678b8107f69149491feee1ed756cb37fdaebc02;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 e4f818f7..cbdb8be2 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -11,6 +11,7 @@
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
                 <parameter name='quote' value="'" />
+                <parameter name='outputPayloadField' value='.Output' />
             </set>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
                 <parameter name='source' value='upgrade-software-input.payload' />
@@ -19,10 +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`'/>
-                    </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>
@@ -270,6 +285,15 @@
                                 <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' + $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`"/>
@@ -287,6 +311,13 @@
                                             <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='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <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`' />
@@ -303,14 +334,55 @@
                                                 </record>
                                             </outcome>
                                         </execute>
-                                        <return status='failure'>
-                                            <parameter name='status.code' value='401' />
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
-                                        </return>
+                                        <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>
                                     </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' + $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`"/>
@@ -328,6 +400,13 @@
                                             <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='Other'>
+                                                <set>
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
+                                                </set>
+                                            </outcome>
+                                        </switch>
                                         <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`' />
@@ -344,10 +423,42 @@
                                                 </record>
                                             </outcome>
                                         </execute>
-                                        <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>
+                                        <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>
                                     </block>
                                 </outcome>
                             </execute>