Revert deleted payload in SW upgrade DGs

[sdnc/oam.git] / platform-logic / lcm / src / main / xml / LCM_upgrade-pre-check.xml

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 28f7048..8903322 100644 (file)
--- 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,6 +11,7 @@
                 <parameter name='status.code' value='200' />\r
                 <parameter name='status.message' value='unexpected return from DG' />\r
                 <parameter name='quote' value="'" />\r
+                <parameter name='outputPayloadField' value='.Output' />\r
             </set>\r
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
                 <parameter name='source' value='upgrade-pre-check-input.payload' />\r
@@ -22,6 +23,7 @@
                     <set>\r
                         <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>\r
                         <parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\r
+                        <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>\r
                     </set>\r
                 </outcome>\r
                 <outcome value='Other'>\r
@@ -57,7 +59,6 @@
             <switch test='`$playbookname`'>\r
                 <outcome value=''>\r
                     <set>\r
-                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>\r
                         <parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>\r
                     </set>\r
                 </outcome>\r
@@ -277,7 +278,7 @@
                                             <parameter name='isEscaped' value='false' />\r
                                         </execute>\r
                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
-                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
+                                            <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />\r
                                             <parameter name='outputPath' value='outputPayload' />\r
                                         </execute>\r
                                         <switch test='`$outputPayload`'>\r
@@ -383,7 +384,7 @@
                                             <parameter name='isEscaped' value='false' />\r
                                         </execute>\r
                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
-                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
+                                            <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />\r
                                             <parameter name='outputPath' value='outputPayload' />\r
                                         </execute>\r
                                         <switch test='`$outputPayload`'>\r