ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-06-13 03:25:34 +00:00
Code Activity

xenserver_guest_info: use fallback chain for VDI format detection (#12215)

Browse source 
* xenserver_guest_info: use fallback chain for VDI format detection

* changelog: add PR URL to
  changelog fragment

* test: set mismatched vdi_type in vm-3 fixture to test fallback chain precedence

Set vdi_type to "vhd" while image-format remains "qcow2" so the unit
test verifies that image-format takes precedence in the fallback chain.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Shreyash 2026-06-12 16:37:13 +05:30 • committed by GitHub
parent 7b8ed586da
commit 4d72ec3299
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/12119-xenserver-vdi-type-fallback.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- xenserver_guest_info - use fallback chain for determining VDI format from ``sm_config`` keys ``image-format``, ``vdi_type``, ``type``, defaulting to ``raw`` (https://github.com/ansible-collections/community.general/pull/12119, https://github.com/ansible-collections/community.general/pull/12215).

8
plugins/module_utils/_xenserver.py
View file

@ -456,7 +456,13 @@ def gather_vm_facts(module: AnsibleModule, vm_params):
"os_device": vm_vbd_params["device"],
"uuid": vm_vbd_params["VDI"]["uuid"],
"vbd_userdevice": vm_vbd_params["userdevice"],
"vdi_type": vm_vbd_params["VDI"].get("sm_config", {}).get("vdi_type", ""),
"vdi_type": vm_vbd_params["VDI"]["sm_config"].get(
"image-format",
vm_vbd_params["VDI"]["sm_config"].get(
"vdi_type",
vm_vbd_params["VDI"]["sm_config"].get("type", "raw"),
),
),
}
vm_facts["disks"].append(vm_disk_params)

8
plugins/modules/xenserver_guest.py
View file

@ -406,7 +406,9 @@ instance:
"size": 42949672960,
"sr": "Local storage",
"sr_uuid": "0af1245e-bdb0-ba33-1446-57a962ec4075",
"vbd_userdevice": "0"
"uuid": "3f98b388-b2c0-4355-9a01-15c0e61b5a76",
"vbd_userdevice": "0",
"vdi_type": "vhd"
},
{
"name": "testvm_11-1",
@ -415,7 +417,9 @@ instance:
"size": 42949672960,
"sr": "Local storage",
"sr_uuid": "0af1245e-bdb0-ba33-1446-57a962ec4075",
"vbd_userdevice": "1"
"uuid": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
"vbd_userdevice": "1",
"vdi_type": "vhd"
}
],
"domid": "56",

8
plugins/modules/xenserver_guest_powerstate.py
View file

@ -103,7 +103,9 @@ instance:
"size": 42949672960,
"sr": "Local storage",
"sr_uuid": "0af1245e-bdb0-ba33-1446-57a962ec4075",
"vbd_userdevice": "0"
"uuid": "3f98b388-b2c0-4355-9a01-15c0e61b5a76",
"vbd_userdevice": "0",
"vdi_type": "vhd"
},
{
"name": "windows-template-testing-1",
@ -112,7 +114,9 @@ instance:
"size": 42949672960,
"sr": "Local storage",
"sr_uuid": "0af1245e-bdb0-ba33-1446-57a962ec4075",
"vbd_userdevice": "1"
"uuid": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
"vbd_userdevice": "1",
"vdi_type": "vhd"
}
],
"domid": "56",

2
tests/unit/plugins/module_utils/_xenserver/fixtures/ansible-test-vm-3-params.json
View file

@ -139,7 +139,7 @@
"sharable": false,
"sm_config": {
"image-format": "qcow2",
"vdi_type": "qcow2"
"vdi_type": "vhd"
},
"snapshot_of": "OpaqueRef:NULL",
"snapshot_time": "19700101T00:00:00Z",