[ge,xe]-0/0/[0-9]. {module} is accepted as a substitution for
- the module bay position.
- """
- )
- device_type = DynamicModelChoiceField(
- queryset=DeviceType.objects.all(),
- required=False
- )
- module_type = DynamicModelChoiceField(
- queryset=ModuleType.objects.all(),
- required=False
- )
- field_order = ('device_type', 'module_type', 'name_pattern', 'label_pattern')
+class ConsoleServerPortTemplateCreateForm(ComponentCreateForm, model_forms.ConsoleServerPortTemplateForm):
+
+ class Meta(model_forms.ConsoleServerPortTemplateForm.Meta):
+ exclude = ('name', 'label')
-class DeviceComponentCreateForm(ComponentCreateForm):
- device = DynamicModelChoiceField(
- queryset=Device.objects.all()
- )
- field_order = ('device', 'name_pattern', 'label_pattern')
+class PowerPortTemplateCreateForm(ComponentCreateForm, model_forms.PowerPortTemplateForm):
+
+ class Meta(model_forms.PowerPortTemplateForm.Meta):
+ exclude = ('name', 'label')
-class FrontPortTemplateCreateForm(ModularComponentTemplateCreateForm):
- rear_port_set = forms.MultipleChoiceField(
+class PowerOutletTemplateCreateForm(ComponentCreateForm, model_forms.PowerOutletTemplateForm):
+
+ class Meta(model_forms.PowerOutletTemplateForm.Meta):
+ exclude = ('name', 'label')
+
+
+class InterfaceTemplateCreateForm(ComponentCreateForm, model_forms.InterfaceTemplateForm):
+
+ class Meta(model_forms.InterfaceTemplateForm.Meta):
+ exclude = ('name', 'label')
+
+
+class FrontPortTemplateCreateForm(ComponentCreateForm, model_forms.FrontPortTemplateForm):
+ rear_port = forms.MultipleChoiceField(
choices=[],
label='Rear ports',
help_text='Select one rear port assignment for each front port being created.',
)
- field_order = (
- 'device_type', 'name_pattern', 'label_pattern', 'rear_port_set',
+
+ # Override fieldsets from FrontPortTemplateForm to omit rear_port_position
+ fieldsets = (
+ (None, ('device_type', 'module_type', 'name', 'label', 'type', 'color', 'rear_port', 'description')),
)
+ class Meta(model_forms.FrontPortTemplateForm.Meta):
+ exclude = ('name', 'label', 'rear_port', 'rear_port_position')
+
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -130,12 +139,12 @@ class FrontPortTemplateCreateForm(ModularComponentTemplateCreateForm):
choices.append(
('{}:{}'.format(rear_port.pk, i), '{}:{}'.format(rear_port.name, i))
)
- self.fields['rear_port_set'].choices = choices
+ self.fields['rear_port'].choices = choices
def get_iterative_data(self, iteration):
# Assign rear port and position from selected set
- rear_port, position = self.cleaned_data['rear_port_set'][iteration].split(':')
+ rear_port, position = self.cleaned_data['rear_port'][iteration].split(':')
return {
'rear_port': int(rear_port),
@@ -143,16 +152,94 @@ class FrontPortTemplateCreateForm(ModularComponentTemplateCreateForm):
}
-class FrontPortCreateForm(DeviceComponentCreateForm):
- rear_port_set = forms.MultipleChoiceField(
+class RearPortTemplateCreateForm(ComponentCreateForm, model_forms.RearPortTemplateForm):
+
+ class Meta(model_forms.RearPortTemplateForm.Meta):
+ exclude = ('name', 'label')
+
+
+class DeviceBayTemplateCreateForm(ComponentCreateForm, model_forms.DeviceBayTemplateForm):
+
+ class Meta(model_forms.DeviceBayTemplateForm.Meta):
+ exclude = ('name', 'label')
+
+
+class ModuleBayTemplateCreateForm(ComponentCreateForm, model_forms.ModuleBayTemplateForm):
+ position = ExpandableNameField(
+ label='Position',
+ required=False,
+ help_text='Alphanumeric ranges are supported. (Must match the number of objects being created.)'
+ )
+ replication_fields = ('name', 'label', 'position')
+
+ class Meta(model_forms.ModuleBayTemplateForm.Meta):
+ exclude = ('name', 'label', 'position')
+
+
+class InventoryItemTemplateCreateForm(ComponentCreateForm, model_forms.InventoryItemTemplateForm):
+
+ class Meta(model_forms.InventoryItemTemplateForm.Meta):
+ exclude = ('name', 'label')
+
+
+#
+# Device components
+#
+
+class ConsolePortCreateForm(ComponentCreateForm, model_forms.ConsolePortForm):
+
+ class Meta(model_forms.ConsolePortForm.Meta):
+ exclude = ('name', 'label')
+
+
+class ConsoleServerPortCreateForm(ComponentCreateForm, model_forms.ConsoleServerPortForm):
+
+ class Meta(model_forms.ConsoleServerPortForm.Meta):
+ exclude = ('name', 'label')
+
+
+class PowerPortCreateForm(ComponentCreateForm, model_forms.PowerPortForm):
+
+ class Meta(model_forms.PowerPortForm.Meta):
+ exclude = ('name', 'label')
+
+
+class PowerOutletCreateForm(ComponentCreateForm, model_forms.PowerOutletForm):
+
+ class Meta(model_forms.PowerOutletForm.Meta):
+ exclude = ('name', 'label')
+
+
+class InterfaceCreateForm(ComponentCreateForm, model_forms.InterfaceForm):
+
+ class Meta(model_forms.InterfaceForm.Meta):
+ exclude = ('name', 'label')
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+
+ if 'module' in self.fields:
+ self.fields['name'].help_text += ' The string {module} will be replaced with the position ' \
+ 'of the assigned module, if any'
+
+
+class FrontPortCreateForm(ComponentCreateForm, model_forms.FrontPortForm):
+ rear_port = forms.MultipleChoiceField(
choices=[],
label='Rear ports',
help_text='Select one rear port assignment for each front port being created.',
)
- field_order = (
- 'device', 'name_pattern', 'label_pattern', 'rear_port_set',
+
+ # Override fieldsets from FrontPortForm to omit rear_port_position
+ fieldsets = (
+ (None, (
+ 'device', 'module', 'name', 'label', 'type', 'color', 'rear_port', 'mark_connected', 'description', 'tags',
+ )),
)
+ class Meta(model_forms.FrontPortForm.Meta):
+ exclude = ('name', 'label', 'rear_port', 'rear_port_position')
+
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -176,12 +263,12 @@ class FrontPortCreateForm(DeviceComponentCreateForm):
choices.append(
('{}:{}'.format(rear_port.pk, i), '{}:{}'.format(rear_port.name, i))
)
- self.fields['rear_port_set'].choices = choices
+ self.fields['rear_port'].choices = choices
def get_iterative_data(self, iteration):
# Assign rear port and position from selected set
- rear_port, position = self.cleaned_data['rear_port_set'][iteration].split(':')
+ rear_port, position = self.cleaned_data['rear_port'][iteration].split(':')
return {
'rear_port': int(rear_port),
@@ -189,28 +276,39 @@ class FrontPortCreateForm(DeviceComponentCreateForm):
}
-class ModuleBayTemplateCreateForm(ComponentTemplateCreateForm):
- position_pattern = ExpandableNameField(
+class RearPortCreateForm(ComponentCreateForm, model_forms.RearPortForm):
+
+ class Meta(model_forms.RearPortForm.Meta):
+ exclude = ('name', 'label')
+
+
+class DeviceBayCreateForm(ComponentCreateForm, model_forms.DeviceBayForm):
+
+ class Meta(model_forms.DeviceBayForm.Meta):
+ exclude = ('name', 'label')
+
+
+class ModuleBayCreateForm(ComponentCreateForm, model_forms.ModuleBayForm):
+ position = ExpandableNameField(
label='Position',
required=False,
- help_text='Alphanumeric ranges are supported. (Must match the number of names being created.)'
+ help_text='Alphanumeric ranges are supported. (Must match the number of objects being created.)'
)
- field_order = ('device_type', 'name_pattern', 'label_pattern', 'position_pattern')
+ replication_fields = ('name', 'label', 'position')
+
+ class Meta(model_forms.ModuleBayForm.Meta):
+ exclude = ('name', 'label', 'position')
-class ModuleBayCreateForm(DeviceComponentCreateForm):
- position_pattern = ExpandableNameField(
- label='Position',
- required=False,
- help_text='Alphanumeric ranges are supported. (Must match the number of names being created.)'
- )
- field_order = ('device', 'name_pattern', 'label_pattern', 'position_pattern')
+class InventoryItemCreateForm(ComponentCreateForm, model_forms.InventoryItemForm):
+
+ class Meta(model_forms.InventoryItemForm.Meta):
+ exclude = ('name', 'label')
-class InventoryItemCreateForm(ComponentCreateForm):
- # Device is assigned by the model form
- field_order = ('name_pattern', 'label_pattern')
-
+#
+# Virtual chassis
+#
class VirtualChassisCreateForm(NetBoxModelForm):
region = DynamicModelChoiceField(
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index e22913a8b..c521ee095 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -908,18 +908,20 @@ class FrontPort(ModularComponentModel, CabledObjectModel):
def clean(self):
super().clean()
- # Validate rear port assignment
- if self.rear_port.device != self.device:
- raise ValidationError({
- "rear_port": f"Rear port ({self.rear_port}) must belong to the same device"
- })
+ if hasattr(self, 'rear_port'):
- # Validate rear port position assignment
- if self.rear_port_position > self.rear_port.positions:
- raise ValidationError({
- "rear_port_position": f"Invalid rear port position ({self.rear_port_position}): Rear port "
- f"{self.rear_port.name} has only {self.rear_port.positions} positions"
- })
+ # Validate rear port assignment
+ if self.rear_port.device != self.device:
+ raise ValidationError({
+ "rear_port": f"Rear port ({self.rear_port}) must belong to the same device"
+ })
+
+ # Validate rear port position assignment
+ if self.rear_port_position > self.rear_port.positions:
+ raise ValidationError({
+ "rear_port_position": f"Invalid rear port position ({self.rear_port_position}): Rear port "
+ f"{self.rear_port.name} has only {self.rear_port.positions} positions"
+ })
class RearPort(ModularComponentModel, CabledObjectModel):
diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index c42731b90..142c7ef67 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -143,6 +143,15 @@ class DeviceTable(TenancyColumnsMixin, NetBoxTable):
template_code=DEVICE_LINK
)
status = columns.ChoiceFieldColumn()
+ region = tables.Column(
+ accessor=Accessor('site__region'),
+ linkify=True
+ )
+ site_group = tables.Column(
+ accessor=Accessor('site__group'),
+ linkify=True,
+ verbose_name='Site Group'
+ )
site = tables.Column(
linkify=True
)
@@ -203,9 +212,9 @@ class DeviceTable(TenancyColumnsMixin, NetBoxTable):
model = Device
fields = (
'pk', 'id', 'name', 'status', 'tenant', 'tenant_group', 'device_role', 'manufacturer', 'device_type',
- 'platform', 'serial', 'asset_tag', 'site', 'location', 'rack', 'position', 'face', 'primary_ip', 'airflow',
- 'primary_ip4', 'primary_ip6', 'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments',
- 'contacts', 'tags', 'created', 'last_updated',
+ 'platform', 'serial', 'asset_tag', 'region', 'site_group', 'site', 'location', 'rack', 'position', 'face',
+ 'airflow', 'primary_ip', 'primary_ip4', 'primary_ip6', 'cluster', 'virtual_chassis', 'vc_position',
+ 'vc_priority', 'comments', 'contacts', 'tags', 'created', 'last_updated',
)
default_columns = (
'pk', 'name', 'status', 'tenant', 'site', 'location', 'rack', 'device_role', 'manufacturer', 'device_type',
diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py
index d34003ee5..dfc77b854 100644
--- a/netbox/dcim/tables/template_code.py
+++ b/netbox/dcim/tables/template_code.py
@@ -239,7 +239,7 @@ INTERFACE_BUTTONS = """
+ {{ form.non_field_errors }} +
+