mirror/netbox-sync
1
0
Fork 0
mirror of https://github.com/bb-Ricardo/netbox-sync.git synced 2026-01-21 00:10:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

unresolved relations for object name resolution is now a soft error

Browse Source 
which will be logged
This commit is contained in:
Ricardo Bartels
2020-11-14 10:45:16 +01:00
parent 4e2cb031d7
commit ed8ccda150
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/netbox/object_classes.py
View File

@@ -312,6 +312,7 @@ class NetBoxObject():
if secondary_key is not None and (enforce_secondary_key is True or including_second_key is True):
secondary_key_value = this_data_set.get(secondary_key)
org_secondary_key_value = str(secondary_key_value)
if isinstance(secondary_key_value, NetBoxObject):
secondary_key_value = secondary_key_value.get_display_name()
@@ -320,7 +321,8 @@ class NetBoxObject():
secondary_key_value = self.get_display_name(data=secondary_key_value)
if secondary_key_value is None:
raise ValueError(f"Unable to determine second key for {this_data_set.get(secondary_key)}")
log.error(f"Unable to determine second key '{secondary_key}' for {self.name} '{name}', got: {org_secondary_key_value}")
log.error("This could cause serious errors and lead to wrongly assigned object relations!!!")
my_name = f"{my_name} ({secondary_key_value})"
@@ -542,13 +544,6 @@ class NetBoxObject():
class NBObjectList(list):
pass
# def __int__(slef, *args, **kwargs):
# self.members = super().__init__(args[0])
# def __iter__(self):
# for item in self.members:
# yield item
def get_display_name(self):

11
module/sources/vmware/connection.py
View File

@@ -624,6 +624,17 @@ class VMWareHandler():
if object_type not in [NBDevices, NBVMs]:
raise ValueError(f"Object must be a '{NBVMs.name}' or '{NBDevices.name}'.")
if log.level == DEBUG3:
log.debug3("function: add_device_vm_to_inventory")
log.debug3("Object type {object_type}")
pprint.pprint(object_data)
pprint.pprint(pnic_data)
pprint.pprint(vnic_data)
pprint.pprint(nic_ips)
pprint.pprint(p_ipv4)
pprint.pprint(p_ipv6)
##################
# Now we have to find the correct object, we will try out multiple ways
# * try to find by name and cluster