Replace WMIC with powershell cmd #4034

leidwang · 2024-11-29T03:39:05Z

From Win11-24H2, WMIC is an optional feature for Windows, And it will be fully removed in the future.So replace the related cmd

ID: 3268

From Win11-24H2, WMIC is an optional feature for Windows, And it will be fully removed in the future.So replace the related cmd Signed-off-by: Leidong Wang <[email protected]>

leidwang · 2025-01-08T02:20:39Z

Hi @xiagao @heywji Would you please help test this MR with our acceptance test, thanks.

heywji · 2025-01-15T06:41:09Z

Test 271 acceptance with win2022,win11,win1032 and win2016 guests, this patch worked.

leidwang · 2025-01-15T06:43:39Z

Hi @XueqiangWei @nanliu-r @fbq815 Would you please help test this MR, it is mainly for wmic repalcement.Thanks.

xiagao · 2025-01-16T01:46:03Z

Acceptance test looks good.
LGTM.

mcasquer · 2025-01-16T06:42:32Z

balloon_hotplug test cases now passed in Win2025

 (1/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.q35: STARTED
 (1/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.q35: PASS (50028.55 s)
 (2/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_reboot.q35: STARTED
 (2/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_reboot.q35: PASS (939.88 s)
 (3/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_system_reset.q35: STARTED
 (3/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_system_reset.q35: PASS (871.67 s)
 (4/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_shutdown_after_unplug.q35: STARTED
 (4/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_shutdown_after_unplug.q35: PASS (497.14 s)
 (5/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_shutdown_after_plug.q35: STARTED
 (5/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_shutdown_after_plug.q35: PASS (473.43 s)
 (6/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_migrate.migrate_after_hotplug.q35: STARTED
 (6/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_migrate.migrate_after_hotplug.q35: PASS (601.20 s)
 (7/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_migrate.migrate_after_unplug.q35: STARTED
 (7/7) Host_RHEL.m9.u6.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.Win2025.x86_64.io-github-autotest-qemu.balloon_hotplug.with_migrate.migrate_after_unplug.q35: PASS (694.86 s)
RESULTS    : PASS 7 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0

mcasquer

LGTM

leidwang · 2025-01-22T06:01:26Z

Hi @yanan-fu @YongxueHong Would you please help review this MR?Thanks.

mcasquer · 2025-01-24T09:11:17Z

virttest/utils_windows/drive.py

-    return out if out else []
+    c_name, c_value = cond.split("=")
+    cmd = (
+        'powershell -command "Get-CimInstance -ClassName Win32_LogicalDisk | Where-Object {$_.%s -like %s}'


The disk needs to be under single quotes, same you've done in utils_netperf.py and replace the existing ones by double quotes

Suggested change

'powershell -command "Get-CimInstance -ClassName Win32_LogicalDisk | Where-Object {$_.%s -like %s}'

"powershell -command \"Get-CimInstance -ClassName Win32_LogicalDisk | Where-Object {$_.%s -like '%s'}"

mcasquer · 2025-01-24T09:11:40Z

virttest/utils_windows/drive.py

-        return mapping
-    return {}
+    cmd = (
+        'powershell -command "Get-CimInstance -ClassName Win32_Diskdrive | Where-Object {$_.SerialNumber -eq %s}'


Same as above

Suggested change

'powershell -command "Get-CimInstance -ClassName Win32_Diskdrive | Where-Object {$_.SerialNumber -eq %s}'

"powershell -command \"Get-CimInstance -ClassName Win32_Diskdrive | Where-Object {$_.SerialNumber -eq '%s'}"

mcasquer · 2025-01-24T09:56:49Z

virttest/utils_windows/drive.py

+            results.append(vals[0])
+        else:
+            results.append(dict(zip(keys, vals)))
+    return results if results else []


@leidwang
Another comment here, this implementation seems to no longer return a map, so this will probably break all the calls to this function.

YongxueHong · 2025-02-05T04:28:16Z

virttest/utils_net.py

+    octets = subnet_mask.split(".")
+
+    prefix_length = 0
+    for octet in octets:
+        prefix_length += bin(int(octet)).count("1")
+
+    return prefix_length


Suggested change

octets = subnet_mask.split(".")

prefix_length = 0

for octet in octets:

prefix_length += bin(int(octet)).count("1")

return prefix_length

return sum(bin(int(octet)).count("1") for octet in subnet_mask.split("."))

Hi @PaulYuuu
Would you like to help to review it?
Thanks. CC @nickzhq

Please note that the netmask in set_guest_ip_addr can be CIDR AND dot-decimal notation, only when users give a dot-decimal notation, we have to convert it to a bitmask.

However, the new function is a duplicate of convert_netmask in utils_net module, and set_guest_ip_addr also used it.

avocado-vt/virttest/utils_net.py

Lines 1641 to 1647 in 731ecab

nic_ifname = get_linux_ifname(session, mac)

if session.cmd_status("which ip") != 0:

info_cmd = "ifconfig -a; ethtool -S %s" % nic_ifname

cmd = "ifconfig %s %s netmask %s" % (nic_ifname, ip_addr, netmask)

else:

if "." in netmask:

netmask = convert_netmask(netmask)

BTW, the current convert_netmask can only handle dot-decimal notation, as we already import ipaddress, an enhancement here is to use it to handle all types of netmask.

>>> import ipaddress >>> ip_addr = "192.168.1.1" >>> netmask = "24" # or "255.255.255.0" >>> ipaddr = ipaddress.IPv4Network(f"{ip_addr}/{netmask}", strict=False) >>> ipaddr.netmask IPv4Address('255.255.255.0') >>> ipaddr.prefixlen 24

And then you can use it for linux/windows

YongxueHong · 2025-02-05T04:59:05Z

virttest/utils_net.py

@@ -3941,19 +3968,22 @@ def update_mac_ip_address(vm, timeout=240):


 def get_windows_nic_attribute(
-    session, key, value, target, timeout=240, global_switch="nic"
+    session, key, value, target, timeout=240, global_switch="NetworkAdapter"


Hi @xiagao
Could you help to review if it will affect the test case: https://github.com/autotest/tp-qemu/blob/6f0573097c77bb5d43b1c52574e12f5735714995/qemu/tests/win_virtio_driver_update_by_installer.py#L108-L109
Thanks.

leidwang force-pushed the wmic_replacement branch 2 times, most recently from 97073f0 to 194ab37 Compare November 29, 2024 12:59

leidwang force-pushed the wmic_replacement branch 2 times, most recently from 1c9d9ea to 7c4813a Compare December 24, 2024 03:11

leidwang marked this pull request as ready for review December 31, 2024 01:43

leidwang force-pushed the wmic_replacement branch 5 times, most recently from ae6028c to 9f86791 Compare January 8, 2025 01:51

Replace WMIC with powershell cmd

d1bcda5

From Win11-24H2, WMIC is an optional feature for Windows, And it will be fully removed in the future.So replace the related cmd Signed-off-by: Leidong Wang <[email protected]>

leidwang force-pushed the wmic_replacement branch from 9f86791 to d1bcda5 Compare January 8, 2025 01:55

leidwang mentioned this pull request Jan 8, 2025

Replace WMIC with powershell cmdlet autotest/tp-qemu#4242

Open

mcasquer approved these changes Jan 16, 2025

View reviewed changes

mcasquer reviewed Jan 24, 2025

View reviewed changes

YongxueHong reviewed Feb 5, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace WMIC with powershell cmd #4034

Replace WMIC with powershell cmd #4034

leidwang commented Nov 29, 2024 •

edited

Loading

leidwang commented Jan 8, 2025

heywji commented Jan 15, 2025

leidwang commented Jan 15, 2025

xiagao commented Jan 16, 2025

mcasquer commented Jan 16, 2025

mcasquer left a comment

leidwang commented Jan 22, 2025

mcasquer Jan 24, 2025 •

edited

Loading

mcasquer Jan 24, 2025 •

edited

Loading

mcasquer Jan 24, 2025 •

edited

Loading

YongxueHong Feb 5, 2025

YongxueHong Feb 5, 2025

PaulYuuu Feb 5, 2025

PaulYuuu Feb 5, 2025

YongxueHong Feb 5, 2025

	'powershell -command "Get-CimInstance -ClassName Win32_LogicalDisk \| Where-Object {$_.%s -like %s}'
	"powershell -command \"Get-CimInstance -ClassName Win32_LogicalDisk \| Where-Object {$_.%s -like '%s'}"

	nic_ifname = get_linux_ifname(session, mac)
	if session.cmd_status("which ip") != 0:
	info_cmd = "ifconfig -a; ethtool -S %s" % nic_ifname
	cmd = "ifconfig %s %s netmask %s" % (nic_ifname, ip_addr, netmask)
	else:
	if "." in netmask:
	netmask = convert_netmask(netmask)

Replace WMIC with powershell cmd #4034

Are you sure you want to change the base?

Replace WMIC with powershell cmd #4034

Conversation

leidwang commented Nov 29, 2024 • edited Loading

leidwang commented Jan 8, 2025

heywji commented Jan 15, 2025

leidwang commented Jan 15, 2025

xiagao commented Jan 16, 2025

mcasquer commented Jan 16, 2025

mcasquer left a comment

Choose a reason for hiding this comment

leidwang commented Jan 22, 2025

mcasquer Jan 24, 2025 • edited Loading

Choose a reason for hiding this comment

mcasquer Jan 24, 2025 • edited Loading

Choose a reason for hiding this comment

mcasquer Jan 24, 2025 • edited Loading

Choose a reason for hiding this comment

YongxueHong Feb 5, 2025

Choose a reason for hiding this comment

YongxueHong Feb 5, 2025

Choose a reason for hiding this comment

PaulYuuu Feb 5, 2025

Choose a reason for hiding this comment

PaulYuuu Feb 5, 2025

Choose a reason for hiding this comment

YongxueHong Feb 5, 2025

Choose a reason for hiding this comment

leidwang commented Nov 29, 2024 •

edited

Loading

mcasquer Jan 24, 2025 •

edited

Loading

mcasquer Jan 24, 2025 •

edited

Loading

mcasquer Jan 24, 2025 •

edited

Loading