Updated support for Pxe cluster

microsoft · Feb 5, 2025 · 3aad04d · 3aad04d
1 parent 7f14064
commit 3aad04d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/lisa/sut_orchestrator/baremetal/platform_.py b/lisa/sut_orchestrator/baremetal/platform_.py
@@ -80,7 +80,7 @@ def _deploy_environment(self, environment: Environment, log: Logger) -> None:
 
         if self._cluster_runbook.ready_checker:
             ready_checker = self.ready_checker_factory.create_by_runbook(
-                self._cluster_runbook.ready_checker
+                self._cluster_runbook.ready_checker, parent_logger=log
             )
 
         for index, node in enumerate(environment.nodes.list()):
@@ -139,7 +139,7 @@ def _predeploy_environment(self, environment: Environment, log: Logger) -> None:
         # ready checker cleanup
         if self._cluster_runbook.ready_checker:
             ready_checker = self.ready_checker_factory.create_by_runbook(
-                self._cluster_runbook.ready_checker
+                self._cluster_runbook.ready_checker, parent_logger=log,
             )
             ready_checker.clean_up()
 

diff --git a/lisa/sut_orchestrator/baremetal/readychecker.py b/lisa/sut_orchestrator/baremetal/readychecker.py
@@ -3,15 +3,15 @@
 
 import os
 from dataclasses import dataclass
-from typing import Type, cast
+from typing import Any, Type, cast
 
 import requests
 from dataclasses_json import dataclass_json
 
 from lisa import schema
 from lisa.node import Node, RemoteNode
 from lisa.util import InitializableMixin, LisaException, check_till_timeout, subclasses
-from lisa.util.logger import get_logger
+from lisa.util.logger import Logger, get_logger
 from lisa.util.shell import try_connect
 
 from .context import get_node_context
@@ -22,10 +22,13 @@ class ReadyChecker(subclasses.BaseClassWithRunbookMixin, InitializableMixin):
     def __init__(
         self,
         runbook: ReadyCheckerSchema,
+        parent_logger: Logger,
     ) -> None:
         super().__init__(runbook=runbook)
         self.ready_checker_runbook: ReadyCheckerSchema = self.runbook
-        self._log = get_logger("ready_checker", self.__class__.__name__)
+        self._log = get_logger(
+            "ready_checker", self.__class__.__name__, parent=parent_logger
+        )
 
     @classmethod
     def type_schema(cls) -> Type[schema.TypedSchema]:
@@ -48,10 +51,10 @@ class FileSingleChecker(ReadyChecker):
     def __init__(
         self,
         runbook: FileSingleSchema,
+        **kwargs: Any,
     ) -> None:
-        super().__init__(runbook=runbook)
+        super().__init__(runbook=runbook, **kwargs)
         self.file_single_runbook: FileSingleSchema = self.runbook
-        self._log = get_logger("file_single", self.__class__.__name__)
 
     @classmethod
     def type_name(cls) -> str:
@@ -86,10 +89,10 @@ class SshChecker(ReadyChecker):
     def __init__(
         self,
         runbook: ReadyCheckerSchema,
+        **kwargs: Any,
     ) -> None:
-        super().__init__(runbook=runbook)
+        super().__init__(runbook=runbook, **kwargs)
         self.ssh_runbook: ReadyCheckerSchema = self.runbook
-        self._log = get_logger("ssh", self.__class__.__name__)
 
     @classmethod
     def type_name(cls) -> str:
@@ -135,10 +138,10 @@ class HttpChecker(ReadyChecker):
     def __init__(
         self,
         runbook: HttpSchema,
+        **kwargs: Any,
     ) -> None:
-        super().__init__(runbook=runbook)
+        super().__init__(runbook=runbook, **kwargs)
         self.http_check_runbook: HttpSchema = self.runbook
-        self._log = get_logger("http", self.__class__.__name__)
 
     @classmethod
     def type_name(cls) -> str: