From 226baa784e543bef038cffe091f734d22b34a256 Mon Sep 17 00:00:00 2001
From: Enbo Wang <wangenbo@huawei.com>
Date: Fri, 21 Feb 2020 17:28:53 +0800
Subject: Update DGs and Playbooks for PNF SW Upgrade

Change-Id: Iecc84ca6f794fe9947e81da3d95ceaad00f2861d
Issue-ID: SDNC-1079
Signed-off-by: Enbo Wang <wangenbo@huawei.com>

Former-commit-id: e2915384cc7523e93c2e154d4a84920fd093146d
---
 .../lcm/src/main/xml/LCM_activate-n-e-sw.xml       | 54 +++++++++++++---------
 .../lcm/src/main/xml/LCM_download-n-e-sw.xml       | 54 +++++++++++++---------
 .../lcm/src/main/xml/LCM_upgrade-post-check.xml    | 52 ++++++++++++---------
 .../lcm/src/main/xml/LCM_upgrade-pre-check.xml     | 52 ++++++++++++---------
 4 files changed, 122 insertions(+), 90 deletions(-)

(limited to 'platform-logic/lcm/src/main/xml')

diff --git a/platform-logic/lcm/src/main/xml/LCM_activate-n-e-sw.xml b/platform-logic/lcm/src/main/xml/LCM_activate-n-e-sw.xml
index 319581c2..9ccab073 100644
--- a/platform-logic/lcm/src/main/xml/LCM_activate-n-e-sw.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_activate-n-e-sw.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.activate-n-e-sw.playbookname`'/>
-                                </set>
-                            </outcome>
-                            <outcome value='Other'>
-                                <set>
-                                    <parameter name='playbookname' value='`$payloadJson.playbook-name`'/>
-                                </set>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
+            <switch test="`$activate-n-e-sw-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.activate-n-e-sw.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='activate-n-e-sw-input.payload' />
+                            <parameter name='outputPath' value='activate-n-e-sw-input.payload' />
+                            <parameter name='add.pnf-flag' value='true' />
+                            <parameter name='add.pnfName' value="`$activate-n-e-sw-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=''>
@@ -468,4 +476,4 @@
             </execute>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_download-n-e-sw.xml b/platform-logic/lcm/src/main/xml/LCM_download-n-e-sw.xml
index 20844c31..b9492472 100644
--- a/platform-logic/lcm/src/main/xml/LCM_download-n-e-sw.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_download-n-e-sw.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.download-n-e-sw.playbookname`'/>
-                                </set>
-                            </outcome>
-                            <outcome value='Other'>
-                                <set>
-                                    <parameter name='playbookname' value='`$payloadJson.playbook-name`'/>
-                                </set>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
+            <switch test="`$download-n-e-sw-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.download-n-e-sw.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='download-n-e-sw-input.payload' />
+                            <parameter name='outputPath' value='download-n-e-sw-input.payload' />
+                            <parameter name='add.pnf-flag' value='true' />
+                            <parameter name='add.pnfName' value="`$download-n-e-sw-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=''>
@@ -468,4 +476,4 @@
             </execute>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
index fd1c8b2c..3b088c04 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-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-post-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-post-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-post-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-post-check-input.payload' />
+                            <parameter name='outputPath' value='upgrade-post-check-input.payload' />
+                            <parameter name='add.pnf-flag' value='true' />
+                            <parameter name='add.pnfName' value="`$upgrade-post-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=''>
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=''>
-- 
cgit 1.2.3-korg