feat: use json_query to avoid index

Fixes #19 Signed-off-by: Boris Glimcher <[email protected]>
opiproject · Feb 20, 2024 · e3cfad2 · e3cfad2
1 parent fc8cb25
commit e3cfad2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
@@ -158,7 +158,7 @@ jobs:
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible-version }}.tar.gz --disable-pip-version-check
 
       - name: Install ansible lint
-        run: pip install ansible-lint --disable-pip-version-check
+        run: pip install ansible-lint jmespath --disable-pip-version-check
 
       - name: Download migrated collection artifacts
         uses: actions/download-artifact@v1

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -11,3 +11,4 @@ New Roles
 ---------
 
 - opi.dpu.bmc_fw_update - Firmware update of DPU BMC
+- opi.dpu.update_bmc_password - Update Password of DPU BMC for a given user.
diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
@@ -4,6 +4,10 @@ objects:
       description: Firmware update of DPU BMC
       name: bmc_fw_update
       version_added: 1.0.0
+    update_bmc_password:
+      description: Update Password of DPU BMC for a given user.
+      name: update_bmc_password
+      version_added: 1.0.0
 plugins:
   become: {}
   cache: {}

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -6,4 +6,7 @@ releases:
         - description: Firmware update of DPU BMC
           name: bmc_fw_update
           namespace: null
+        - description: Update Password of DPU BMC for a given user.
+          name: update_bmc_password
+          namespace: null
     release_date: '2024-02-20'
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,5 @@
 python-dateutil>=2.8.2
+jmespath>=1.0.1
+antsibull-changelog>=0.25.0
 antsibull-docs>=2.7.0
 ansible-lint>=6.22.2
diff --git a/roles/bmc_fw_update/tasks/main.yml b/roles/bmc_fw_update/tasks/main.yml
@@ -78,7 +78,7 @@
 
 - name: Print BMC Version
   ansible.builtin.debug:
-    msg: "{{ get_bmc_facts_after.redfish_facts.firmware.entries[0].Version }}"
+    msg: "{{ bmc_firmware_version }}"
 
 - name: Validate fw image changed from before
   ansible.builtin.assert:

diff --git a/roles/get_bmc_facts/tasks/main.yml b/roles/get_bmc_facts/tasks/main.yml
@@ -16,4 +16,4 @@
 
 - name: Extract BMC firmware version from inventory
   ansible.builtin.set_fact:
-    bmc_firmware_version: "{{ result.redfish_facts.firmware.entries[0].Version }}"
+    bmc_firmware_version: "{{ result.redfish_facts.firmware | community.general.json_query('entries[?Id==`BMC_Firmware`].Version') }}"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ New Roles
		---------

		- opi.dpu.bmc_fw_update - Firmware update of DPU BMC
		- opi.dpu.update_bmc_password - Update Password of DPU BMC for a given user.