Fix imports

Author: adityagesh

lisa/microsoft/testsuites/core/provisioning.py

@@ -466,5 +466,5 @@ def check_sriov(self, log: Logger, node: RemoteNode) -> None:
             )
             assert_that(len(node_nic_info.get_pci_nics())).described_as(
                 f"VF count inside VM is {len(node_nic_info.get_pci_nics())},"
-                f"actual sriov nic count is {sriov_count}"
+                f" actual sriov nic count is {sriov_count}"
             ).is_equal_to(sriov_count)

lisa/microsoft/testsuites/kselftest/kselftest-suite.py

@@ -1,11 +1,11 @@
 from typing import Any, Dict
 
-from microsoft.testsuites.kselftest.kselftest import Kselftest
-
 from lisa import Node, TestCaseMetadata, TestSuite, TestSuiteMetadata
 from lisa.testsuite import TestResult, simple_requirement
 from lisa.util import SkippedException, UnsupportedDistroException
 
+from microsoft.testsuites.kselftest.kselftest import Kselftest
+
 
 @TestSuiteMetadata(
     area="kselftest",

lisa/microsoft/testsuites/ltp/ltpsuite.py

@@ -4,8 +4,6 @@
 from logging import Logger
 from typing import Any, Dict
 
-from microsoft.testsuites.ltp.ltp import Ltp
-
 from lisa import (
     Node,
     TestCaseMetadata,
@@ -19,6 +17,8 @@
 from lisa.testsuite import TestResult
 from lisa.tools import Lsblk, Swap
 
+from microsoft.testsuites.ltp.ltp import Ltp
+
 
 @TestSuiteMetadata(
     area="ltp",

lisa/microsoft/testsuites/network/networksettings.py

@@ -6,6 +6,7 @@
 from typing import Any, Dict, List, Tuple, Union, cast
 
 from assertpy import assert_that
+from microsoft.testsuites.network.common import cleanup_iperf3
 
 from lisa import (
     Environment,
@@ -25,7 +26,6 @@
 from lisa.operating_system import BSD, Debian, Redhat, Suse, Ubuntu, Windows
 from lisa.tools import Ethtool, Iperf3, KernelConfig, Ls, Modinfo, Nm
 from lisa.util import parse_version
-from microsoft.testsuites.network.common import cleanup_iperf3
 
 
 @TestSuiteMetadata(

lisa/microsoft/testsuites/network/sriov.py

@@ -5,6 +5,17 @@
 from typing import Any, Dict, List, cast
 
 from assertpy import assert_that
+from microsoft.testsuites.network.common import (
+    cleanup_iperf3,
+    disable_enable_devices,
+    initialize_nic_info,
+    reload_modules,
+    remove_extra_nics,
+    restore_extra_nics,
+    sriov_basic_test,
+    sriov_disable_enable,
+    sriov_vf_connection_test,
+)
 
 from lisa import (
     Environment,
@@ -45,17 +56,6 @@
     check_till_timeout,
 )
 from lisa.util.shell import wait_tcp_port_ready
-from microsoft.testsuites.network.common import (
-    cleanup_iperf3,
-    disable_enable_devices,
-    initialize_nic_info,
-    reload_modules,
-    remove_extra_nics,
-    restore_extra_nics,
-    sriov_basic_test,
-    sriov_disable_enable,
-    sriov_vf_connection_test,
-)
 
 
 @TestSuiteMetadata(
@@ -276,8 +276,8 @@ def verify_sriov_disable_enable(self, environment: Environment) -> None:
             for nic in node.nics.nics.values():
                 if nic.is_pci_only_nic:
                     raise SkippedException(
-                        f"SRIOV disable/enable test not applicable for PCI-only NIC {nic.name} "
-                        f"on node {node.name}."
+                        f"SRIOV disable/enable test not applicable for "
+                        f"PCI-only NIC {nic.name} on node {node.name}."
                     )
 
         sriov_disable_enable(environment)
@@ -304,8 +304,8 @@ def verify_sriov_disable_enable_pci(self, environment: Environment) -> None:
             for nic in node.nics.nics.values():
                 if nic.is_pci_only_nic:
                     raise SkippedException(
-                        f"SRIOV disable/enable PCI test not applicable for PCI-only NIC {nic.name} "
-                        f"on node {node.name}."
+                        f"SRIOV disable/enable PCI test not applicable for "
+                        f"PCI-only NIC {nic.name} on node {node.name}."
                     )
 
         disable_enable_devices(environment)
@@ -337,8 +337,8 @@ def verify_sriov_disable_enable_on_guest(self, environment: Environment) -> None
             for nic in node.nics.nics.values():
                 if nic.is_pci_only_nic:
                     raise SkippedException(
-                        f"SRIOV disable/enable on guest test not applicable for PCI-only NIC {nic.name} "
-                        f"on node {node.name}."
+                        f"SRIOV disable/enable on guest test not applicable "
+                        f"for PCI-only NIC {nic.name} on node {node.name}."
                     )
 
         vm_nics = initialize_nic_info(environment)

lisa/microsoft/testsuites/network/stress.py

@@ -3,6 +3,13 @@
 from typing import Any, cast
 
 from assertpy import assert_that
+from microsoft.testsuites.network.common import (
+    cleanup_iperf3,
+    initialize_nic_info,
+    sriov_basic_test,
+    sriov_disable_enable,
+    sriov_vf_connection_test,
+)
 
 from lisa import (
     Environment,
@@ -21,13 +28,6 @@
 from lisa.nic import NicInfo
 from lisa.sut_orchestrator import AZURE
 from lisa.tools import Cat, Iperf3
-from microsoft.testsuites.network.common import (
-    cleanup_iperf3,
-    initialize_nic_info,
-    sriov_basic_test,
-    sriov_disable_enable,
-    sriov_vf_connection_test,
-)
 
 
 @TestSuiteMetadata(
@@ -139,8 +139,8 @@ def stress_sriov_disable_enable(self, environment: Environment) -> None:
             for nic in node.nics.nics.values():
                 if nic.is_pci_only_nic:
                     raise SkippedException(
-                        f"SRIOV stress disable/enable test not applicable for PCI-only NIC {nic.name} "
-                        f"on node {node.name}."
+                        f"SRIOV stress disable/enable test not applicable "
+                        f"for PCI-only NIC {nic.name} on node {node.name}."
                     )
 
         sriov_disable_enable(environment, times=50)

lisa/microsoft/testsuites/xdp/common.py

@@ -5,11 +5,12 @@
 from time import sleep
 from typing import Dict, List, Pattern
 
+from microsoft.testsuites.xdp.xdpdump import XdpDump
+
 from lisa import Logger, Node, SkippedException, UnsupportedDistroException
 from lisa.nic import NicInfo
 from lisa.tools import Echo, Ethtool, Ls, Mount
 from lisa.tools.mkfs import FileSystem
-from microsoft.testsuites.xdp.xdpdump import XdpDump
 
 _rx_drop_patterns = [
     # rx_queue_0_xdp_drop
@@ -37,7 +38,7 @@
 
 def get_xdpdump(node: Node) -> XdpDump:
     try:
-        xdpdump = node.tools[XdpDump]
+        xdpdump: XdpDump = node.tools[XdpDump]
     except UnsupportedDistroException as e:
         raise SkippedException(e)
 

lisa/microsoft/testsuites/xfstests/xfstesting.py

@@ -4,8 +4,6 @@
 from pathlib import Path
 from typing import Any, Dict, Union, cast
 
-from microsoft.testsuites.xfstests.xfstests import Xfstests
-
 from lisa import (
     Logger,
     Node,
@@ -27,7 +25,13 @@
 from lisa.sut_orchestrator.azure.platform_ import AzurePlatform
 from lisa.testsuite import TestResult
 from lisa.tools import Echo, FileSystem, KernelConfig, Mkfs, Mount, Parted
-from lisa.util import BadEnvironmentStateException, LisaException, generate_random_chars
+from lisa.util import (
+    BadEnvironmentStateException,
+    LisaException,
+    generate_random_chars,
+)
+
+from microsoft.testsuites.xfstests.xfstests import Xfstests
 
 # Global variables
 # Section : NFS options. <TODO>

lisa/nic.py

@@ -83,9 +83,12 @@ def is_pci_device(self) -> bool:
     @property
     def is_pci_only_nic(self) -> bool:
         """
-        Check if this is an Accelerated Networking (AN) NIC without synthetic NIC pairing.
+        Check if this is an Accelerated Networking (AN) NIC without
+        synthetic NIC pairing.
         """
-        return not self.lower and self.is_pci_device and self.module_name != "hv_netvsc"
+        return (
+            not self.lower and self.is_pci_device and self.module_name != "hv_netvsc"
+        )
 
     @property
     def pci_device_name(self) -> str:
@@ -171,7 +174,8 @@ def get_synthetic_devices(self) -> List[str]:
         for nic in self.nics.values():
             is_synthetic = not nic.lower and not nic.is_pci_device
             self._node.log.debug(
-                f"  NIC {nic.name}: lower='{nic.lower}', is_pci_device={nic.is_pci_device}, "
+                f"  NIC {nic.name}: lower='{nic.lower}', "
+                f"is_pci_device={nic.is_pci_device}, "
                 f"pci_slot='{nic.pci_slot}', module_name='{nic.module_name}', "
                 f"is_synthetic={is_synthetic}"
             )
@@ -342,7 +346,8 @@ def load_nics_info(self, nic_name: Optional[str] = None) -> None:
         if not nic_name:
             assert_that(sorted(found_nics)).described_as(
                 f"Could not locate nic info for all nics. "
-                f"Nic set was {self.nics.keys()} and only found info for {found_nics}"
+                f"Nic set was {self.nics.keys()} and only found info for "
+                f"{found_nics}"
             ).is_equal_to(sorted(self.nics.keys()))
 
     def reload(self) -> None:
@@ -512,8 +517,9 @@ def is_mana_driver_enabled(self) -> bool:
 
     def _discover_standalone_pci_nics(self, lspci: Lspci) -> None:
         """
-        Discover standalone PCI NICs by checking device paths for PCI information.
-        This handles scenarios where NICs operate as standalone PCI devices without synthetic pairing.
+        Discover standalone PCI NICs by checking device paths for PCI
+        information. This handles scenarios where NICs operate as standalone
+        PCI devices without synthetic pairing.
         """
         # Get unpaired NICs that might have PCI devices
         unpaired_nics = self.get_unpaired_devices()
@@ -562,7 +568,6 @@ def _discover_standalone_pci_nics(self, lspci: Lspci) -> None:
                         f"{device_path}"
                     )
 
-
     def _get_default_nic(self) -> None:
         self.default_nic: str = ""
         self.default_nic_route: str = ""