From 37ff2dcbd14ee2386b256a73ea34974d174cb472 Mon Sep 17 00:00:00 2001 From: "ricardo.bartels@telekom.de" Date: Mon, 5 Dec 2022 11:37:57 +0100 Subject: [PATCH] fixes an issue with uninitialized object attributes for permitted_subnets config #203 --- module/sources/check_redfish/import_inventory.py | 8 ++++---- module/sources/vmware/connection.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/sources/check_redfish/import_inventory.py b/module/sources/check_redfish/import_inventory.py index d834ed4..54a864e 100644 --- a/module/sources/check_redfish/import_inventory.py +++ b/module/sources/check_redfish/import_inventory.py @@ -147,6 +147,8 @@ class CheckRedfish(SourceBase): validation_failed = True # check permitted ip subnets + permitted_subnets = list() + excluded_subnets = list() if config_settings.get("permitted_subnets") is None: log.info(f"Config option 'permitted_subnets' in 'source/{self.name}' is undefined. " f"No IP addresses will be populated to NetBox!") @@ -154,8 +156,6 @@ class CheckRedfish(SourceBase): config_settings["permitted_subnets"] = \ [x.strip() for x in config_settings.get("permitted_subnets").split(",") if x.strip() != ""] - permitted_subnets = list() - excluded_subnets = list() # add "invisible" config option self.settings["excluded_subnets"] = None @@ -174,8 +174,8 @@ class CheckRedfish(SourceBase): log.error(f"Problem parsing permitted subnet: {e}") validation_failed = True - config_settings["permitted_subnets"] = permitted_subnets - config_settings["excluded_subnets"] = excluded_subnets + config_settings["permitted_subnets"] = permitted_subnets + config_settings["excluded_subnets"] = excluded_subnets if validation_failed is True: log.error("Config validation failed. Exit!") diff --git a/module/sources/vmware/connection.py b/module/sources/vmware/connection.py index 2ac15d0..e5dd76f 100644 --- a/module/sources/vmware/connection.py +++ b/module/sources/vmware/connection.py @@ -228,6 +228,8 @@ class VMWareHandler(SourceBase): validation_failed = True # check permitted ip subnets + permitted_subnets = list() + excluded_subnets = list() if config_settings.get("permitted_subnets") is None: log.info(f"Config option 'permitted_subnets' in 'source/{self.name}' is undefined. " f"No IP addresses will be populated to NetBox!") @@ -235,8 +237,6 @@ class VMWareHandler(SourceBase): config_settings["permitted_subnets"] = \ [x.strip() for x in config_settings.get("permitted_subnets").split(",") if x.strip() != ""] - permitted_subnets = list() - excluded_subnets = list() # add "invisible" config option self.settings["excluded_subnets"] = None @@ -255,8 +255,8 @@ class VMWareHandler(SourceBase): log.error(f"Problem parsing permitted subnet: {e}") validation_failed = True - config_settings["permitted_subnets"] = permitted_subnets - config_settings["excluded_subnets"] = excluded_subnets + config_settings["permitted_subnets"] = permitted_subnets + config_settings["excluded_subnets"] = excluded_subnets # check include and exclude filter expressions for setting in [x for x in config_settings.keys() if "filter" in x]: