Skip to content

Commit c63766c

Browse files
committed
Fix test for #7051
1 parent af6237e commit c63766c

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

netbox/dcim/tests/test_api.py

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from django.contrib.auth.models import User
2+
from django.test import override_settings
23
from django.urls import reverse
34
from rest_framework import status
45

@@ -1490,40 +1491,35 @@ def setUp(self):
14901491

14911492
super().setUp()
14921493

1493-
self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1')
1494-
self.site2 = Site.objects.create(name='Test Site 2', slug='test-site-2')
1495-
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
1496-
self.devicetype1 = DeviceType.objects.create(
1497-
manufacturer=manufacturer, model='Test Device Type 1', slug='test-device-type-1'
1498-
)
1499-
self.devicetype2 = DeviceType.objects.create(
1500-
manufacturer=manufacturer, model='Test Device Type 2', slug='test-device-type-2'
1501-
)
1502-
self.devicerole1 = DeviceRole.objects.create(
1503-
name='Test Device Role 1', slug='test-device-role-1', color='ff0000'
1504-
)
1505-
self.devicerole2 = DeviceRole.objects.create(
1506-
name='Test Device Role 2', slug='test-device-role-2', color='00ff00'
1507-
)
1494+
site = Site.objects.create(name='Site 1', slug='site-1')
1495+
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
1496+
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
1497+
devicerole = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1', color='ff0000')
15081498
self.device1 = Device.objects.create(
1509-
device_type=self.devicetype1, device_role=self.devicerole1, name='TestDevice1', site=self.site1
1499+
device_type=devicetype, device_role=devicerole, name='TestDevice1', site=site
15101500
)
15111501
self.device2 = Device.objects.create(
1512-
device_type=self.devicetype1, device_role=self.devicerole1, name='TestDevice2', site=self.site1
1502+
device_type=devicetype, device_role=devicerole, name='TestDevice2', site=site
15131503
)
15141504
self.interface1 = Interface.objects.create(device=self.device1, name='eth0')
15151505
self.interface2 = Interface.objects.create(device=self.device2, name='eth0')
1506+
self.interface3 = Interface.objects.create(device=self.device1, name='eth1') # Not connected
15161507

15171508
cable = Cable(termination_a=self.interface1, termination_b=self.interface2)
15181509
cable.save()
15191510

1511+
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
15201512
def test_get_connected_device(self):
1521-
15221513
url = reverse('dcim-api:connected-device-list')
1523-
response = self.client.get(url + '?peer_device=TestDevice2&peer_interface=eth0', **self.header)
15241514

1515+
url_params = f'?peer_device={self.device1.name}&peer_interface={self.interface1.name}'
1516+
response = self.client.get(url + url_params, **self.header)
15251517
self.assertHttpStatus(response, status.HTTP_200_OK)
1526-
self.assertEqual(response.data['name'], self.device1.name)
1518+
self.assertEqual(response.data['name'], self.device2.name)
1519+
1520+
url_params = f'?peer_device={self.device1.name}&peer_interface={self.interface3.name}'
1521+
response = self.client.get(url + url_params, **self.header)
1522+
self.assertHttpStatus(response, status.HTTP_404_NOT_FOUND)
15271523

15281524

15291525
class VirtualChassisTest(APIViewTestCases.APIViewTestCase):

0 commit comments

Comments
 (0)