internet/kubevirt.core
3
0
Fork 0
mirror of https://github.com/kubevirt/kubevirt.core.git synced 2026-07-27 01:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(inventory): add default_win_ansible_connection option

Browse Source 
It adds the option `default_win_ansible_connection` to allow users to
configure the default `ansible_connection` for Windows VMs detected by
the inventory plugin, instead of always hardcoding `winrm`. This enables
use of alternative connection plugins like `psrp` or `ssh` without
per-host overrides.

Defaults to `winrm` for backward compatibility.

Assisted-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Javier Cano Cano <jcanocan@redhat.com>
This commit is contained in:
Javier Cano Cano
2026-05-06 15:49:05 +02:00
parent 19cc611159
commit 42fd3fecfd
4 changed files with 139 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
tests/unit/plugins/inventory/blackbox/test_kubevirt_ansible_connection_winrm.py → tests/unit/plugins/inventory/blackbox/test_kubevirt_win_ansible_connection.py
View File

@@ -78,23 +78,54 @@ SVC_LB_WINRM_HTTPS = {
},
"status": {"loadBalancer": {"ingress": [{"ip": "192.168.1.100"}]}},
}
SVC_LB_SSH = merge_dicts(
SVC_LB_WINRM_HTTPS,
{
"metadata": {
"name": "test-lb-ssh",
"uid": "33a31042-f58c-5044-cf78-ef211cedb1d4",
},
"spec": {
"ports": [
{
"protocol": "TCP",
"port": 12345,
"targetPort": 22,
},
],
},
},
)
@pytest.mark.parametrize(
"vmi,expected,use_service",
"vmi,expected,use_service,default_win_ansible_connection,services",
[
(BASE_VMI, False, False),
(WINDOWS_VMI_1, True, True),
(WINDOWS_VMI_2, True, True),
(WINDOWS_VMI_3, True, True),
(WINDOWS_VMI_4, True, True),
(WINDOWS_VMI_1, True, False),
(WINDOWS_VMI_2, True, False),
(WINDOWS_VMI_3, True, False),
(WINDOWS_VMI_4, True, False),
(BASE_VMI, False, False, "winrm", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_1, True, True, "winrm", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_2, True, True, "winrm", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_3, True, True, "winrm", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_4, True, True, "winrm", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_1, True, False, "winrm", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_2, True, False, "winrm", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_3, True, False, "winrm", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_4, True, False, "winrm", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_1, True, True, "psrp", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_1, True, False, "psrp", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_2, True, True, "ansible.builtin.psrp", [SVC_LB_WINRM_HTTPS]),
(WINDOWS_VMI_3, True, False, "ssh", [SVC_LB_SSH]),
(WINDOWS_VMI_4, True, True, "ansible.builtin.ssh", [SVC_LB_SSH]),
],
)
def test_ansible_connection_winrm(inventory, hosts, vmi, expected, use_service):
def test_default_win_ansible_connection(
inventory,
hosts,
vmi,
expected,
use_service,
default_win_ansible_connection,
services,
):
inventory._populate_inventory(
{
"default_hostname": "test",
@@ -103,16 +134,19 @@ def test_ansible_connection_winrm(inventory, hosts, vmi, expected, use_service):
"default": {
"vms": [],
"vmis": [vmi],
"services": {"testdomain": [SVC_LB_WINRM_HTTPS]},
"services": {"testdomain": services},
}
},
},
InventoryOptions(use_service=use_service),
InventoryOptions(
use_service=use_service,
default_win_ansible_connection=default_win_ansible_connection,
),
)
host = f"{DEFAULT_NAMESPACE}-{vmi['metadata']['name']}"
if expected:
assert hosts[host]["ansible_connection"] == "winrm"
assert hosts[host]["ansible_connection"] == default_win_ansible_connection
else:
assert "ansible_connection" not in hosts[host]
if use_service: