Просмотр исходного кода

#9414: Clean up clone_fields on all models

jeremystretch 3 лет назад
Родитель
Сommit
8cd5a24409

+ 2 - 2
netbox/circuits/models/circuits.py

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

+ 2 - 2
netbox/circuits/models/providers.py

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

+ 13 - 10
netbox/dcim/models/device_components.py

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

+ 6 - 5
netbox/dcim/models/devices.py

@@ -135,9 +135,9 @@ class DeviceType(NetBoxModel):
         blank=True
         blank=True
     )
     )
 
 
-    clone_fields = [
+    clone_fields = (
         'manufacturer', 'u_height', 'is_full_depth', 'subdevice_role', 'airflow',
         'manufacturer', 'u_height', 'is_full_depth', 'subdevice_role', 'airflow',
-    ]
+    )
 
 
     class Meta:
     class Meta:
         ordering = ['manufacturer', 'model']
         ordering = ['manufacturer', 'model']
@@ -630,9 +630,10 @@ class Device(NetBoxModel, ConfigContextModel):
 
 
     objects = ConfigContextModelQuerySet.as_manager()
     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:
     class Meta:
         ordering = ('_name', 'pk')  # Name may be null
         ordering = ('_name', 'pk')  # Name may be null

+ 3 - 3
netbox/dcim/models/power.py

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

+ 2 - 2
netbox/dcim/models/racks.py

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

+ 5 - 5
netbox/dcim/models/sites.py

@@ -295,10 +295,10 @@ class Site(NetBoxModel):
         to='extras.ImageAttachment'
         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:
     class Meta:
         ordering = ('_name',)
         ordering = ('_name',)
@@ -372,7 +372,7 @@ class Location(NestedGroupModel):
         to='extras.ImageAttachment'
         to='extras.ImageAttachment'
     )
     )
 
 
-    clone_fields = ['site', 'parent', 'status', 'tenant', 'description']
+    clone_fields = ('site', 'parent', 'status', 'tenant', 'description')
 
 
     class Meta:
     class Meta:
         ordering = ['site', 'name']
         ordering = ['site', 'name']

+ 1 - 1
netbox/ipam/models/fhrp.py

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

+ 9 - 9
netbox/ipam/models/ip.py

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

+ 2 - 2
netbox/ipam/models/vrfs.py

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

+ 4 - 4
netbox/tenancy/models/contacts.py

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

+ 2 - 2
netbox/tenancy/models/tenants.py

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

+ 5 - 5
netbox/virtualization/models.py

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

+ 2 - 0
netbox/wireless/models.py

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