From 0625c3c2d96161ed84762d8aec6830123980a7fc Mon Sep 17 00:00:00 2001 From: Noah Date: Fri, 22 Aug 2025 15:36:59 +1000 Subject: [PATCH] added as an option for scope type in config --- module/sources/vmware/config.py | 2 ++ module/sources/vmware/connection.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/module/sources/vmware/config.py b/module/sources/vmware/config.py index c663f2f..c884df6 100644 --- a/module/sources/vmware/config.py +++ b/module/sources/vmware/config.py @@ -148,6 +148,7 @@ class VMWareConfig(ConfigBase): description="""This option defines the scope type for a cluster. The scope type can be 'dcim.site', 'dcim.sitegroup', 'dcim.location' or 'dcim.region'. This is done with a comma separated key = value list. + Can be set to "" to not assign a scope type. key: defines a cluster name as regex value: defines the NetBox scope type name (use quotes if name contains commas) """, @@ -157,6 +158,7 @@ class VMWareConfig(ConfigBase): description="""This option defines the scope id for a cluster. The scope id is the NetBox ID of the scope type. This is done with a comma separated key = value list. + To be used in combination with the 'cluster_scope_type_relation'. key: defines a cluster name as regex value: defines the NetBox scope id (use quotes if name contains commas) """, diff --git a/module/sources/vmware/connection.py b/module/sources/vmware/connection.py index e1b81a7..7ea2d57 100644 --- a/module/sources/vmware/connection.py +++ b/module/sources/vmware/connection.py @@ -540,6 +540,11 @@ class VMWareHandler(SourceBase): if type(scope_type) is not str: log.debug(f"scope_type is type: {type(scope_type)}, not str") return None + + if scope_type == "": + log.debug(f"Scope type for {object_type.name} '{object_name}' is set to None") + return None + log.debug(f"Returning scope type '{scope_type}' for {object_type.name} '{object_name}'. End of method.") return scope_type