diff --git a/microsoft/testsuites/cdrom/cdrom.py b/microsoft/testsuites/cdrom/cdrom.py index 93b4c08a60..65f9acde2f 100644 --- a/microsoft/testsuites/cdrom/cdrom.py +++ b/microsoft/testsuites/cdrom/cdrom.py @@ -7,7 +7,7 @@ from lisa import Node, SkippedException, TestCaseMetadata, TestSuite, TestSuiteMetadata from lisa.operating_system import CBLMariner, Debian, Linux -from lisa.sut_orchestrator import AZURE +from lisa.sut_orchestrator import AZURE, HYPERV from lisa.testsuite import simple_requirement from lisa.tools import Gcc from lisa.util.logger import Logger @@ -34,7 +34,7 @@ class CdromSuite(TestSuite): """, priority=2, requirement=simple_requirement( - supported_os=[Linux], supported_platform_type=[AZURE] + supported_os=[Linux], supported_platform_type=[AZURE, HYPERV] ), ) def verify_cdrom_device_status_code(self, node: Node) -> None: diff --git a/microsoft/testsuites/core/azure_image_standard.py b/microsoft/testsuites/core/azure_image_standard.py index d35ca33f3c..20f8dd9164 100644 --- a/microsoft/testsuites/core/azure_image_standard.py +++ b/microsoft/testsuites/core/azure_image_standard.py @@ -35,7 +35,7 @@ SuseRepositoryInfo, Ubuntu, ) -from lisa.sut_orchestrator import AZURE, READY +from lisa.sut_orchestrator import AZURE, READY, HYPERV from lisa.sut_orchestrator.azure.features import AzureDiskOptionSettings from lisa.tools import Cat, Dmesg, Journalctl, Ls, Lsblk, Lscpu, Pgrep, Ssh from lisa.util import ( @@ -267,7 +267,7 @@ class AzureImageStandard(TestSuite): 2. Verify that `Defaults targetpw` should be disabled, if present. """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_default_targetpw(self, node: Node) -> None: sudoers_out = ( @@ -289,7 +289,7 @@ def verify_default_targetpw(self, node: Node) -> None: """, priority=1, requirement=simple_requirement( - supported_platform_type=[AZURE, READY], unsupported_os=[BSD] + supported_platform_type=[AZURE, READY, HYPERV], unsupported_os=[BSD] ), ) def verify_grub(self, node: Node) -> None: @@ -348,7 +348,7 @@ def verify_grub(self, node: Node) -> None: network manager is not installed. """, priority=3, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_network_manager_not_installed(self, node: Node) -> None: if isinstance(node.os, Fedora): @@ -376,7 +376,7 @@ def verify_network_manager_not_installed(self, node: Node) -> None: 2. Verify that networking is enabled in the file. """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_network_file_configuration(self, node: Node) -> None: if isinstance(node.os, Fedora): @@ -405,7 +405,7 @@ def verify_network_file_configuration(self, node: Node) -> None: "ONBOOT=yes" is present in network file. """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_ifcfg_eth0(self, node: Node) -> None: if isinstance(node.os, Fedora): @@ -441,7 +441,7 @@ def verify_ifcfg_eth0(self, node: Node) -> None: files are not present. """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_udev_rules_moved(self, node: Node) -> None: if isinstance(node.os, CoreOs): @@ -477,7 +477,7 @@ def verify_udev_rules_moved(self, node: Node) -> None: 2. Verify that DHCLIENT_SET_HOSTNAME="no" is present in the file. """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_dhcp_file_configuration(self, node: Node) -> None: if isinstance(node.os, Suse): @@ -510,7 +510,7 @@ def verify_dhcp_file_configuration(self, node: Node) -> None: present in the file. """, priority=2, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_yum_conf(self, node: Node) -> None: if isinstance(node.os, Fedora): @@ -533,7 +533,7 @@ def verify_yum_conf(self, node: Node) -> None: 2. Reboot the VM and see if the VM is still in good state. """, priority=2, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_os_update(self, node: Node) -> None: if isinstance(node.os, Posix): @@ -552,7 +552,7 @@ def verify_os_update(self, node: Node) -> None: has length greater than zero. """, priority=2, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_hv_kvp_daemon_installed(self, node: Node) -> None: if isinstance(node.os, Debian): @@ -576,7 +576,7 @@ def verify_hv_kvp_daemon_installed(self, node: Node) -> None: 1. Verify the repository configuration depending on the distro type. """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_repository_installed(self, node: Node) -> None: # noqa: C901 assert isinstance(node.os, Posix) @@ -810,7 +810,7 @@ def verify_repository_installed(self, node: Node) -> None: # noqa: C901 2.2. Expected to see 'console=ttyS0' for x86_64. """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_serial_console_is_enabled(self, node: Node) -> None: console_device = { @@ -874,7 +874,7 @@ def verify_serial_console_is_enabled(self, node: Node) -> None: """, priority=1, use_new_environment=True, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_bash_history_is_empty(self, node: Node) -> None: path_bash_history = "/root/.bash_history" @@ -898,7 +898,7 @@ def verify_bash_history_is_empty(self, node: Node) -> None: existing, fail the case. """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_boot_error_fail_warnings(self, node: Node) -> None: dmesg = node.tools[Dmesg] @@ -947,7 +947,7 @@ def verify_boot_error_fail_warnings(self, node: Node) -> None: fail the case. """, priority=2, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_cloud_init_error_status(self, node: Node) -> None: cat = node.tools[Cat] @@ -995,7 +995,7 @@ def verify_cloud_init_error_status(self, node: Node) -> None: 3. Pass with warning if the value is not between 0 and 180. """, priority=2, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_client_active_interval(self, node: Node) -> None: ssh = node.tools[Ssh] @@ -1016,7 +1016,7 @@ def verify_client_active_interval(self, node: Node) -> None: 3. Fail the case if the key of any user existing. """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_no_pre_exist_users(self, node: Node) -> None: key_pattern = re.compile( diff --git a/microsoft/testsuites/core/debug.py b/microsoft/testsuites/core/debug.py index 79ee053c85..b7b82381f4 100644 --- a/microsoft/testsuites/core/debug.py +++ b/microsoft/testsuites/core/debug.py @@ -12,7 +12,7 @@ TestSuiteMetadata, simple_requirement, ) -from lisa.sut_orchestrator import AZURE, READY +from lisa.sut_orchestrator import AZURE, READY, HYPERV from lisa.tools import Cat, Echo, KernelConfig, Mount from lisa.tools.mkfs import FileSystem @@ -44,7 +44,7 @@ class KernelDebug(TestSuite): """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_enable_kprobe(self, node: Node) -> None: if not node.tools[KernelConfig].is_enabled("CONFIG_KPROBE_EVENTS"): diff --git a/microsoft/testsuites/core/dhcp.py b/microsoft/testsuites/core/dhcp.py index 0fb29296d0..3c28cdcf42 100644 --- a/microsoft/testsuites/core/dhcp.py +++ b/microsoft/testsuites/core/dhcp.py @@ -13,7 +13,7 @@ UnsupportedDistroException, simple_requirement, ) -from lisa.sut_orchestrator import AZURE, READY +from lisa.sut_orchestrator import AZURE, READY, HYPERV from lisa.tools import Dhclient @@ -33,7 +33,7 @@ class Dhcp(TestSuite): """, priority=1, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) def verify_dhcp_client_timeout(self, node: Node) -> None: dhclient = node.tools[Dhclient] diff --git a/microsoft/testsuites/core/hv_module.py b/microsoft/testsuites/core/hv_module.py index 55878db394..a4457f5f6e 100644 --- a/microsoft/testsuites/core/hv_module.py +++ b/microsoft/testsuites/core/hv_module.py @@ -32,7 +32,9 @@ It is responsible for ensuring the Hyper V drivers are all present, are included in initrd, and are all the same version. """, - requirement=simple_requirement(supported_platform_type=["azure", "ready"]), + requirement=simple_requirement( + supported_platform_type=["azure", "ready", "hyperv"] + ), ) class HvModule(TestSuite): @TestCaseMetadata( diff --git a/microsoft/testsuites/core/kvp.py b/microsoft/testsuites/core/kvp.py index 9aaa2a2ea5..5eb59279d6 100644 --- a/microsoft/testsuites/core/kvp.py +++ b/microsoft/testsuites/core/kvp.py @@ -14,7 +14,7 @@ simple_requirement, ) from lisa.operating_system import BSD -from lisa.sut_orchestrator import AZURE, READY +from lisa.sut_orchestrator import AZURE, READY, HYPERV from lisa.sut_orchestrator.azure.tools import KvpClient from lisa.tools import Pgrep, Stat from lisa.util import get_matched_str @@ -27,7 +27,7 @@ This test suite verify the KVP service runs well on Azure and Hyper-V platforms. The KVP is used to communicate between Windows host and guest VM. """, - requirement=simple_requirement(supported_platform_type=[AZURE, READY]), + requirement=simple_requirement(supported_platform_type=[AZURE, READY, HYPERV]), ) class Kvp(TestSuite): # lrwx------ 1 root root 64 Oct 18 19:05 9 -> /dev/vmbus/hv_kvp diff --git a/microsoft/testsuites/core/lsvmbus.py b/microsoft/testsuites/core/lsvmbus.py index 0e031d133a..907a33cda6 100644 --- a/microsoft/testsuites/core/lsvmbus.py +++ b/microsoft/testsuites/core/lsvmbus.py @@ -18,7 +18,7 @@ SecurityProfileType, ) from lisa.operating_system import BSD, Windows -from lisa.sut_orchestrator import AZURE +from lisa.sut_orchestrator import AZURE, HYPERV from lisa.sut_orchestrator.azure.tools import VmGeneration from lisa.tools import Cat, Ls, Lscpu, Lsvmbus from lisa.tools.lsvmbus import VmBusDevice @@ -83,7 +83,7 @@ class LsVmBus(TestSuite): """, priority=1, requirement=simple_requirement( - supported_platform_type=[AZURE], supported_os=[BSD] + supported_platform_type=[AZURE, HYPERV], supported_os=[BSD] ), ) def verify_vmbus_devices_channels_bsd(self, node: Node) -> None: @@ -123,7 +123,7 @@ def verify_vmbus_devices_channels_bsd(self, node: Node) -> None: """, priority=1, requirement=simple_requirement( - supported_platform_type=[AZURE], unsupported_os=[BSD, Windows] + supported_platform_type=[AZURE, HYPERV], unsupported_os=[BSD, Windows] ), ) def verify_vmbus_devices_channels(self, node: Node) -> None: @@ -165,7 +165,7 @@ def verify_vmbus_devices_channels(self, node: Node) -> None: """, priority=4, requirement=simple_requirement( - supported_platform_type=[AZURE], unsupported_os=[BSD, Windows] + supported_platform_type=[AZURE, HYPERV], unsupported_os=[BSD, Windows] ), ) def verify_vmbus_heartbeat_properties(self, node: Node) -> None: diff --git a/microsoft/testsuites/core/msr.py b/microsoft/testsuites/core/msr.py index 4491918b61..ec38fac547 100644 --- a/microsoft/testsuites/core/msr.py +++ b/microsoft/testsuites/core/msr.py @@ -20,7 +20,7 @@ Linux, Suse, ) -from lisa.sut_orchestrator import AZURE +from lisa.sut_orchestrator import AZURE, HYPERV from lisa.tools import Lscpu, Modprobe from lisa.util import MissingPackagesException @@ -109,7 +109,7 @@ def __str__(self) -> str: on Hyper-V or Azure. """, requirement=simple_requirement( - supported_os=[Linux], supported_platform_type=[AZURE] + supported_os=[Linux], supported_platform_type=[AZURE, HYPERV] ), ) class Msr(TestSuite): diff --git a/microsoft/testsuites/core/storage.py b/microsoft/testsuites/core/storage.py index 1d12e71fe4..fc8d9925b1 100644 --- a/microsoft/testsuites/core/storage.py +++ b/microsoft/testsuites/core/storage.py @@ -34,7 +34,7 @@ from lisa.node import Node from lisa.operating_system import BSD, Posix, Windows from lisa.schema import DiskControllerType, DiskOptionSettings, DiskType -from lisa.sut_orchestrator import AZURE +from lisa.sut_orchestrator import AZURE, HYPERV from lisa.sut_orchestrator.azure.features import AzureDiskOptionSettings, AzureFileShare from lisa.sut_orchestrator.azure.tools import Waagent from lisa.tools import Blkid, Cat, Dmesg, Echo, Lsblk, Mount, NFSClient, Swap, Sysctl @@ -85,7 +85,7 @@ class Storage(TestSuite): """, priority=2, requirement=simple_requirement( - supported_platform_type=[AZURE], + supported_platform_type=[AZURE, HYPERV], disk=DiskOptionSettings(disk_controller_type=DiskControllerType.SCSI), ), ) @@ -206,7 +206,7 @@ def verify_resource_disk_mounted(self, node: RemoteNode) -> None: """, priority=1, requirement=simple_requirement( - supported_platform_type=[AZURE], + supported_platform_type=[AZURE, HYPERV], unsupported_os=[BSD, Windows], # This test is skipped as waagent does not support freebsd fully ), @@ -310,7 +310,7 @@ def verify_nvme_disk_controller_type(self, node: RemoteNode) -> None: """, priority=1, requirement=simple_requirement( - supported_platform_type=[AZURE], unsupported_os=[BSD, Windows] + supported_platform_type=[AZURE, HYPERV], unsupported_os=[BSD, Windows] ), ) def verify_os_partition_identifier(self, log: Logger, node: RemoteNode) -> None: @@ -600,7 +600,7 @@ def after_case(self, log: Logger, **kwargs: Any) -> None: """, timeout=TIME_OUT, requirement=simple_requirement( - supported_platform_type=[AZURE], unsupported_os=[BSD, Windows] + supported_platform_type=[AZURE, HYPERV], unsupported_os=[BSD, Windows] ), use_new_environment=True, priority=5, diff --git a/microsoft/testsuites/network/sriov.py b/microsoft/testsuites/network/sriov.py index 019a7ed431..bd3f8a3cef 100644 --- a/microsoft/testsuites/network/sriov.py +++ b/microsoft/testsuites/network/sriov.py @@ -27,7 +27,7 @@ from lisa.features import NetworkInterface, SerialConsole, StartStop from lisa.nic import NicInfo from lisa.operating_system import BSD, Posix, Windows -from lisa.sut_orchestrator import AZURE +from lisa.sut_orchestrator import AZURE, HYPERV from lisa.tools import ( Cat, Ethtool, @@ -267,7 +267,7 @@ def verify_sriov_max_vf_connection_max_cpu(self, environment: Environment) -> No priority=1, requirement=simple_requirement( network_interface=features.Sriov(), - supported_platform_type=[AZURE], + supported_platform_type=[AZURE, HYPERV], ), ) def verify_sriov_disable_enable(self, environment: Environment) -> None: diff --git a/microsoft/testsuites/xfstests/xfstesting.py b/microsoft/testsuites/xfstests/xfstesting.py index 297b3ce003..944f26f7bb 100644 --- a/microsoft/testsuites/xfstests/xfstesting.py +++ b/microsoft/testsuites/xfstests/xfstesting.py @@ -19,7 +19,7 @@ ) from lisa.features import Disk, Nvme from lisa.operating_system import BSD, CBLMariner, Oracle, Redhat, Windows -from lisa.sut_orchestrator import AZURE +from lisa.sut_orchestrator import AZURE, HYPERV from lisa.sut_orchestrator.azure.features import AzureFileShare from lisa.sut_orchestrator.azure.platform_ import AzurePlatform from lisa.testsuite import TestResult @@ -494,7 +494,7 @@ def verify_btrfs_nvme_datadisk(self, log_path: Path, result: TestResult) -> None """, requirement=simple_requirement( min_core_count=16, - supported_platform_type=[AZURE], + supported_platform_type=[AZURE, HYPERV], unsupported_os=[BSD, Windows], ), timeout=TIME_OUT,