From 34e359135468d6d6e4e4cccde2de4220ad57d9a1 Mon Sep 17 00:00:00 2001 From: Anthony House Date: Wed, 1 Nov 2023 15:40:36 -0400 Subject: [PATCH 1/3] Update pyproject build-system for PEP-517 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 38ccdb6..ecc7e9e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -106,8 +106,8 @@ notes = """, """ [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" [tool.pytest.ini_options] testpaths = "tests/" From d53405b1e3d18cafeec57f44b697db0a461df3e5 Mon Sep 17 00:00:00 2001 From: Anthony House Date: Wed, 1 Nov 2023 19:56:55 -0400 Subject: [PATCH 2/3] Update merge_config Task logging --- nornir_nautobot/plugins/tasks/dispatcher/default.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nornir_nautobot/plugins/tasks/dispatcher/default.py b/nornir_nautobot/plugins/tasks/dispatcher/default.py index e6b32d3..c99c26d 100644 --- a/nornir_nautobot/plugins/tasks/dispatcher/default.py +++ b/nornir_nautobot/plugins/tasks/dispatcher/default.py @@ -415,6 +415,10 @@ def merge_config( f"result: {push_result[0].result}, changed: {push_result.changed}", extra={"object": obj}, ) + + if push_result.diff: + logger.info(f"```\nDiff: {push_result.diff}\n```", extra={"object": obj}) + logger.info("Config merge ended", extra={"object": obj}) return Result( host=task.host, From cd314c4e56e479449a6e5057e0f83706bf375475 Mon Sep 17 00:00:00 2001 From: Anthony House Date: Wed, 1 Nov 2023 20:18:32 -0400 Subject: [PATCH 3/3] Update merge_config Task logging --- nornir_nautobot/plugins/tasks/dispatcher/default.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nornir_nautobot/plugins/tasks/dispatcher/default.py b/nornir_nautobot/plugins/tasks/dispatcher/default.py index c99c26d..0d85f12 100644 --- a/nornir_nautobot/plugins/tasks/dispatcher/default.py +++ b/nornir_nautobot/plugins/tasks/dispatcher/default.py @@ -417,7 +417,7 @@ def merge_config( ) if push_result.diff: - logger.info(f"```\nDiff: {push_result.diff}\n```", extra={"object": obj}) + logger.info(f"Diff:\n```\n_{push_result.diff}\n```", extra={"object": obj}) logger.info("Config merge ended", extra={"object": obj}) return Result(