Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix filter statement when importing devices #156

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix filter statement when importing devices #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions netbox_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,16 +194,16 @@ def get_device_types(self):
return {str(item): item for item in self.netbox.dcim.device_types.all()}

def get_power_ports(self, device_type):
return {str(item): item for item in self.netbox.dcim.power_port_templates.filter(devicetype_id=device_type)}
return {str(item): item for item in self.netbox.dcim.power_port_templates.filter(device_type_id=device_type)}

def get_rear_ports(self, device_type):
return {str(item): item for item in self.netbox.dcim.rear_port_templates.filter(devicetype_id=device_type)}
return {str(item): item for item in self.netbox.dcim.rear_port_templates.filter(device_type_id=device_type)}

def get_module_power_ports(self, module_type):
return {str(item): item for item in self.netbox.dcim.power_port_templates.filter(moduletype_id=module_type)}
return {str(item): item for item in self.netbox.dcim.power_port_templates.filter(module_type_id=module_type)}

def get_module_rear_ports(self, module_type):
return {str(item): item for item in self.netbox.dcim.rear_port_templates.filter(moduletype_id=module_type)}
return {str(item): item for item in self.netbox.dcim.rear_port_templates.filter(module_type_id=module_type)}

def get_device_type_ports_to_create(self, dcim_ports, device_type, existing_ports):
to_create = [port for port in dcim_ports if port['name'] not in existing_ports]
Expand All @@ -221,7 +221,7 @@ def get_module_type_ports_to_create(self, module_ports, module_type, existing_po

def create_interfaces(self, interfaces, device_type):
existing_interfaces = {str(item): item for item in self.netbox.dcim.interface_templates.filter(
devicetype_id=device_type)}
device_type_id=device_type)}
to_create = self.get_device_type_ports_to_create(
interfaces, device_type, existing_interfaces)

Expand All @@ -248,7 +248,7 @@ def create_power_ports(self, power_ports, device_type):
self.handle.log(f"Error '{excep.error}' creating Power Port")

def create_console_ports(self, console_ports, device_type):
existing_console_ports = {str(item): item for item in self.netbox.dcim.console_port_templates.filter(devicetype_id=device_type)}
existing_console_ports = {str(item): item for item in self.netbox.dcim.console_port_templates.filter(device_type_id=device_type)}
to_create = self.get_device_type_ports_to_create(console_ports, device_type, existing_console_ports)

if to_create:
Expand All @@ -261,7 +261,7 @@ def create_console_ports(self, console_ports, device_type):
self.handle.log(f"Error '{excep.error}' creating Console Port")

def create_power_outlets(self, power_outlets, device_type):
existing_power_outlets = {str(item): item for item in self.netbox.dcim.power_outlet_templates.filter(devicetype_id=device_type)}
existing_power_outlets = {str(item): item for item in self.netbox.dcim.power_outlet_templates.filter(device_type_id=device_type)}
to_create = self.get_device_type_ports_to_create(power_outlets, device_type, existing_power_outlets)

if to_create:
Expand All @@ -282,7 +282,7 @@ def create_power_outlets(self, power_outlets, device_type):
self.handle.log(f"Error '{excep.error}' creating Power Outlet")

def create_console_server_ports(self, console_server_ports, device_type):
existing_console_server_ports = {str(item): item for item in self.netbox.dcim.console_server_port_templates.filter(devicetype_id=device_type)}
existing_console_server_ports = {str(item): item for item in self.netbox.dcim.console_server_port_templates.filter(device_type_id=device_type)}
to_create = self.get_device_type_ports_to_create(console_server_ports, device_type, existing_console_server_ports)

if to_create:
Expand All @@ -308,7 +308,7 @@ def create_rear_ports(self, rear_ports, device_type):
self.handle.log(f"Error '{excep.error}' creating Rear Port")

def create_front_ports(self, front_ports, device_type):
existing_front_ports = {str(item): item for item in self.netbox.dcim.front_port_templates.filter(devicetype_id=device_type)}
existing_front_ports = {str(item): item for item in self.netbox.dcim.front_port_templates.filter(device_type_id=device_type)}
to_create = self.get_device_type_ports_to_create(front_ports, device_type, existing_front_ports)

if to_create:
Expand All @@ -330,7 +330,7 @@ def create_front_ports(self, front_ports, device_type):
self.handle.log(f"Error '{excep.error}' creating Front Port")

def create_device_bays(self, device_bays, device_type):
existing_device_bays = {str(item): item for item in self.netbox.dcim.device_bay_templates.filter(devicetype_id=device_type)}
existing_device_bays = {str(item): item for item in self.netbox.dcim.device_bay_templates.filter(device_type_id=device_type)}
to_create = self.get_device_type_ports_to_create(device_bays, device_type, existing_device_bays)

if to_create:
Expand All @@ -343,7 +343,7 @@ def create_device_bays(self, device_bays, device_type):
self.handle.log(f"Error '{excep.error}' creating Device Bay")

def create_module_bays(self, module_bays, device_type):
existing_module_bays = {str(item): item for item in self.netbox.dcim.module_bay_templates.filter(devicetype_id=device_type)}
existing_module_bays = {str(item): item for item in self.netbox.dcim.module_bay_templates.filter(device_type_id=device_type)}
to_create = self.get_device_type_ports_to_create(module_bays, device_type, existing_module_bays)

if to_create:
Expand All @@ -356,7 +356,7 @@ def create_module_bays(self, module_bays, device_type):
self.handle.log(f"Error '{excep.error}' creating Module Bay")

def create_module_interfaces(self, module_interfaces, module_type):
existing_interfaces = {str(item): item for item in self.netbox.dcim.interface_templates.filter(moduletype_id=module_type)}
existing_interfaces = {str(item): item for item in self.netbox.dcim.interface_templates.filter(module_type_id=module_type)}
to_create = self.get_module_type_ports_to_create(module_interfaces, module_type, existing_interfaces)

if to_create:
Expand All @@ -382,7 +382,7 @@ def create_module_power_ports(self, power_ports, module_type):
self.handle.log(f"Error '{excep.error}' creating Module Power Port")

def create_module_console_ports(self, console_ports, module_type):
existing_console_ports = {str(item): item for item in self.netbox.dcim.console_port_templates.filter(moduletype_id=module_type)}
existing_console_ports = {str(item): item for item in self.netbox.dcim.console_port_templates.filter(module_type_id=module_type)}
to_create = self.get_module_type_ports_to_create(console_ports, module_type, existing_console_ports)

if to_create:
Expand All @@ -395,7 +395,7 @@ def create_module_console_ports(self, console_ports, module_type):
self.handle.log(f"Error '{excep.error}' creating Module Console Port")

def create_module_power_outlets(self, power_outlets, module_type):
existing_power_outlets = {str(item): item for item in self.netbox.dcim.power_outlet_templates.filter(moduletype_id=module_type)}
existing_power_outlets = {str(item): item for item in self.netbox.dcim.power_outlet_templates.filter(module_type_id=module_type)}
to_create = self.get_module_type_ports_to_create(power_outlets, module_type, existing_power_outlets)

if to_create:
Expand All @@ -416,7 +416,7 @@ def create_module_power_outlets(self, power_outlets, module_type):
self.handle.log(f"Error '{excep.error}' creating Module Power Outlet")

def create_module_console_server_ports(self, console_server_ports, module_type):
existing_console_server_ports = {str(item): item for item in self.netbox.dcim.console_server_port_templates.filter(moduletype_id=module_type)}
existing_console_server_ports = {str(item): item for item in self.netbox.dcim.console_server_port_templates.filter(module_type_id=module_type)}
to_create = self.get_module_type_ports_to_create(console_server_ports, module_type, existing_console_server_ports)

if to_create:
Expand All @@ -442,7 +442,7 @@ def create_module_rear_ports(self, rear_ports, module_type):
self.handle.log(f"Error '{excep.error}' creating Module Rear Port")

def create_module_front_ports(self, front_ports, module_type):
existing_front_ports = {str(item): item for item in self.netbox.dcim.front_port_templates.filter(moduletype_id=module_type)}
existing_front_ports = {str(item): item for item in self.netbox.dcim.front_port_templates.filter(module_type_id=module_type)}
to_create = self.get_module_type_ports_to_create(front_ports, module_type, existing_front_ports)

if to_create:
Expand Down