Skip to content

Commit 9a70da1

Browse files
Noah418afoster
authored andcommitted
cleaned up a bit
1 parent 0625c3c commit 9a70da1

3 files changed

Lines changed: 6 additions & 42 deletions

File tree

module/netbox/object_classes.py

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,7 @@ def update(self, data=None, read_from_netbox=False, source=None):
563563

564564
# check data model to see how we have to parse the value
565565
defined_value_type = self.data_model.get(key)
566+
566567
# value must be a string witch a certain max length
567568
if isinstance(defined_value_type, int):
568569
if not isinstance(value, str):
@@ -586,7 +587,7 @@ def update(self, data=None, read_from_netbox=False, source=None):
586587

587588
# check if value is in defined list
588589
elif value not in defined_value_type:
589-
log.error(f"this one. Invalid data type for '{key}' (must be one of {defined_value_type}), got: '{value}'")
590+
log.error(f"Invalid data type for '{key}' (must be one of {defined_value_type}), got: '{value}'")
590591
continue
591592

592593
# just check the type of the value
@@ -1272,21 +1273,6 @@ def get_site_name(self, data=None):
12721273

12731274
if isinstance(this_site, dict):
12741275
return this_site.get("name")
1275-
1276-
def get_scope_type(self, data=None):
1277-
this_data_set = data
1278-
if this_data_set is None:
1279-
this_data_set = self.data
1280-
1281-
return this_data_set.get("scope_type")
1282-
1283-
def get_scope_id(self, data=None):
1284-
this_data_set = data
1285-
if this_data_set is None:
1286-
this_data_set = self.data
1287-
1288-
return this_data_set.get("scope_id")
1289-
12901276

12911277
class NBObjectList(list):
12921278
"""
@@ -1884,7 +1870,6 @@ class NBCluster(NetBoxObject):
18841870
primary_key = "name"
18851871
secondary_key = "scope_id"
18861872
prune = False
1887-
# include_secondary_key_if_present = True
18881873

18891874
def __init__(self, *args, **kwargs):
18901875
self.mapping = NetBoxMappings()
@@ -1906,21 +1891,10 @@ def __init__(self, *args, **kwargs):
19061891

19071892
def update(self, data=None, read_from_netbox=False, source=None):
19081893

1909-
# Add adaption for change in NetBox 4.2.0 Device model
1910-
# if version.parse(self.inventory.netbox_api_version) >= version.parse("4.2.0"):
1911-
# if data.get("site") is not None:
1912-
# data["scope_id"] = data.get("site")
1913-
# data["scope_type"] = "dcim.site"
1914-
# del data["site"]
1915-
1916-
# if data.get("scope_id") is not None:
1917-
# data["scope_type"] = "dcim.site"
1918-
19191894
super().update(data=data, read_from_netbox=read_from_netbox, source=source)
19201895

19211896
def resolve_relations(self):
19221897
log.debug2(f"Resolving relations for {self.name} '{self.get_display_name()}'")
1923-
# self.resolve_scoped_relations("scope_id", "scope_type")
19241898
super().resolve_relations()
19251899

19261900

module/sources/vmware/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ def __init__(self):
149149
The scope type can be 'dcim.site', 'dcim.sitegroup', 'dcim.location' or 'dcim.region'.
150150
This is done with a comma separated key = value list.
151151
Can be set to "<NONE>" to not assign a scope type.
152+
Note: this does not remove scope types from existing clusters in NetBox.
152153
key: defines a cluster name as regex
153154
value: defines the NetBox scope type name (use quotes if name contains commas)
154155
""",

module/sources/vmware/connection.py

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -498,10 +498,7 @@ def get_site_name(self, object_type, object_name, cluster_name=""):
498498
site_name = None
499499
log.debug2(f"Site relation for '{object_name}' set to None")
500500

501-
if site_name is None and object_type == NBCluster:
502-
log.debug(f"No site relation for {object_type.name} '{object_name}' found")
503-
504-
log.debug(f"Returning site name '{site_name}' for {object_type.name} '{object_name}'. End of method.")
501+
log.debug2(f"Returning site name '{site_name}' for {object_type.name} '{object_name}'.")
505502

506503
return site_name
507504

@@ -574,12 +571,6 @@ def get_scope_id(self, object_type, object_name):
574571
relation_name = "cluster_scope_id_relation"
575572

576573
scope_id = self.get_object_relation(object_name, relation_name)
577-
578-
# object_instance = self.inventory.get_by_data(object_type, data={"name": object_name})
579-
580-
# if object_instance is None:
581-
# log.debug2(f"No {object_type.name} found with name '{object_name}'.")
582-
# return None
583574

584575
if scope_id is None:
585576
scope_id = object_name
@@ -1501,7 +1492,7 @@ def add_cluster(self, obj):
15011492
}
15021493

15031494
if version.parse(self.inventory.netbox_api_version) >= version.parse("4.2.0"):
1504-
# four scope types here (dcim.site, dcim.location, dcim.region, dcim.sitegroup)
1495+
# set the scope type and id if they are defined
15051496
if scope_type is not None:
15061497
data["scope_type"] = scope_type
15071498
data["scope_id"] = scope_id
@@ -1513,7 +1504,7 @@ def add_cluster(self, obj):
15131504
else:
15141505
log.debug(f"Cluster '{full_cluster_name}' has no scope type or scope id.")
15151506
else:
1516-
# old verison has site only (# TODO: required??) --> optional (tested in netbox versions 4.1.11 and 3.7.1)
1507+
# set site_name in the pre-4.2.0 NetBox versions is one is found
15171508
if site_name is not None:
15181509
data["site"] = {"name": site_name}
15191510

@@ -1568,10 +1559,8 @@ def add_cluster(self, obj):
15681559
cluster_object = fallback_cluster_object
15691560

15701561
if cluster_object is not None:
1571-
# log.debug(f"1st The data items are {data.items()} for cluster '{name}'")
15721562
cluster_object.update(data=data, source=self)
15731563
else:
1574-
# log.debug(f"1st (alternative) The data items are {data.items()} for cluster '{name}'")
15751564
cluster_object = self.inventory.add_update_object(NBCluster, data=data, source=self)
15761565

15771566
self.add_object_to_cache(obj, cluster_object)

0 commit comments

Comments
 (0)