mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

#9414: Clean up clone_fields on all models

Browse Source
This commit is contained in:
jeremystretch
2022-08-11 09:58:37 -04:00
parent c1d9cace11
commit 8cd5a24409
14 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/circuits/models/circuits.py
View File

@ -125,9 +125,9 @@ class Circuit(NetBoxModel):
null=True
)
clone_fields = [
clone_fields = (
'provider', 'type', 'status', 'tenant', 'install_date', 'termination_date', 'commit_rate', 'description',
]
)
class Meta:
ordering = ['provider', 'cid']

4
netbox/circuits/models/providers.py
View File

@ -61,9 +61,9 @@ class Provider(NetBoxModel):
to='tenancy.ContactAssignment'
)
clone_fields = [
clone_fields = (
'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact',
]
)
class Meta:
ordering = ['name']

23
netbox/dcim/models/device_components.py
View File

@ -263,7 +263,7 @@ class ConsolePort(ModularComponentModel, CabledObjectModel, PathEndpoint):
help_text='Port speed in bits per second'
)
clone_fields = ['device', 'type', 'speed']
clone_fields = ('device', 'module', 'type', 'speed')
class Meta:
ordering = ('device', '_name')
@ -290,7 +290,7 @@ class ConsoleServerPort(ModularComponentModel, CabledObjectModel, PathEndpoint):
help_text='Port speed in bits per second'
)
clone_fields = ['device', 'type', 'speed']
clone_fields = ('device', 'module', 'type', 'speed')
class Meta:
ordering = ('device', '_name')
@ -327,7 +327,7 @@ class PowerPort(ModularComponentModel, CabledObjectModel, PathEndpoint):
help_text="Allocated power draw (watts)"
)
clone_fields = ['device', 'maximum_draw', 'allocated_draw']
clone_fields = ('device', 'module', 'maximum_draw', 'allocated_draw')
class Meta:
ordering = ('device', '_name')
@ -441,7 +441,7 @@ class PowerOutlet(ModularComponentModel, CabledObjectModel, PathEndpoint):
help_text="Phase (for three-phase feeds)"
)
clone_fields = ['device', 'type', 'power_port', 'feed_leg']
clone_fields = ('device', 'module', 'type', 'power_port', 'feed_leg')
class Meta:
ordering = ('device', '_name')
@ -672,7 +672,10 @@ class Interface(ModularComponentModel, BaseInterface, CabledObjectModel, PathEnd
related_query_name='interface',
)
clone_fields = ['device', 'parent', 'bridge', 'lag', 'type', 'mgmt_only', 'poe_mode', 'poe_type']
clone_fields = (
'device', 'module', 'parent', 'bridge', 'lag', 'type', 'mgmt_only', 'mtu', 'mode', 'speed', 'duplex', 'rf_role',
'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'poe_mode', 'poe_type', 'vrf',
)
class Meta:
ordering = ('device', CollateAsChar('_name'))
@ -890,7 +893,7 @@ class FrontPort(ModularComponentModel, CabledObjectModel):
]
)
clone_fields = ['device', 'type']
clone_fields = ('device', 'type', 'color')
class Meta:
ordering = ('device', '_name')
@ -937,7 +940,7 @@ class RearPort(ModularComponentModel, CabledObjectModel):
MaxValueValidator(REARPORT_POSITIONS_MAX)
]
)
clone_fields = ['device', 'type', 'positions']
clone_fields = ('device', 'type', 'color', 'positions')
class Meta:
ordering = ('device', '_name')
@ -972,7 +975,7 @@ class ModuleBay(ComponentModel):
help_text='Identifier to reference when renaming installed components'
)
clone_fields = ['device']
clone_fields = ('device',)
class Meta:
ordering = ('device', '_name')
@ -994,7 +997,7 @@ class DeviceBay(ComponentModel):
null=True
)
clone_fields = ['device']
clone_fields = ('device',)
class Meta:
ordering = ('device', '_name')
@ -1131,7 +1134,7 @@ class InventoryItem(MPTTModel, ComponentModel):
objects = TreeManager()
clone_fields = ['device', 'parent', 'role', 'manufacturer', 'part_id']
clone_fields = ('device', 'parent', 'role', 'manufacturer', 'part_id',)
class Meta:
ordering = ('device__id', 'parent__id', '_name')

11
netbox/dcim/models/devices.py
View File

@ -135,9 +135,9 @@ class DeviceType(NetBoxModel):
blank=True
)
clone_fields = [
clone_fields = (
'manufacturer', 'u_height', 'is_full_depth', 'subdevice_role', 'airflow',
]
)
class Meta:
ordering = ['manufacturer', 'model']
@ -630,9 +630,10 @@ class Device(NetBoxModel, ConfigContextModel):
objects = ConfigContextModelQuerySet.as_manager()
clone_fields = [
'device_type', 'device_role', 'tenant', 'platform', 'site', 'location', 'rack', 'status', 'airflow', 'cluster',
]
clone_fields = (
'device_type', 'device_role', 'tenant', 'platform', 'site', 'location', 'rack', 'face', 'status', 'airflow',
'cluster', 'virtual_chassis',
)
class Meta:
ordering = ('_name', 'pk') # Name may be null

6
netbox/dcim/models/power.py
View File

@ -126,10 +126,10 @@ class PowerFeed(NetBoxModel, PathEndpoint, CabledObjectModel):
blank=True
)
clone_fields = [
clone_fields = (
'power_panel', 'rack', 'status', 'type', 'mark_connected', 'supply', 'phase', 'voltage', 'amperage',
'max_utilization', 'available_power',
]
'max_utilization',
)
class Meta:
ordering = ['power_panel', 'name']

4
netbox/dcim/models/racks.py
View File

@ -183,10 +183,10 @@ class Rack(NetBoxModel):
to='extras.ImageAttachment'
)
clone_fields = [
clone_fields = (
'site', 'location', 'tenant', 'status', 'role', 'type', 'width', 'u_height', 'desc_units', 'outer_width',
'outer_depth', 'outer_unit',
]
)
class Meta:
ordering = ('site', 'location', '_name', 'pk') # (site, location, name) may be non-unique

10
netbox/dcim/models/sites.py
View File

@ -295,10 +295,10 @@ class Site(NetBoxModel):
to='extras.ImageAttachment'
)
clone_fields = [
'status', 'region', 'group', 'tenant', 'facility', 'time_zone', 'description', 'physical_address',
'shipping_address', 'latitude', 'longitude',
]
clone_fields = (
'status', 'region', 'group', 'tenant', 'facility', 'time_zone', 'physical_address', 'shipping_address',
'latitude', 'longitude', 'description',
)
class Meta:
ordering = ('_name',)
@ -372,7 +372,7 @@ class Location(NestedGroupModel):
to='extras.ImageAttachment'
)
clone_fields = ['site', 'parent', 'status', 'tenant', 'description']
clone_fields = ('site', 'parent', 'status', 'tenant', 'description')
class Meta:
ordering = ['site', 'name']

2
netbox/ipam/models/fhrp.py
View File

@ -48,7 +48,7 @@ class FHRPGroup(NetBoxModel):
related_query_name='fhrpgroup'
)
clone_fields = ('protocol', 'auth_type', 'auth_key')
clone_fields = ('protocol', 'auth_type', 'auth_key', 'description')
class Meta:
ordering = ['protocol', 'group_id', 'pk']

18
netbox/ipam/models/ip.py
View File

@ -175,9 +175,9 @@ class Aggregate(GetAvailablePrefixesMixin, NetBoxModel):
blank=True
)
clone_fields = [
clone_fields = (
'rir', 'tenant', 'date_added', 'description',
]
)
class Meta:
ordering = ('prefix', 'pk') # prefix may be non-unique
@ -360,9 +360,9 @@ class Prefix(GetAvailablePrefixesMixin, NetBoxModel):
objects = PrefixQuerySet.as_manager()
clone_fields = [
clone_fields = (
'site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'is_pool', 'mark_utilized', 'description',
]
)
class Meta:
ordering = (F('vrf').asc(nulls_first=True), 'prefix', 'pk') # (vrf, prefix) may be non-unique
@ -608,9 +608,9 @@ class IPRange(NetBoxModel):
blank=True
)
clone_fields = [
clone_fields = (
'vrf', 'tenant', 'status', 'role', 'description',
]
)
class Meta:
ordering = (F('vrf').asc(nulls_first=True), 'start_address', 'pk') # (vrf, start_address) may be non-unique
@ -836,9 +836,9 @@ class IPAddress(NetBoxModel):
objects = IPAddressManager()
clone_fields = [
'vrf', 'tenant', 'status', 'role', 'description',
]
clone_fields = (
'vrf', 'tenant', 'status', 'role', 'dns_name', 'description',
)
class Meta:
ordering = ('address', 'pk') # address may be non-unique

4
netbox/ipam/models/vrfs.py
View File

@ -55,9 +55,9 @@ class VRF(NetBoxModel):
blank=True
)
clone_fields = [
clone_fields = (
'tenant', 'enforce_unique', 'description',
]
)
class Meta:
ordering = ('name', 'rd', 'pk') # (name, rd) may be non-unique

8
netbox/tenancy/models/contacts.py
View File

@ -112,9 +112,9 @@ class Contact(NetBoxModel):
blank=True
)
clone_fields = [
'group',
]
clone_fields = (
'group', 'name', 'title', 'phone', 'email', 'address', 'link',
)
class Meta:
ordering = ['name']
@ -155,7 +155,7 @@ class ContactAssignment(WebhooksMixin, ChangeLoggedModel):
blank=True
)
clone_fields = ('content_type', 'object_id')
clone_fields = ('content_type', 'object_id', 'role', 'priority')
class Meta:
ordering = ('priority', 'contact')

4
netbox/tenancy/models/tenants.py
View File

@ -76,9 +76,9 @@ class Tenant(NetBoxModel):
to='tenancy.ContactAssignment'
)
clone_fields = [
clone_fields = (
'group', 'description',
]
)
class Meta:
ordering = ['name']

10
netbox/virtualization/models.py
View File

@ -153,9 +153,9 @@ class Cluster(NetBoxModel):
to='tenancy.ContactAssignment'
)
clone_fields = [
'type', 'group', 'tenant', 'site',
]
clone_fields = (
'type', 'group', 'status', 'tenant', 'site',
)
class Meta:
ordering = ['name']
@ -299,9 +299,9 @@ class VirtualMachine(NetBoxModel, ConfigContextModel):
objects = ConfigContextModelQuerySet.as_manager()
clone_fields = [
clone_fields = (
'site', 'cluster', 'device', 'tenant', 'platform', 'status', 'role', 'vcpus', 'memory', 'disk',
]
)
class Meta:
ordering = ('_name', 'pk') # Name may be non-unique

2
netbox/wireless/models.py
View File

@ -113,6 +113,8 @@ class WirelessLAN(WirelessAuthenticationBase, NetBoxModel):
blank=True
)
clone_fields = ('ssid', 'group', 'tenant', 'description')
class Meta:
ordering = ('ssid', 'pk')
verbose_name = 'Wireless LAN'