Fix DG names of downloadNESw and activateNESw

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

Former-commit-id: 78a1f2ec89fcbf01e6bf0d28128820b3a88818bf

3 files changed, 15 insertions, 15 deletions

diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_activatenesw@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_activatenesw@0.00.yml
index bee98aa7..e25d2e61 100644
--- a/installation/ansible-server/src/main/Playbooks/ansible_huawei_activatenesw@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_activatenesw@0.00.yml
@@ -2,16 +2,16 @@
 - hosts: all

   tasks:

 

-  - name: parameter neIdentifier

-    set_fact:

-      ne_identifier: "{{neIdentifier}}"

-    when: neIdentifier is defined

-

   - name: parameter swVersionToBeActivated

     set_fact:

       sw_version_to_be_activated: "{{swVersionToBeActivated}}"

     when: swVersionToBeActivated is defined

 

+  - name: parameter neIdentifier

+    set_fact:

+      ne_identifier: "{{neIdentifier}}"

+    when: neIdentifier is defined

+

   - name: compatible with parameter pnfId

     set_fact:

       ne_identifier: "{{pnfId}}"

diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_downloadnesw@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_downloadnesw@0.00.yml
index 77bc21b3..10e25b34 100644
--- a/installation/ansible-server/src/main/Playbooks/ansible_huawei_downloadnesw@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_downloadnesw@0.00.yml
@@ -2,23 +2,23 @@
 - hosts: all

   tasks:

 

-  - name: parameter neIdentifier

-    set_fact:

-      ne_identifier: "{{neIdentifier}}"

-    when: neIdentifier is defined

-

   - name: parameter swToBeDownloaded

     set_fact:

       sw_to_be_downloaded: "{{swToBeDownloaded}}"

     when: swToBeDownloaded is defined

 

+  - name: parameter neIdentifier

+    set_fact:

+      ne_identifier: "{{neIdentifier}}"

+    when: neIdentifier is defined

+

   - name: compatible with parameter pnfId

     set_fact:

       ne_identifier: "{{pnfId}}"

     when: neIdentifier is not defined and pnfId is defined

 

   - name: execute downloadNESw operation

-    shell: ./swm/downloadNESw --neIdentifier {{ne_identifier}} --swToBeDownloaded {{sw_to_be_downloaded}}

+    shell: ./swm/downloadNESw --swToBeDownloaded {{sw_to_be_downloaded}} --neIdentifier {{ne_identifier}}

     ignore_errors: yes

     register: download_result

 

diff --git a/installation/src/main/properties/lcm-dg.properties b/installation/src/main/properties/lcm-dg.properties
index d36fcf81..a4cfc4aa 100644
--- a/installation/src/main/properties/lcm-dg.properties
+++ b/installation/src/main/properties/lcm-dg.properties
@@ -9,14 +9,14 @@ ansible.version=0.00
 lcm.upgrade-pre-check.playbookname=ansible_precheck
 lcm.upgrade-post-check.playbookname=ansible_postcheck
 lcm.upgrade-software.playbookname=ansible_upgradesw
-lcm.download-ne-sw.playbookname=ansible_downloadnesw
-lcm.activate-ne-sw.playbookname=ansible_activatenesw
+lcm.download-n-e-sw.playbookname=ansible_downloadnesw
+lcm.activate-n-e-sw.playbookname=ansible_activatenesw
 lcm.rollback.playbookname=ansible_rollback
 lcm.pnf.upgrade-pre-check.playbookname=ansible_precheck_pnf
 lcm.pnf.upgrade-post-check.playbookname=ansible_postcheck_pnf
 lcm.pnf.upgrade-software.playbookname=ansible_upgradesw_pnf
-lcm.pnf.download-ne-sw.playbookname=ansible_huawei_downloadnesw
-lcm.pnf.activate-ne-sw.playbookname=ansible_huawei_activatenesw
+lcm.pnf.download-n-e-sw.playbookname=ansible_downloadnesw_pnf
+lcm.pnf.activate-n-e-sw.playbookname=ansible_activatenesw_pnf
 lcm.pnf.rollback.playbookname=ansible_rollback_pnf
 lcm.quiesce-traffic.playbookname=ansible_quiescetraffic
 lcm.resume-traffic.playbookname=ansible_resumetraffic