From 7526c4c24f1923d8a2240493c7f10cac01273d89 Mon Sep 17 00:00:00 2001 From: Iliana Panagopoulou Date: Mon, 4 Sep 2023 17:10:31 +0300 Subject: [PATCH 1/4] Replace display_name for netbox v3.0.0 --- bmcmanager/commands/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bmcmanager/commands/base.py b/bmcmanager/commands/base.py index ec00332..96ccb4b 100644 --- a/bmcmanager/commands/base.py +++ b/bmcmanager/commands/base.py @@ -118,6 +118,7 @@ def get_oob_config(config, dcim, oob_info, get_secret=True): cfg["username"] = secret["name"] if secret["plaintext"]: cfg["password"] = secret["plaintext"] + print(cfg["username"], cfg["password"], oob_params, oob_info) cfg["username"] = os.getenv("BMCMANAGER_USERNAME", cfg["username"]) cfg["password"] = os.getenv("BMCMANAGER_PASSWORD", cfg["password"]) From 04c3e0760253020cdd644aa050967037de00d35e Mon Sep 17 00:00:00 2001 From: Iliana Panagopoulou Date: Mon, 4 Sep 2023 17:13:25 +0300 Subject: [PATCH 2/4] Replace display_name for netbox v3.0.0 --- bmcmanager/dcim/netbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bmcmanager/dcim/netbox.py b/bmcmanager/dcim/netbox.py index 21a2c7b..2ec9330 100644 --- a/bmcmanager/dcim/netbox.py +++ b/bmcmanager/dcim/netbox.py @@ -117,7 +117,7 @@ def get_short_info(self, result): return { "id": result["id"], "name": result["name"], - "display_name": result["display_name"], + "display": result["display"], "serial": result["serial"], "ipmi": result["custom_fields"]["IPMI"] or "unknown-address", "manufacturer": result["device_type"]["manufacturer"]["slug"], From 6bda8440136cdcb328c3277f51319d53107d0fd6 Mon Sep 17 00:00:00 2001 From: Iliana Panagopoulou Date: Mon, 4 Sep 2023 17:13:37 +0300 Subject: [PATCH 3/4] Revert "Replace display_name for netbox v3.0.0" This reverts commit 7526c4c24f1923d8a2240493c7f10cac01273d89. --- bmcmanager/commands/base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bmcmanager/commands/base.py b/bmcmanager/commands/base.py index 96ccb4b..ec00332 100644 --- a/bmcmanager/commands/base.py +++ b/bmcmanager/commands/base.py @@ -118,7 +118,6 @@ def get_oob_config(config, dcim, oob_info, get_secret=True): cfg["username"] = secret["name"] if secret["plaintext"]: cfg["password"] = secret["plaintext"] - print(cfg["username"], cfg["password"], oob_params, oob_info) cfg["username"] = os.getenv("BMCMANAGER_USERNAME", cfg["username"]) cfg["password"] = os.getenv("BMCMANAGER_PASSWORD", cfg["password"]) From 0d4db7828b7b6b6070e86f5d7befc0bbee40f2b3 Mon Sep 17 00:00:00 2001 From: Iliana Panagopoulou Date: Mon, 4 Sep 2023 19:46:07 +0300 Subject: [PATCH 4/4] Add to changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd81b87..4063f75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,15 @@ All notable changes to this project are documented in this file. ## [Unreleased] +## [v1.3.0] (2023-09-04) + ### Added ### Changed +- Changed 'display_name' field to 'display' since 'display_name' field + has been removed in Netbox 2.11.0 + ### Fixed ## [v1.2.0] (2020-02-21)