Merge branch 'main' into pre-commit-ci-update-config

Author: Ruchip16

src/pytest_ansible_network_integration/__init__.py

@@ -4,6 +4,7 @@
 import json
 import logging
 import os
+import sys
 import time
 
 from pathlib import Path
@@ -26,15 +27,15 @@
 from .utils import playbook
 
 
+logger = logging.getLogger(__name__)
+
 # Configure logging
 logging.basicConfig(
     level=logging.DEBUG,
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",  # cspell:ignore levelname
-    handlers=[logging.FileHandler("pytest-network.log"), logging.StreamHandler()],
+    handlers=[logging.FileHandler("pytest-network.log"), logging.StreamHandler(sys.stdout)],
 )
 
-logger = logging.getLogger(__name__)
-
 
 @pytest.fixture(scope="function")
 def network_test_vars(request: pytest.FixtureRequest) -> Dict[str, Any]:
@@ -104,6 +105,7 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         action="store",
         help="The comma delimited negative search substring to filter the roles",
     )
+    parser.addoption("--wait-extra", action="store", help="Add extra wait time in seconds.")
 
 
 OPTIONS = None
@@ -357,8 +359,21 @@ def _appliance_dhcp_address(env_vars: Dict[str, str]) -> Generator[str, None, No
             port=int(env_vars["cml_ssh_port"]),
         )
 
+        # Handle the wait_extra_time
+        wait_extra_time = OPTIONS.wait_extra
+        wait_seconds = 0
+        if wait_extra_time:
+            try:
+                wait_seconds = int(wait_extra_time)
+            except ValueError:
+                logger.warning(
+                    "Invalid wait_extra value: '%s'. Expected an integer. Skipping extra wait.",
+                    wait_extra_time,
+                )
+                wait_seconds = 0
+
         try:
-            ip_address = virsh.get_dhcp_lease(lab_id)
+            ip_address = virsh.get_dhcp_lease(lab_id, wait_seconds)
         except PytestNetworkError as exc:
             logger.error("Failed to get DHCP lease for the appliance")
             virsh.close()

src/pytest_ansible_network_integration/defs.py

@@ -277,10 +277,11 @@ def __init__(self, host: str, user: str, password: str, port: int) -> None:
         self.ssh.connect()
         logger.info("Connected to virsh host %s", host)
 
-    def get_dhcp_lease(self, current_lab_id: str) -> str:
+    def get_dhcp_lease(self, current_lab_id: str, wait_extra: int) -> str:
         """Get the DHCP lease for the specified lab.
 
         :param current_lab_id: The current lab ID.
+        :param wait_extra: The number of seconds to wait before finding the DHCP lease.
         :raises PytestNetworkError: If the DHCP lease cannot be found.
         :return: The IP address associated with the lab.
         """
@@ -290,9 +291,14 @@ def get_dhcp_lease(self, current_lab_id: str) -> str:
         macs = self._extract_macs(current_lab)
         logger.info("Found MAC addresses: %s", macs)
 
-        ips = self._find_dhcp_lease(macs, 100)
+        ips = self._find_dhcp_lease(macs, 200)
         logger.debug("Found IPs: %s", ips)
 
+        if wait_extra:
+            logger.info("Waiting for extra %s seconds", wait_extra)
+            time.sleep(wait_extra)
+            logger.info("Done waiting, starting to find IPs")
+
         if len(ips) > 1:
             logger.error("Found more than one IP: %s", ips)
             raise PytestNetworkError("Found more than one IP")