mirror of
https://github.com/netbox-community/netbox.git
synced 2024-05-10 07:54:54 +00:00
Replaces device_role with role on device model (#13342)
* replaces device_role with role on device model #6391 * fixes lint issue #6391 * revert the database user * revert test_runner comment * changes as per review * Update references to device_role column in UserConfigs --------- Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
This commit is contained in:
Abhimanyu Saharan
committed by
GitHub
GitHub
parent
79030ecab2
commit
0bb86f1e7d
@@ -40,7 +40,7 @@ class Mixins:
|
||||
peer_device = Device.objects.create(
|
||||
site=Site.objects.first(),
|
||||
device_type=DeviceType.objects.first(),
|
||||
device_role=DeviceRole.objects.first(),
|
||||
role=DeviceRole.objects.first(),
|
||||
name='Peer Device'
|
||||
)
|
||||
if self.peer_termination_type is None:
|
||||
@@ -1052,12 +1052,12 @@ class DeviceRoleTest(APIViewTestCases.APIViewTestCase):
|
||||
@classmethod
|
||||
def setUpTestData(cls):
|
||||
|
||||
device_roles = (
|
||||
roles = (
|
||||
DeviceRole(name='Device Role 1', slug='device-role-1', color='ff0000'),
|
||||
DeviceRole(name='Device Role 2', slug='device-role-2', color='00ff00'),
|
||||
DeviceRole(name='Device Role 3', slug='device-role-3', color='0000ff'),
|
||||
)
|
||||
DeviceRole.objects.bulk_create(device_roles)
|
||||
DeviceRole.objects.bulk_create(roles)
|
||||
|
||||
|
||||
class PlatformTest(APIViewTestCases.APIViewTestCase):
|
||||
@@ -1122,11 +1122,11 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
|
||||
)
|
||||
DeviceType.objects.bulk_create(device_types)
|
||||
|
||||
device_roles = (
|
||||
roles = (
|
||||
DeviceRole(name='Device Role 1', slug='device-role-1', color='ff0000'),
|
||||
DeviceRole(name='Device Role 2', slug='device-role-2', color='00ff00'),
|
||||
)
|
||||
DeviceRole.objects.bulk_create(device_roles)
|
||||
DeviceRole.objects.bulk_create(roles)
|
||||
|
||||
cluster_type = ClusterType.objects.create(name='Cluster Type 1', slug='cluster-type-1')
|
||||
|
||||
@@ -1139,7 +1139,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
|
||||
devices = (
|
||||
Device(
|
||||
device_type=device_types[0],
|
||||
device_role=device_roles[0],
|
||||
role=roles[0],
|
||||
name='Device 1',
|
||||
site=sites[0],
|
||||
rack=racks[0],
|
||||
@@ -1148,7 +1148,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
|
||||
),
|
||||
Device(
|
||||
device_type=device_types[0],
|
||||
device_role=device_roles[0],
|
||||
role=roles[0],
|
||||
name='Device 2',
|
||||
site=sites[0],
|
||||
rack=racks[0],
|
||||
@@ -1157,7 +1157,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
|
||||
),
|
||||
Device(
|
||||
device_type=device_types[0],
|
||||
device_role=device_roles[0],
|
||||
role=roles[0],
|
||||
name='Device 3',
|
||||
site=sites[0],
|
||||
rack=racks[0],
|
||||
@@ -1170,7 +1170,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
|
||||
cls.create_data = [
|
||||
{
|
||||
'device_type': device_types[1].pk,
|
||||
'device_role': device_roles[1].pk,
|
||||
'role': roles[1].pk,
|
||||
'name': 'Test Device 4',
|
||||
'site': sites[1].pk,
|
||||
'rack': racks[1].pk,
|
||||
@@ -1178,7 +1178,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
|
||||
},
|
||||
{
|
||||
'device_type': device_types[1].pk,
|
||||
'device_role': device_roles[1].pk,
|
||||
'role': roles[1].pk,
|
||||
'name': 'Test Device 5',
|
||||
'site': sites[1].pk,
|
||||
'rack': racks[1].pk,
|
||||
@@ -1186,7 +1186,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
|
||||
},
|
||||
{
|
||||
'device_type': device_types[1].pk,
|
||||
'device_role': device_roles[1].pk,
|
||||
'role': roles[1].pk,
|
||||
'name': 'Test Device 6',
|
||||
'site': sites[1].pk,
|
||||
'rack': racks[1].pk,
|
||||
@@ -1221,7 +1221,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
|
||||
device = Device.objects.first()
|
||||
data = {
|
||||
'device_type': device.device_type.pk,
|
||||
'device_role': device.device_role.pk,
|
||||
'role': device.role.pk,
|
||||
'site': device.site.pk,
|
||||
'name': device.name,
|
||||
}
|
||||
@@ -1241,7 +1241,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
|
||||
data = [
|
||||
{
|
||||
'device_type': device_type.pk,
|
||||
'device_role': device.device_role.pk,
|
||||
'role': device.role.pk,
|
||||
'site': device.site.pk,
|
||||
'name': 'Test Device 7',
|
||||
'rack': device.rack.pk,
|
||||
@@ -1250,7 +1250,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
|
||||
},
|
||||
{
|
||||
'device_type': device_type.pk,
|
||||
'device_role': device.device_role.pk,
|
||||
'role': device.role.pk,
|
||||
'site': device.site.pk,
|
||||
'name': 'Test Device 8',
|
||||
'rack': device.rack.pk,
|
||||
@@ -1343,8 +1343,8 @@ class ConsolePortTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCa
|
||||
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
devicerole = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, device_role=devicerole, name='Device 1', site=site)
|
||||
role = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, role=role, name='Device 1', site=site)
|
||||
|
||||
console_ports = (
|
||||
ConsolePort(device=device, name='Console Port 1'),
|
||||
@@ -1385,8 +1385,8 @@ class ConsoleServerPortTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIView
|
||||
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
devicerole = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, device_role=devicerole, name='Device 1', site=site)
|
||||
role = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, role=role, name='Device 1', site=site)
|
||||
|
||||
console_server_ports = (
|
||||
ConsoleServerPort(device=device, name='Console Server Port 1'),
|
||||
@@ -1427,8 +1427,8 @@ class PowerPortTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase
|
||||
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
devicerole = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, device_role=devicerole, name='Device 1', site=site)
|
||||
role = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, role=role, name='Device 1', site=site)
|
||||
|
||||
power_ports = (
|
||||
PowerPort(device=device, name='Power Port 1'),
|
||||
@@ -1466,8 +1466,8 @@ class PowerOutletTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCa
|
||||
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
devicerole = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, device_role=devicerole, name='Device 1', site=site)
|
||||
role = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, role=role, name='Device 1', site=site)
|
||||
|
||||
power_ports = (
|
||||
PowerPort(device=device, name='Power Port 1'),
|
||||
@@ -1514,8 +1514,8 @@ class InterfaceTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase
|
||||
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
devicerole = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, device_role=devicerole, name='Device 1', site=site)
|
||||
role = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, role=role, name='Device 1', site=site)
|
||||
|
||||
interfaces = (
|
||||
Interface(device=device, name='Interface 1', type='1000base-t'),
|
||||
@@ -1621,8 +1621,8 @@ class FrontPortTest(APIViewTestCases.APIViewTestCase):
|
||||
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
devicerole = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, device_role=devicerole, name='Device 1', site=site)
|
||||
role = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, role=role, name='Device 1', site=site)
|
||||
|
||||
rear_ports = (
|
||||
RearPort(device=device, name='Rear Port 1', type=PortTypeChoices.TYPE_8P8C),
|
||||
@@ -1679,8 +1679,8 @@ class RearPortTest(APIViewTestCases.APIViewTestCase):
|
||||
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
devicerole = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, device_role=devicerole, name='Device 1', site=site)
|
||||
role = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, role=role, name='Device 1', site=site)
|
||||
|
||||
rear_ports = (
|
||||
RearPort(device=device, name='Rear Port 1', type=PortTypeChoices.TYPE_8P8C),
|
||||
@@ -1719,10 +1719,10 @@ class ModuleBayTest(APIViewTestCases.APIViewTestCase):
|
||||
def setUpTestData(cls):
|
||||
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
devicerole = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
role = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
|
||||
device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
device = Device.objects.create(device_type=device_type, device_role=devicerole, name='Device 1', site=site)
|
||||
device = Device.objects.create(device_type=device_type, role=role, name='Device 1', site=site)
|
||||
|
||||
device_bays = (
|
||||
ModuleBay(device=device, name='Device Bay 1'),
|
||||
@@ -1758,7 +1758,7 @@ class DeviceBayTest(APIViewTestCases.APIViewTestCase):
|
||||
def setUpTestData(cls):
|
||||
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
devicerole = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
role = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
|
||||
device_types = (
|
||||
DeviceType(
|
||||
@@ -1777,10 +1777,10 @@ class DeviceBayTest(APIViewTestCases.APIViewTestCase):
|
||||
DeviceType.objects.bulk_create(device_types)
|
||||
|
||||
devices = (
|
||||
Device(device_type=device_types[0], device_role=devicerole, name='Device 1', site=site),
|
||||
Device(device_type=device_types[1], device_role=devicerole, name='Device 2', site=site),
|
||||
Device(device_type=device_types[1], device_role=devicerole, name='Device 3', site=site),
|
||||
Device(device_type=device_types[1], device_role=devicerole, name='Device 4', site=site),
|
||||
Device(device_type=device_types[0], role=role, name='Device 1', site=site),
|
||||
Device(device_type=device_types[1], role=role, name='Device 2', site=site),
|
||||
Device(device_type=device_types[1], role=role, name='Device 3', site=site),
|
||||
Device(device_type=device_types[1], role=role, name='Device 4', site=site),
|
||||
)
|
||||
Device.objects.bulk_create(devices)
|
||||
|
||||
@@ -1822,8 +1822,8 @@ class InventoryItemTest(APIViewTestCases.APIViewTestCase):
|
||||
manufacturer = Manufacturer.objects.create(name='Test Manufacturer 1', slug='test-manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
devicerole = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, device_role=devicerole, name='Device 1', site=site)
|
||||
role = DeviceRole.objects.create(name='Test Device Role 1', slug='test-device-role-1', color='ff0000')
|
||||
device = Device.objects.create(device_type=devicetype, role=role, name='Device 1', site=site)
|
||||
|
||||
roles = (
|
||||
InventoryItemRole(name='Inventory Item Role 1', slug='inventory-item-role-1'),
|
||||
@@ -1932,11 +1932,11 @@ class CableTest(APIViewTestCases.APIViewTestCase):
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
devicerole = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1', color='ff0000')
|
||||
role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1', color='ff0000')
|
||||
|
||||
devices = (
|
||||
Device(device_type=devicetype, device_role=devicerole, name='Device 1', site=site),
|
||||
Device(device_type=devicetype, device_role=devicerole, name='Device 2', site=site),
|
||||
Device(device_type=devicetype, role=role, name='Device 1', site=site),
|
||||
Device(device_type=devicetype, role=role, name='Device 2', site=site),
|
||||
)
|
||||
Device.objects.bulk_create(devices)
|
||||
|
||||
@@ -1998,10 +1998,10 @@ class ConnectedDeviceTest(APITestCase):
|
||||
site = Site.objects.create(name='Site 1', slug='site-1')
|
||||
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1')
|
||||
devicerole = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1', color='ff0000')
|
||||
role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1', color='ff0000')
|
||||
devices = (
|
||||
Device(device_type=devicetype, device_role=devicerole, name='TestDevice1', site=site),
|
||||
Device(device_type=devicetype, device_role=devicerole, name='TestDevice2', site=site),
|
||||
Device(device_type=devicetype, role=role, name='TestDevice1', site=site),
|
||||
Device(device_type=devicetype, role=role, name='TestDevice2', site=site),
|
||||
)
|
||||
Device.objects.bulk_create(devices)
|
||||
interfaces = (
|
||||
@@ -2037,21 +2037,21 @@ class VirtualChassisTest(APIViewTestCases.APIViewTestCase):
|
||||
site = Site.objects.create(name='Test Site', slug='test-site')
|
||||
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type', slug='device-type')
|
||||
devicerole = DeviceRole.objects.create(name='Device Role', slug='device-role', color='ff0000')
|
||||
role = DeviceRole.objects.create(name='Device Role', slug='device-role', color='ff0000')
|
||||
|
||||
devices = (
|
||||
Device(name='Device 1', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 2', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 3', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 4', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 5', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 6', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 7', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 8', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 9', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 10', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 11', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 12', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 1', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 2', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 3', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 4', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 5', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 6', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 7', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 8', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 9', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 10', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 11', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 12', device_type=devicetype, role=role, site=site),
|
||||
)
|
||||
Device.objects.bulk_create(devices)
|
||||
|
||||
@@ -2225,12 +2225,12 @@ class VirtualDeviceContextTest(APIViewTestCases.APIViewTestCase):
|
||||
site = Site.objects.create(name='Test Site', slug='test-site')
|
||||
manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
|
||||
devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type', slug='device-type')
|
||||
devicerole = DeviceRole.objects.create(name='Device Role', slug='device-role', color='ff0000')
|
||||
role = DeviceRole.objects.create(name='Device Role', slug='device-role', color='ff0000')
|
||||
|
||||
devices = (
|
||||
Device(name='Device 1', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 2', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 3', device_type=devicetype, device_role=devicerole, site=site),
|
||||
Device(name='Device 1', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 2', device_type=devicetype, role=role, site=site),
|
||||
Device(name='Device 3', device_type=devicetype, role=role, site=site),
|
||||
)
|
||||
Device.objects.bulk_create(devices)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user