X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Flcm%2Fsrc%2Fmain%2Fxml%2FLCM_upgrade-pre-check.xml;h=16b9d31096e88aea22261698391fc04711973a0d;hb=226baa784e543bef038cffe091f734d22b34a256;hp=3976fb9a3839c29ddca2fbdd084fd10af2d9ae68;hpb=8bbe748d631353b8c48c7d71eb733cf85712884c;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 3976fb9a..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
@@ -18,28 +18,8 @@
                 <parameter name='outputPath' value='payloadJson' />
                 <parameter name='isEscaped' value='true' />
             </execute>
-            <switch test='`$payloadJson.pnf-flag`'>
-                <outcome value='true'>
-                    <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>
-                    </block>
-                </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' />
@@ -68,6 +48,34 @@
                         </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=''>