Merging upstream version 10.0.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 92 insertions, 85 deletions

diff --git a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/cifs_share/converge.yml b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/cifs_share/converge.yml
index 161a35cf4..1ebd565bb 100644
--- a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/cifs_share/converge.yml
+++ b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/cifs_share/converge.yml
@@ -7,9 +7,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'cifsshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
diff --git a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/default/converge.yml b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/default/converge.yml
index bc30806f4..43a3ece9b 100644
--- a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/default/converge.yml
+++ b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/default/converge.yml
@@ -7,9 +7,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'httpsshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
@@ -31,9 +31,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'httpsshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
@@ -56,9 +56,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'httpsshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
@@ -80,9 +80,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'httpsshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
diff --git a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/ftp_share/converge.yml b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/ftp_share/converge.yml
index a94da723a..48ecbc93e 100644
--- a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/ftp_share/converge.yml
+++ b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/ftp_share/converge.yml
@@ -7,9 +7,9 @@
       ansible.builtin.import_role:
         name: idrac_firmware
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'ftpshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
diff --git a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/http_share/converge.yml b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/http_share/converge.yml
index 82df756b5..c34cc7d32 100644
--- a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/http_share/converge.yml
+++ b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/http_share/converge.yml
@@ -7,9 +7,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'httpsshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
diff --git a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/https_share/converge.yml b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/https_share/converge.yml
index a94983cae..b1f7805ad 100644
--- a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/https_share/converge.yml
+++ b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/https_share/converge.yml
@@ -7,9 +7,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'httpsshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
diff --git a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/httpsproxy_share/converge.yml b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/httpsproxy_share/converge.yml
index b4bd4bdc1..d4b44b358 100644
--- a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/httpsproxy_share/converge.yml
+++ b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/httpsproxy_share/converge.yml
@@ -7,9 +7,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'httpsproxy') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
@@ -21,8 +21,8 @@
         proxy_server: "{{ lookup('env', 'proxyserver') }}"
         proxy_type: "HTTP"
         proxy_port: 3128
-        proxy_uname: "{{ lookup('env', 'proxyuname') }}"
-        proxy_passwd: "{{ lookup('env', 'proxypass') }}"
+        proxy_uname: "{{ lookup('env', 'proxy_username') }}"
+        proxy_passwd: "{{ lookup('env', 'proxy_password') }}"
         catalog_file_name: "Catalog.xml"
 
     - name: "Verifying update firmware from repository on a HTTPS via parameter proxy share in check mode"
@@ -48,9 +48,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         reboot: true
         job_wait: true
@@ -81,9 +81,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'httpsproxy') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
diff --git a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/negative_scenarios/converge.yml b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/negative_scenarios/converge.yml
index 37b959272..98800e160 100644
--- a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/negative_scenarios/converge.yml
+++ b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/negative_scenarios/converge.yml
@@ -8,15 +8,13 @@
         name: idrac_firmware
       vars:
         hostname: "invalidHostname"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         share_name: "{{ lookup('env', 'httpshare') }}"
         catalog_file_name: "Catalog.xml"
         reboot: true
         job_wait: true
         apply_update: true
-      ignore_errors: true
-      register: idrac_firmware_result
 
     - name: "Verifying Updating firmware with an invalid hostname"
       ansible.builtin.assert:
@@ -27,9 +25,9 @@
       ansible.builtin.import_role:
         name: idrac_firmware
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
         username: "invalidUsername"
-        password: "{{ lookup('env', 'password') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         share_name: "{{ lookup('env', 'httpshare') }}"
         catalog_file_name: "Catalog.xml"
         reboot: true
@@ -47,10 +45,10 @@
       ansible.builtin.import_role:
         name: idrac_firmware
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
         password: "invalidPassword"
-        share_name: "{{ lookup('env', 'httpshare') }}"
+        share_name: "{{ lookup('env', 'httpsshare') }}"
         catalog_file_name: "Catalog.xml"
         reboot: true
         job_wait: true
@@ -67,11 +65,11 @@
       ansible.builtin.import_role:
         name: idrac_firmware
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
-        share_name: "{{ lookup('env', 'httpshare') }}"
-        ca_path: "{{ lookup('env', 'capath') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
+        share_name: "{{ lookup('env', 'httpsshare') }}"
+        ca_path: "/invalid/ca/path.cert"
         catalog_file_name: "Catalog.xml"
         reboot: true
         job_wait: true
@@ -82,15 +80,15 @@
     - name: "Verifying Updating firmware with an invalid ca_path"
       ansible.builtin.assert:
         that:
-          - idrac_firmware_out.msg == "Firmware update failed."
+          - "'Incorrect username or password, unreachable iDRAC IP or a failure in TLS/SSL handshake.' in idrac_firmware_out.msg"
 
     - name: Updating firmware with catalog file without extension
       ansible.builtin.import_role:
         name: idrac_firmware
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         share_name: "{{ lookup('env', 'httpshare') }}"
         reboot: true
         job_wait: true
@@ -108,9 +106,9 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'httpsshare') }}"
         share_user: "invalidUser"
@@ -118,21 +116,24 @@
         reboot: true
         job_wait: true
         apply_update: true
-        catalog_file_name: "Catalog.xml"
+        catalog_file_name: "catalog.xml"
+      ignore_errors: true
+      register: idrac_firmware_result
 
     - name: "Verifying update firmware from repository on a HTTPS Share with invalid share_user"
       ansible.builtin.assert:
         that:
-          - idrac_firmware_out.msg == "Unable to complete the operation because the catalog name entered has either unsupported firmware packages
-            or same version installed on the server."
+          # - idrac_firmware_out.msg == "Unable to complete the operation because the catalog name entered has either unsupported firmware packages
+          # or same version installed on the server."
+          - "'The specified user credentials necessary for downloading an update package were not correct.' in idrac_firmware_out.msg"
 
     - name: Update firmware from repository on HTTPS Share with invalid share_password
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
         share_name: "{{ lookup('env', 'httpsshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
@@ -140,24 +141,26 @@
         reboot: true
         job_wait: true
         apply_update: true
-        catalog_file_name: "Catalog.xml"
+        catalog_file_name: "catalog.xml"
+      ignore_errors: true
       register: idrac_firmware_result
 
     - name: "Verifying update firmware from repository on a HTTPS Share with invalid share_password"
       ansible.builtin.assert:
         that:
-          - idrac_firmware_out.msg == "Unable to complete the operation because the catalog name entered has either unsupported firmware packages
-            or same version installed on the server."
+          # - idrac_firmware_out.msg == "Unable to complete the operation because the catalog name entered has either unsupported firmware packages
+          #   or same version installed on the server."
+          - "'The specified user credentials necessary for downloading an update package were not correct.' in idrac_firmware_out.msg"
 
     - name: Update firmware from repository on a HTTPS via parameter proxy Share with invalid proxy_uname
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
-        share_name: "{{ lookup('env', 'httpsproxy') }}"
+        share_name: "{{ lookup('env', 'httpsshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
         share_password: "{{ lookup('env', 'sharepassword') }}"
         reboot: true
@@ -166,10 +169,10 @@
         proxy_support: "ParametersProxy"
         proxy_server: "{{ lookup('env', 'proxyserver') }}"
         proxy_type: "HTTP"
-        proxy_port: 3128
-        proxy_uname: "invalidUname"
-        proxy_passwd: "{{ lookup('env', 'proxypass') }}"
-        catalog_file_name: "Catalog.xml"
+        proxy_port: "{{ lookup('env', 'proxyport') }}"
+        proxy_uname: "{{ lookup('env', 'proxy_username') }}"
+        proxy_passwd: "{{ lookup('env', 'proxy_password') }}"
+        catalog_file_name: "catalog.xml"
 
     - name: "Verifying update firmware from repository on a HTTPS via parameter proxy share with invalid proxy_uname"
       ansible.builtin.assert:
@@ -181,11 +184,11 @@
       ansible.builtin.import_role:
         name: "idrac_firmware"
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         validate_certs: false
-        share_name: "{{ lookup('env', 'httpsproxy') }}"
+        share_name: "{{ lookup('env', 'httpsshare') }}"
         share_user: "{{ lookup('env', 'shareuser') }}"
         share_password: "{{ lookup('env', 'sharepassword') }}"
         reboot: true
@@ -194,13 +197,17 @@
         proxy_support: "ParametersProxy"
         proxy_server: "{{ lookup('env', 'proxyserver') }}"
         proxy_type: "HTTP"
-        proxy_port: 3128
-        proxy_uname: "{{ lookup('env', 'proxyuname') }}"
+        proxy_port: "{{ lookup('env', 'proxyport') }}"
+        proxy_uname: "{{ lookup('env', 'proxy_username') }}"
         proxy_passwd: "invalidPasswd"
-        catalog_file_name: "Catalog.xml"
+        catalog_file_name: "catalog.xml"
+      ignore_errors: true
+      register: idrac_firmware_result
 
     - name: "Verifying update firmware from repository on a HTTPS via parameter proxy share with invalid proxy_passwd"
       ansible.builtin.assert:
         that:
-          - idrac_firmware_out.msg == "Unable to complete the operation because the catalog name entered has either unsupported firmware packages
-            or same version installed on the server."
+          # - idrac_firmware_out.msg == "Unable to complete the operation because the catalog name entered has either unsupported firmware packages
+          #   or same version installed on the server."
+          - "'Unable to transfer file' in idrac_firmware_out.msg"
+          - "'because of some unknown reasons.' in idrac_firmware_out.msg"
diff --git a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/nfs_share/converge.yml b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/nfs_share/converge.yml
index 89e55838c..d9d496f3a 100644
--- a/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/nfs_share/converge.yml
+++ b/ansible_collections/dellemc/openmanage/roles/idrac_firmware/molecule/nfs_share/converge.yml
@@ -7,9 +7,9 @@
       ansible.builtin.import_role:
         name: idrac_firmware
       vars:
-        hostname: "{{ lookup('env', 'hostname') }}"
-        username: "{{ lookup('env', 'username') }}"
-        password: "{{ lookup('env', 'password') }}"
+        hostname: "{{ lookup('env', 'IDRAC_IP') }}"
+        username: "{{ lookup('env', 'IDRAC_USER') }}"
+        password: "{{ lookup('env', 'IDRAC_PASSWORD') }}"
         share_name: "{{ lookup('env', 'nfsshare') }}"
         validate_certs: false
         reboot: true