From 3ec08a64152a68cfb5048b2fe0afc43e8078afa9 Mon Sep 17 00:00:00 2001 From: Patrick Ogenstad Date: Tue, 11 Jun 2024 19:20:47 +0200 Subject: [PATCH] Add method to clone parameters with private attribute --- nornir/core/__init__.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/nornir/core/__init__.py b/nornir/core/__init__.py index 8dbf1fd2..840b2cb4 100644 --- a/nornir/core/__init__.py +++ b/nornir/core/__init__.py @@ -47,7 +47,7 @@ def __init__( self.inventory = inventory self.config = config or Config() self.processors = processors or Processors() - self.runner = runner + self._runner = runner def __enter__(self) -> "Nornir": return self @@ -65,14 +65,16 @@ def with_processors(self, processors: List[Processor]) -> "Nornir": Given a list of Processor objects return a copy of the nornir object with the processors assigned to the copy. The orinal object is left unmodified. """ - return Nornir(**{**self.__dict__, **{"processors": Processors(processors)}}) + return Nornir( + **{**self._clone_parameters(), **{"processors": Processors(processors)}} + ) def with_runner(self, runner: RunnerPlugin) -> "Nornir": """ Given a runner return a copy of the nornir object with the runner assigned to the copy. The orinal object is left unmodified. """ - return Nornir(**{**self.__dict__, **{"runner": runner}}) + return Nornir(**{**self._clone_parameters(), **{"runner": runner}}) def filter(self, *args: Any, **kwargs: Any) -> "Nornir": """ @@ -81,7 +83,7 @@ def filter(self, *args: Any, **kwargs: Any) -> "Nornir": Returns: :obj:`Nornir`: A new object with same configuration as ``self`` but filtered inventory. """ - b = Nornir(**self.__dict__) + b = Nornir(**self._clone_parameters()) b.inventory = self.inventory.filter(*args, **kwargs) return b @@ -143,7 +145,7 @@ def run( else: logger.warning("Task %r has not been run – 0 hosts selected", task.name) - result = self._runner.run(task, run_on) + result = self.runner.run(task, run_on) raise_on_error = ( raise_on_error @@ -170,12 +172,21 @@ def close_connections_task(task): self.run(task=close_connections_task, on_good=on_good, on_failed=on_failed) @property - def _runner(self) -> RunnerPlugin: - if self.runner: - return self.runner + def runner(self) -> RunnerPlugin: + if self._runner: + return self._runner raise PluginNotRegistered("Runner plugin not registered") + def _clone_parameters(self) -> dict: + return { + "data": self.data, + "inventory": self.inventory, + "config": self.config, + "processors": self.processors, + "runner": self._runner, + } + @classmethod def get_validators(cls) -> Generator[Callable[["Nornir"], "Nornir"], None, None]: yield cls.validate