|
18 | 18 | ) |
19 | 19 | from lisa.features import NetworkInterface, SerialConsole, Synthetic |
20 | 20 | from lisa.operating_system import FreeBSD |
21 | | -from lisa.tools import Ip, KernelConfig, Lsmod, Uname, Wget |
| 21 | +from lisa.tools import Ip, KernelConfig, Uname, Wget |
22 | 22 | from lisa.util import perf_timer |
23 | 23 |
|
24 | 24 |
|
@@ -48,7 +48,7 @@ class NetInterface(TestSuite): |
48 | 48 | requirement=simple_requirement(network_interface=Synthetic()), |
49 | 49 | ) |
50 | 50 | def validate_netvsc_reload(self, node: Node, log_path: Path) -> None: |
51 | | - self._validate_netvsc_driver_status(node) |
| 51 | + self._validate_netvsc_built_in(node) |
52 | 52 | network_interface_feature = node.features[NetworkInterface] |
53 | 53 | # Test loading and unloading netvsc driver |
54 | 54 | test_count = 0 |
@@ -111,7 +111,7 @@ def validate_netvsc_reload(self, node: Node, log_path: Path) -> None: |
111 | 111 | def verify_network_interface_reload_via_ip_link( |
112 | 112 | self, node: Node, log: Logger |
113 | 113 | ) -> None: |
114 | | - self._validate_netvsc_driver_status(node) |
| 114 | + self._validate_netvsc_built_in(node) |
115 | 115 | network_interface_feature = node.features[NetworkInterface] |
116 | 116 |
|
117 | 117 | # Ensure netvsc module is loaded |
@@ -146,7 +146,7 @@ def verify_network_interface_reload_via_ip_link( |
146 | 146 | "Cannot access internet from inside VM after test run." |
147 | 147 | ) |
148 | 148 |
|
149 | | - def _validate_netvsc_driver_status(self, node: Node) -> None: |
| 149 | + def _validate_netvsc_built_in(self, node: Node) -> None: |
150 | 150 | if isinstance(node.os, FreeBSD): |
151 | 151 | # Use command "config -x /boot/kernel/kernel | grep hyperv" can also check |
152 | 152 | # if netvsc is build-in. The output "device hyperv" means the the hyperv |
@@ -178,15 +178,5 @@ def _validate_netvsc_driver_status(self, node: Node) -> None: |
178 | 178 | ).exit_code |
179 | 179 | == 0 |
180 | 180 | ) |
181 | | - if not is_built_in_module: |
182 | | - lsmod_tool = node.tools[Lsmod] |
183 | | - usedby_count, _ = lsmod_tool.get_used_by_modules( |
184 | | - "hv_netvsc", sudo=True, force_run=True |
185 | | - ) |
186 | | - if usedby_count == 0: |
187 | | - raise SkippedException( |
188 | | - "Skipping test since hv_netvsc module isn't used by " |
189 | | - "network devices." |
190 | | - ) |
191 | 181 | if is_built_in_module: |
192 | 182 | raise SkippedException("Skipping test since hv_netvsc module is built-in") |
0 commit comments