NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-02 05:46:25 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Resolve F841 errors

Browse Source
This commit is contained in:
Jeremy Stretch 2024-10-10 15:39:21 -04:00
parent 4b3f6e5fbb
commit f40a8af81a
10 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/dcim/models/device_component_templates.py
View File

@ -160,7 +160,6 @@ class ModularComponentTemplateModel(ComponentTemplateModel):
def _get_module_tree(self, module): def _get_module_tree(self, module):
modules = [] modules = []
all_module_bays = module.device.modulebays.all().select_related('module')
while module: while module:
modules.append(module) modules.append(module)
if module.module_bay: if module.module_bay:

54
netbox/dcim/tests/test_models.py
View File

@ -662,10 +662,8 @@ class ModuleBayTestCase(TestCase):
def test_module_bay_recursion(self): def test_module_bay_recursion(self):
module_bay_1 = ModuleBay.objects.get(name='Module Bay 1') module_bay_1 = ModuleBay.objects.get(name='Module Bay 1')
module_bay_2 = ModuleBay.objects.get(name='Module Bay 2')
module_bay_3 = ModuleBay.objects.get(name='Module Bay 3') module_bay_3 = ModuleBay.objects.get(name='Module Bay 3')
module_1 = Module.objects.get(module_bay=module_bay_1) module_1 = Module.objects.get(module_bay=module_bay_1)
module_2 = Module.objects.get(module_bay=module_bay_2)
module_3 = Module.objects.get(module_bay=module_bay_3) module_3 = Module.objects.get(module_bay=module_bay_3)
# Confirm error if ModuleBay recurses # Confirm error if ModuleBay recurses
@ -681,8 +679,6 @@ class ModuleBayTestCase(TestCase):
module_1.save() module_1.save()
def test_single_module_token(self): def test_single_module_token(self):
module_bays = ModuleBay.objects.all()
modules = Module.objects.all()
device_type = DeviceType.objects.first() device_type = DeviceType.objects.first()
device_role = DeviceRole.objects.first() device_role = DeviceRole.objects.first()
site = Site.objects.first() site = Site.objects.first()
@ -708,7 +704,7 @@ class ModuleBayTestCase(TestCase):
location=location, location=location,
rack=rack rack=rack
) )
cp = device.consoleports.first() device.consoleports.first()
def test_nested_module_token(self): def test_nested_module_token(self):
pass pass
@ -733,39 +729,41 @@ class CableTestCase(TestCase):
device2 = Device.objects.create( device2 = Device.objects.create(
device_type=devicetype, role=role, name='TestDevice2', site=site device_type=devicetype, role=role, name='TestDevice2', site=site
) )
interface1 = Interface.objects.create(device=device1, name='eth0') interfaces = (
interface2 = Interface.objects.create(device=device2, name='eth0') Interface(device=device1, name='eth0'),
interface3 = Interface.objects.create(device=device2, name='eth1') Interface(device=device2, name='eth0'),
Cable(a_terminations=[interface1], b_terminations=[interface2]).save() Interface(device=device2, name='eth1'),
)
Interface.objects.bulk_create(interfaces)
Cable(a_terminations=[interfaces[0]], b_terminations=[interfaces[1]]).save()
PowerPort.objects.create(device=device2, name='psu1')
power_port1 = PowerPort.objects.create(device=device2, name='psu1') patch_panel = Device.objects.create(
patch_pannel = Device.objects.create(
device_type=devicetype, role=role, name='TestPatchPanel', site=site device_type=devicetype, role=role, name='TestPatchPanel', site=site
) )
rear_port1 = RearPort.objects.create(device=patch_pannel, name='RP1', type='8p8c') rear_ports = (
front_port1 = FrontPort.objects.create( RearPort(device=patch_panel, name='RP1', type='8p8c'),
device=patch_pannel, name='FP1', type='8p8c', rear_port=rear_port1, rear_port_position=1 RearPort(device=patch_panel, name='RP2', type='8p8c', positions=2),
RearPort(device=patch_panel, name='RP3', type='8p8c', positions=3),
RearPort(device=patch_panel, name='RP4', type='8p8c', positions=3),
) )
rear_port2 = RearPort.objects.create(device=patch_pannel, name='RP2', type='8p8c', positions=2) RearPort.objects.bulk_create(rear_ports)
front_port2 = FrontPort.objects.create( front_ports = (
device=patch_pannel, name='FP2', type='8p8c', rear_port=rear_port2, rear_port_position=1 FrontPort(device=patch_panel, name='FP1', type='8p8c', rear_port=rear_ports[0], rear_port_position=1),
) FrontPort(device=patch_panel, name='FP2', type='8p8c', rear_port=rear_ports[1], rear_port_position=1),
rear_port3 = RearPort.objects.create(device=patch_pannel, name='RP3', type='8p8c', positions=3) FrontPort(device=patch_panel, name='FP3', type='8p8c', rear_port=rear_ports[2], rear_port_position=1),
front_port3 = FrontPort.objects.create( FrontPort(device=patch_panel, name='FP4', type='8p8c', rear_port=rear_ports[3], rear_port_position=1),
device=patch_pannel, name='FP3', type='8p8c', rear_port=rear_port3, rear_port_position=1
)
rear_port4 = RearPort.objects.create(device=patch_pannel, name='RP4', type='8p8c', positions=3)
front_port4 = FrontPort.objects.create(
device=patch_pannel, name='FP4', type='8p8c', rear_port=rear_port4, rear_port_position=1
) )
FrontPort.objects.bulk_create(front_ports)
provider = Provider.objects.create(name='Provider 1', slug='provider-1') provider = Provider.objects.create(name='Provider 1', slug='provider-1')
provider_network = ProviderNetwork.objects.create(name='Provider Network 1', provider=provider) provider_network = ProviderNetwork.objects.create(name='Provider Network 1', provider=provider)
circuittype = CircuitType.objects.create(name='Circuit Type 1', slug='circuit-type-1') circuittype = CircuitType.objects.create(name='Circuit Type 1', slug='circuit-type-1')
circuit1 = Circuit.objects.create(provider=provider, type=circuittype, cid='1') circuit1 = Circuit.objects.create(provider=provider, type=circuittype, cid='1')
circuit2 = Circuit.objects.create(provider=provider, type=circuittype, cid='2') circuit2 = Circuit.objects.create(provider=provider, type=circuittype, cid='2')
circuittermination1 = CircuitTermination.objects.create(circuit=circuit1, site=site, term_side='A') CircuitTermination.objects.create(circuit=circuit1, site=site, term_side='A')
circuittermination2 = CircuitTermination.objects.create(circuit=circuit1, site=site, term_side='Z') CircuitTermination.objects.create(circuit=circuit1, site=site, term_side='Z')
circuittermination3 = CircuitTermination.objects.create(circuit=circuit2, provider_network=provider_network, term_side='A') CircuitTermination.objects.create(circuit=circuit2, provider_network=provider_network, term_side='A')
def test_cable_creation(self): def test_cable_creation(self):
""" """

8
netbox/extras/tests/test_models.py
View File

@ -49,11 +49,11 @@ class ConfigContextTest(TestCase):
sitegroup = SiteGroup.objects.create(name='Site Group') sitegroup = SiteGroup.objects.create(name='Site Group')
site = Site.objects.create(name='Site 1', slug='site-1', region=region, group=sitegroup) site = Site.objects.create(name='Site 1', slug='site-1', region=region, group=sitegroup)
location = Location.objects.create(name='Location 1', slug='location-1', site=site) location = Location.objects.create(name='Location 1', slug='location-1', site=site)
platform = Platform.objects.create(name='Platform') Platform.objects.create(name='Platform')
tenantgroup = TenantGroup.objects.create(name='Tenant Group') tenantgroup = TenantGroup.objects.create(name='Tenant Group')
tenant = Tenant.objects.create(name='Tenant', group=tenantgroup) Tenant.objects.create(name='Tenant', group=tenantgroup)
tag1 = Tag.objects.create(name='Tag', slug='tag') Tag.objects.create(name='Tag', slug='tag')
tag2 = Tag.objects.create(name='Tag2', slug='tag2') Tag.objects.create(name='Tag2', slug='tag2')
Device.objects.create( Device.objects.create(
name='Device 1', name='Device 1',

2
netbox/ipam/tests/test_api.py
View File

@ -700,8 +700,6 @@ class IPAddressTest(APIViewTestCases.APIViewTestCase):
device1.primary_ip4 = ip_addresses[0] device1.primary_ip4 = ip_addresses[0]
device1.save() device1.save()
ip2 = ip_addresses[1]
url = reverse('ipam-api:ipaddress-detail', kwargs={'pk': ip1.pk}) url = reverse('ipam-api:ipaddress-detail', kwargs={'pk': ip1.pk})
self.add_permissions('ipam.change_ipaddress') self.add_permissions('ipam.change_ipaddress')

2
netbox/netbox/settings.py
View File

@ -198,7 +198,7 @@ if len(SECRET_KEY) < 50:
if RELEASE_CHECK_URL: if RELEASE_CHECK_URL:
try: try:
URLValidator()(RELEASE_CHECK_URL) URLValidator()(RELEASE_CHECK_URL)
except ValidationError as e: except ValidationError:
raise ImproperlyConfigured( raise ImproperlyConfigured(
"RELEASE_CHECK_URL must be a valid URL. Example: https://api.github.com/repos/netbox-community/netbox" "RELEASE_CHECK_URL must be a valid URL. Example: https://api.github.com/repos/netbox-community/netbox"
) )

2
netbox/netbox/tests/test_authentication.py
View File

@ -106,7 +106,7 @@ class ExternalAuthenticationTestCase(TestCase):
self.assertEqual(settings.REMOTE_AUTH_HEADER, 'HTTP_REMOTE_USER') self.assertEqual(settings.REMOTE_AUTH_HEADER, 'HTTP_REMOTE_USER')
# Client should not be authenticated # Client should not be authenticated
response = self.client.get(reverse('home'), follow=True, **headers) self.client.get(reverse('home'), follow=True, **headers)
self.assertNotIn('_auth_user_id', self.client.session) self.assertNotIn('_auth_user_id', self.client.session)
@override_settings( @override_settings(

1
netbox/netbox/tests/test_import.py
View File

@ -77,7 +77,6 @@ class CSVImportTestCase(ModelViewTestCase):
self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302) self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302)
regions = Region.objects.all() regions = Region.objects.all()
self.assertEqual(regions.count(), 4) self.assertEqual(regions.count(), 4)
region = Region.objects.get(slug="region-4")
self.assertEqual( self.assertEqual(
list(regions[0].tags.values_list('name', flat=True)), list(regions[0].tags.values_list('name', flat=True)),
['Alpha', 'Bravo'] ['Alpha', 'Bravo']

1
netbox/users/forms/model_forms.py
View File

@ -36,7 +36,6 @@ class UserConfigFormMetaclass(forms.models.ModelFormMetaclass):
# Emulate a declared field for each supported user preference # Emulate a declared field for each supported user preference
preference_fields = {} preference_fields = {}
for field_name, preference in PREFERENCES.items(): for field_name, preference in PREFERENCES.items():
description = f'{preference.description}<br />' if preference.description else ''
help_text = f'<code>{field_name}</code>' help_text = f'<code>{field_name}</code>'
if preference.description: if preference.description:
help_text = f'{preference.description}<br />{help_text}' help_text = f'{preference.description}<br />{help_text}'

2
netbox/utilities/html.py
View File

@ -59,7 +59,7 @@ def highlight(value, highlight, trim_pre=None, trim_post=None, trim_placeholder=
else: else:
highlight = re.escape(highlight) highlight = re.escape(highlight)
pre, match, post = re.split(fr'({highlight})', value, maxsplit=1, flags=re.IGNORECASE) pre, match, post = re.split(fr'({highlight})', value, maxsplit=1, flags=re.IGNORECASE)
except ValueError as e: except ValueError:
# Match not found # Match not found
return escape(value) return escape(value)

2
netbox/utilities/tests/test_counters.py
View File

@ -85,7 +85,7 @@ class CountersTest(TestCase):
def test_mptt_child_delete(self): def test_mptt_child_delete(self):
device1, device2 = Device.objects.all() device1, device2 = Device.objects.all()
inventory_item1 = InventoryItem.objects.create(device=device1, name='Inventory Item 1') inventory_item1 = InventoryItem.objects.create(device=device1, name='Inventory Item 1')
inventory_item2 = InventoryItem.objects.create(device=device1, name='Inventory Item 2', parent=inventory_item1) InventoryItem.objects.create(device=device1, name='Inventory Item 2', parent=inventory_item1)
device1.refresh_from_db() device1.refresh_from_db()
self.assertEqual(device1.inventory_item_count, 2) self.assertEqual(device1.inventory_item_count, 2)