Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into drift-manager/pr
Browse files Browse the repository at this point in the history
  • Loading branch information
@gsnider2195
gsnider2195 committed Sep 9, 2024
2 parents 2b335c9 + d1c3aca commit a07fecc
Show file tree
Hide file tree
Showing 8 changed files with 192 additions and 181 deletions.
2 changes: 2 additions & 0 deletions changes/235.dependencies
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Updated Nautobot App SSoT to v3.0.0.
Pinned griffe to v1.1.1.
20 changes: 10 additions & 10 deletions nautobot_device_onboarding/diffsync/adapters/sync_devices_adapters.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
ParameterSet = FrozenSet[Tuple[str, Hashable]]


class SyncDevicesNautobotAdapter(diffsync.DiffSync):
class SyncDevicesNautobotAdapter(diffsync.Adapter):
"""Adapter for loading Nautobot data."""

manufacturer = sync_devices_models.SyncDevicesManufacturer
Expand Down Expand Up @@ -62,7 +62,7 @@ def load_manufacturers(self):
for manufacturer in Manufacturer.objects.all():
if self.job.debug:
self.job.logger.debug("Loading Manufacturer data from Nautobot...")
onboarding_manufacturer = self.manufacturer(diffsync=self, pk=manufacturer.pk, name=manufacturer.name)
onboarding_manufacturer = self.manufacturer(adapter=self, pk=manufacturer.pk, name=manufacturer.name)
self.add(onboarding_manufacturer)
if self.job.debug:
self.job.logger.debug(f"Manufacturer: {manufacturer.name} loaded.")
Expand All @@ -73,7 +73,7 @@ def load_platforms(self):
self.job.logger.debug("Loading Platform data from Nautobot...")
for platform in Platform.objects.all():
onboarding_platform = self.platform(
diffsync=self,
adapter=self,
pk=platform.pk,
name=platform.name,
network_driver=platform.network_driver if platform.network_driver else "",
Expand All @@ -89,7 +89,7 @@ def load_device_types(self):
self.job.logger.debug("Loading DeviceType data from Nautobot...")
for device_type in DeviceType.objects.all():
onboarding_device_type = self.device_type(
diffsync=self,
adapter=self,
pk=device_type.pk,
model=device_type.model,
part_number=device_type.part_number,
Expand Down Expand Up @@ -118,7 +118,7 @@ def load_devices(self):
else:
interfaces = []
onboarding_device = self.device(
diffsync=self,
adapter=self,
pk=device.pk,
device_type__model=device.device_type.model,
location__name=device.location.name,
Expand All @@ -145,7 +145,7 @@ def load(self):
self.load_devices()


class SyncDevicesNetworkAdapter(diffsync.DiffSync):
class SyncDevicesNetworkAdapter(diffsync.Adapter):
"""Adapter for loading device data from a network."""

manufacturer = sync_devices_models.SyncDevicesManufacturer
Expand Down Expand Up @@ -235,7 +235,7 @@ def load_manufacturers(self):
onboarding_manufacturer = None
try:
onboarding_manufacturer = self.manufacturer(
diffsync=self,
adapter=self,
name=self.device_data[ip_address]["manufacturer"],
)
except KeyError as err:
Expand All @@ -256,7 +256,7 @@ def load_platforms(self):
onboarding_platform = None
try:
onboarding_platform = self.platform(
diffsync=self,
adapter=self,
name=self.device_data[ip_address]["platform"],
manufacturer__name=self.device_data[ip_address]["manufacturer"],
network_driver=self.device_data[ip_address]["network_driver"],
Expand All @@ -279,7 +279,7 @@ def load_device_types(self):
onboarding_device_type = None
try:
onboarding_device_type = self.device_type(
diffsync=self,
adapter=self,
model=self.device_data[ip_address]["device_type"],
part_number=self.device_data[ip_address]["device_type"],
manufacturer__name=self.device_data[ip_address]["manufacturer"],
Expand Down Expand Up @@ -334,7 +334,7 @@ def load_devices(self):
)

onboarding_device = self.device(
diffsync=self,
adapter=self,
device_type__model=self.device_data[ip_address]["device_type"],
location__name=location.name,
name=self.device_data[ip_address]["hostname"],
Expand Down
46 changes: 24 additions & 22 deletions nautobot_device_onboarding/diffsync/adapters/sync_network_data_adapters.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class FilteredNautobotAdapter(NautobotAdapter):
def _load_objects(self, diffsync_model): # pylint: disable=protected-access
"""Given a diffsync model class, load a list of models from the database and return them."""
parameter_names = self._get_parameter_names(diffsync_model)
for database_object in diffsync_model._get_queryset(diffsync=self): # pylint: disable=protected-access
for database_object in diffsync_model._get_queryset(adapter=self): # pylint: disable=protected-access
self._load_single_object(database_object, diffsync_model, parameter_names)


Expand Down Expand Up @@ -99,7 +99,7 @@ def load_ip_addresses(self):
parent__namespace__name=self.job.namespace.name,
):
network_ip_address = self.ip_address(
diffsync=self,
adapter=self,
host=ip_address.host,
mask_length=ip_address.mask_length,
type=ip_address.type,
Expand All @@ -123,7 +123,7 @@ def load_vlans(self):
"""
for vlan in VLAN.objects.all():
network_vlan = self.vlan(
diffsync=self,
adapter=self,
name=vlan.name,
vid=vlan.vid,
location__name=vlan.location.name if vlan.location else "",
Expand All @@ -149,7 +149,7 @@ def load_tagged_vlans_to_interface(self):
tagged_vlans.append(vlan_dict)

network_tagged_vlans_to_interface = self.tagged_vlans_to_interface(
diffsync=self,
adapter=self,
device__name=interface.device.name,
name=interface.name,
tagged_vlans=tagged_vlans,
Expand All @@ -170,7 +170,7 @@ def load_untagged_vlan_to_interface(self):
untagged_vlan["id"] = str(interface.untagged_vlan.vid)

network_untagged_vlan_to_interface = self.untagged_vlan_to_interface(
diffsync=self,
adapter=self,
device__name=interface.device.name,
name=interface.name,
untagged_vlan=untagged_vlan,
Expand All @@ -186,7 +186,7 @@ def load_lag_to_interface(self):
"""
for interface in Interface.objects.filter(device__in=self.job.devices_to_load):
network_lag_to_interface = self.lag_to_interface(
diffsync=self,
adapter=self,
device__name=interface.device.name,
name=interface.name,
lag__interface__name=interface.lag.name if interface.lag else "",
Expand All @@ -202,7 +202,7 @@ def load_vrfs(self):
"""
for vrf in VRF.objects.all():
network_vrf = self.vrf(
diffsync=self,
adapter=self,
name=vrf.name,
namespace__name=vrf.namespace.name,
)
Expand All @@ -224,7 +224,7 @@ def load_vrf_to_interface(self):
vrf["name"] = interface.vrf.name

network_vrf_to_interface = self.vrf_to_interface(
diffsync=self,
adapter=self,
device__name=interface.device.name,
name=interface.name,
vrf=vrf,
Expand Down Expand Up @@ -258,7 +258,7 @@ def load_cables(self):
termination_b_interface = cable.termination_a.name

network_cable = self.cable(
diffsync=self,
adapter=self,
status__name=cable.status.name,
termination_a__app_label="dcim",
termination_a__model="interface",
Expand Down Expand Up @@ -362,7 +362,7 @@ class MacUnixExpandedUppercase(mac_unix_expanded):
word_fmt = "%.2X"


class SyncNetworkDataNetworkAdapter(diffsync.DiffSync):
class SyncNetworkDataNetworkAdapter(diffsync.Adapter):
"""Adapter for loading Network data."""

def __init__(self, *args, job, sync=None, **kwargs):
Expand Down Expand Up @@ -465,7 +465,7 @@ def load_devices(self):
for hostname, device_data in self.job.command_getter_result.items():
try:
network_device = self.device(
diffsync=self,
adapter=self,
name=hostname,
serial=device_data["serial"],
last_network_data_sync=datetime.datetime.now().date().isoformat(),
Expand All @@ -489,7 +489,7 @@ def load_devices(self):
def load_interface(self, hostname, interface_name, interface_data):
"""Load an interface into the DiffSync store."""
network_interface = self.interface(
diffsync=self,
adapter=self,
name=interface_name,
device__name=hostname,
status__name=self.job.interface_status.name,
Expand All @@ -499,6 +499,8 @@ def load_interface(self, hostname, interface_name, interface_data):
description=interface_data["description"],
enabled=interface_data["link_status"],
mode=interface_data["802.1Q_mode"],
parent_interface__name=None,
lag__name=None,
# untagged_vlan__name=self._get_vlan_name(interface_data=interface_data),
)
self.add(network_interface)
Expand All @@ -518,7 +520,7 @@ def load_ip_addresses(self):
self.job.logger.debug(f"Loading {ip_address} from {interface_name} on {hostname}")
try:
network_ip_address = self.ip_address(
diffsync=self,
adapter=self,
host=ip_address["ip_address"],
mask_length=int(ip_address["prefix_length"]),
type="host",
Expand Down Expand Up @@ -553,7 +555,7 @@ def load_vlans(self):
for tagged_vlan in interface_data["tagged_vlans"]:
try:
network_vlan = self.vlan(
diffsync=self,
adapter=self,
name=tagged_vlan["name"],
vid=tagged_vlan["id"],
location__name=location_names.get(hostname, ""),
Expand All @@ -570,7 +572,7 @@ def load_vlans(self):
if interface_data["untagged_vlan"]:
try:
network_vlan = self.vlan(
diffsync=self,
adapter=self,
name=interface_data["untagged_vlan"]["name"],
vid=interface_data["untagged_vlan"]["id"],
location__name=location_names.get(hostname, ""),
Expand All @@ -594,7 +596,7 @@ def load_vrfs(self):
if interface_data["vrf"]:
try:
network_vrf = self.vrf(
diffsync=self,
adapter=self,
name=interface_data["vrf"]["name"],
namespace__name=self.job.namespace.name,
)
Expand All @@ -615,7 +617,7 @@ def load_ip_address_to_interfaces(self):
if ip_address["ip_address"]: # the ip_address and mask_length may be empty, skip these
try:
network_ip_address_to_interface = self.ipaddress_to_interface(
diffsync=self,
adapter=self,
interface__device__name=hostname,
interface__name=interface_name,
ip_address__host=ip_address["ip_address"],
Expand All @@ -637,7 +639,7 @@ def load_tagged_vlans_to_interface(self):
for interface_name, interface_data in device_data["interfaces"].items():
try:
network_tagged_vlans_to_interface = self.tagged_vlans_to_interface(
diffsync=self,
adapter=self,
device__name=hostname,
name=interface_name,
tagged_vlans=interface_data["tagged_vlans"],
Expand All @@ -656,7 +658,7 @@ def load_untagged_vlan_to_interface(self):
for interface_name, interface_data in device_data["interfaces"].items():
try:
network_untagged_vlan_to_interface = self.untagged_vlan_to_interface(
diffsync=self,
adapter=self,
device__name=hostname,
name=interface_name,
untagged_vlan=interface_data["untagged_vlan"],
Expand All @@ -675,7 +677,7 @@ def load_lag_to_interface(self):
for interface_name, interface_data in device_data["interfaces"].items():
try:
network_lag_to_interface = self.lag_to_interface(
diffsync=self,
adapter=self,
device__name=hostname,
name=interface_name,
lag__interface__name=interface_data["lag"] if interface_data["lag"] else "",
Expand All @@ -694,7 +696,7 @@ def load_vrf_to_interface(self):
for interface_name, interface_data in device_data["interfaces"].items():
try:
network_vrf_to_interface = self.vrf_to_interface(
diffsync=self,
adapter=self,
device__name=hostname,
name=interface_name,
vrf=interface_data["vrf"],
Expand Down Expand Up @@ -772,7 +774,7 @@ def load_cables(self): # pylint: disable=inconsistent-return-statements
termination_b_interface = local_interface

network_cable = self.cable(
diffsync=self,
adapter=self,
status__name="Connected", # ask for default status in the job form
termination_a__app_label="dcim",
termination_a__model="interface",
Expand Down
Loading

0 comments on commit a07fecc

Please sign in to comment.