mirror/netbox-sync
1
0
Fork 0
mirror of https://github.com/bb-Ricardo/netbox-sync.git synced 2026-05-08 11:00:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up some more

Browse Source
This commit is contained in:
Noah
2025-08-22 16:49:21 +10:00
committed by Andrew Foster
parent 9a70da1c12
commit 2c7c3eb59b
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/netbox/object_classes.py
+4 -3
View File
@@ -659,7 +659,6 @@ class NetBoxObject:
max_len=self.data_model.get("slug"))
# update all data items
log.debug2(f"Updating {self.name} '{display_name}' with data: {parsed_data.items()}")
data_updated = False
for key, new_value in parsed_data.items():
@@ -751,8 +750,7 @@ class NetBoxObject:
new_value_str = new_value_str.replace("\n", " ")
log.info(f"{self.name.capitalize()} '{display_name}' attribute '{key}' changed from "
f"'{current_value_str}' to '{new_value_str}'")
log.debug2(f"Updating {self.name} '{display_name}' attribute '{key}' from "
f"'{current_value_str}' to '{new_value_str}'")
self.data[key] = new_value
self.updated_items.append(key)
data_updated = True
@@ -1873,6 +1871,7 @@ class NBCluster(NetBoxObject):
def __init__(self, *args, **kwargs):
self.mapping = NetBoxMappings()
# scope types allowed for clusters
self.scopes = [
NBSite, NBSiteGroup, NBLocation, NBRegion
]
@@ -1883,7 +1882,9 @@ class NBCluster(NetBoxObject):
"tenant": NBTenant,
"group": NBClusterGroup,
"scope_type": self.mapping.scopes_object_types(self.scopes),
# supports scoped clusters
"scope_id": NetBoxObject,
# supports pre4.2.0 clusters with site
"site": NBSite,
"tags": NBTagList
}
module/sources/vmware/config.py
+1 -1
View File
@@ -163,7 +163,7 @@ class VMWareConfig(ConfigBase):
key: defines a cluster name as regex
value: defines the NetBox scope id (use quotes if name contains commas)
""",
config_example="Cluster_NYC = New York, Cluster_FFM.* = Data Centers, Cluster_BER = Building 1"),
config_example="Cluster_NYC = 1, Cluster_FFM.* = 2, Cluster_BER = 7"),
ConfigOption("cluster_tenant_relation",
str,
description="""\
module/sources/vmware/connection.py
+14 -11
View File
@@ -469,7 +469,7 @@ class VMWareHandler(SourceBase):
if object_type not in [NBCluster, NBDevice]:
raise ValueError(f"Object must be a '{NBCluster.name}' or '{NBDevice.name}'.")
log.debug(f"Trying to find site name for {object_type.name} '{object_name}'")
log.debug2(f"Trying to find site name for {object_type.name} '{object_name}'")
# check if site was provided in config
relation_name = "host_site_relation" if object_type == NBDevice else "cluster_site_relation"
@@ -525,24 +525,28 @@ class VMWareHandler(SourceBase):
if object_type != NBCluster:
raise ValueError(f"Object type must be '{NBCluster.name}'.")
# get scope type from relation config
relation_name = "cluster_scope_type_relation"
scope_type = self.get_object_relation(object_name, relation_name)
log.debug(f"Retrieved scope type '{scope_type}' for {object_type.name} '{object_name}' from relation '{relation_name}'.")
# if the scope_type is a list, use the first element
if scope_type is not None and type(scope_type) is list:
scope_type_list = scope_type
scope_type = scope_type_list[0] if len(scope_type_list) > 0 else None
log.debug(f"Scope type for {object_type.name} '{object_name}' is a list, using first element: '{scope_type}'")
# if scope_type is not a str, return None
if type(scope_type) is not str:
log.debug(f"scope_type is type: {type(scope_type)}, not str")
return None
# set scope_type to None if it is configured as "<NONE>"
if scope_type == "<NONE>":
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.")
log.debug2(f"Returning scope type '{scope_type}' for {object_type.name} '{object_name}'.")
return scope_type
def get_scope_id(self, object_type, object_name):
@@ -567,21 +571,19 @@ class VMWareHandler(SourceBase):
if object_type != NBCluster:
raise ValueError(f"Object type must be '{NBCluster.name}'.")
# get scope id from relation config
relation_name = "cluster_scope_id_relation"
scope_id = self.get_object_relation(object_name, relation_name)
# return None if scope_id is None or not a string
if scope_id is None:
scope_id = object_name
if scope_id is None:
log.debug(f"No scope id found for {object_name}.")
return None
log.debug(f"No scope id found for {object_name}.")
return None
if type(scope_id) is not str:
log.debug(f"scope_id is type: {type(scope_id)}, not str")
return None
log.debug(f"Retrieved scope id '{scope_id}' for {object_type.name} '{object_name}' from relation '{relation_name}'. End of method.")
log.debug2(f"Retrieved scope id '{scope_id}' for {object_type.name} '{object_name}' from relation '{relation_name}'. End of method.")
return scope_id
@@ -1472,8 +1474,9 @@ class VMWareHandler(SourceBase):
self.settings.cluster_include_filter,
self.settings.cluster_exclude_filter) is False:
return
log.debug(f"Cluster '{name}' passes include and exclude filters. Continuing.")
log.debug2(f"Cluster '{name}' passes include and exclude filters. Continuing.")
# get scope type and id, or site name
scope_type = self.get_scope_type(NBCluster, full_cluster_name)
if scope_type is None:
scope_type = self.get_scope_type(NBCluster, name)
@@ -1504,7 +1507,7 @@ class VMWareHandler(SourceBase):
else:
log.debug(f"Cluster '{full_cluster_name}' has no scope type or scope id.")
else:
# set site_name in the pre-4.2.0 NetBox versions is one is found
# set site_name in the pre-4.2.0 NetBox versions if one is found
if site_name is not None:
data["site"] = {"name": site_name}