X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=platform-logic%2Flcm%2Fsrc%2Fmain%2Fxml%2FLCM_upgrade-pre-check.xml;h=16b9d31096e88aea22261698391fc04711973a0d;hb=226baa784e543bef038cffe091f734d22b34a256;hp=28f7048ed0195b59897e77ebd35f52bb5f573942;hpb=3b54aeb4e242b4095caa2ffc2a6c5eb22efb2da1;p=sdnc%2Foam.git

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..16b9d310 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
@@ -11,20 +11,15 @@
                 <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-pre-check-input.payload' />
                 <parameter name='outputPath' value='payloadJson' />
                 <parameter name='isEscaped' value='true' />
             </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-pre-check.playbookname`'/>
-                    </set>
-                </outcome>
-                <outcome value='Other'>
+            <switch test="`$upgrade-pre-check-input.action-identifiers.pnf-name`">
+                <outcome value=''>
                     <block>
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
                             <parameter name='outputPath' value='playbookname' />
@@ -53,11 +48,38 @@
                         </get-resource>
                     </block>
                 </outcome>
+                <outcome value='Other'>
+                    <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-pre-check.playbookname`'/>
+                                </set>
+                            </outcome>
+                            <outcome value='Other'>
+                                <set>
+                                    <parameter name='playbookname' value='`$payloadJson.playbook-name`'/>
+                                </set>
+                            </outcome>
+                        </switch>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='updateJsonObjectString'>
+                            <parameter name='source' value='upgrade-pre-check-input.payload' />
+                            <parameter name='outputPath' value='upgrade-pre-check-input.payload' />
+                            <parameter name='add.pnf-flag' value='true' />
+                            <parameter name='add.pnfName' value="`$upgrade-pre-check-input.action-identifiers.pnf-name`" />
+                            <parameter name='delete.ipaddress-v4-oam' value="" />
+                            <parameter name='delete.playbook-name' value="" />
+                        </execute>
+                    </block>
+                </outcome>
             </switch>
             <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>
@@ -277,46 +299,29 @@
                                             <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='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-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>
                                         <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>
@@ -383,46 +388,29 @@
                                             <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='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-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>
                                         <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>