From df8a9a2c9a1eaa6aa5f4f57a4692efc4c6cb9cf9 Mon Sep 17 00:00:00 2001 From: Mike Culbertson Date: Sun, 3 Dec 2017 13:37:00 -0500 Subject: [PATCH] Added form factors for console and console server port instances and templates. Added additional serial form factors --- netbox/dcim/constants.py | 40 ++++++++++++++++++++++++++++++++++++++++ netbox/dcim/forms.py | 14 +++++++++----- netbox/dcim/models.py | 8 ++++++-- netbox/dcim/tables.py | 4 ++-- 4 files changed, 57 insertions(+), 9 deletions(-) diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index b355e6c85..3a6be41f9 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -87,6 +87,9 @@ IFACE_FF_T1 = 4000 IFACE_FF_E1 = 4010 IFACE_FF_T3 = 4040 IFACE_FF_E3 = 4050 +IFACE_FF_RJ45_S = 4060 +IFACE_FF_DE9_S = 4070 +IFACE_FF_DB25_S = 4080 # Stacking IFACE_FF_STACKWISE = 5000 IFACE_FF_STACKWISE_PLUS = 5050 @@ -96,6 +99,15 @@ IFACE_FF_JUNIPER_VCP = 5200 # Other IFACE_FF_OTHER = 32767 +# Console +IFACE_FF_CON_RJ45 = 6000 +IFACE_FF_CON_DE9 = 6010 +IFACE_FF_CON_DB25 = 6020 +IFACE_FF_CON_USB = 6030 +IFACE_FF_CON_MCUSB = 6040 +IFACE_FF_CON_MNUSB = 6050 +IFACE_FF_CON_KVM = 6060 + IFACE_FF_CHOICES = [ [ 'Virtual interfaces', @@ -158,6 +170,9 @@ IFACE_FF_CHOICES = [ [IFACE_FF_E1, 'E1 (2.048 Mbps)'], [IFACE_FF_T3, 'T3 (45 Mbps)'], [IFACE_FF_E3, 'E3 (34 Mbps)'], + [IFACE_FF_RJ45_S, 'RJ45'], + [IFACE_FF_DE9_S, 'DE9'], + [IFACE_FF_DB25_S, 'DB25'], ] ], [ @@ -178,6 +193,31 @@ IFACE_FF_CHOICES = [ ], ] +CONSOLE_FF_CHOICES = [ + [ + 'Console', + [ + [IFACE_FF_CON_RJ45, 'RJ45 Serial'], + [IFACE_FF_CON_DE9, 'DE9 Serial'], + [IFACE_FF_CON_DB25, 'DB25 Serial'], + [IFACE_FF_CON_USB, 'USB to Serial'], + [IFACE_FF_CON_MCUSB, 'Micro USB to Serial'], + [IFACE_FF_CON_MNUSB, 'Mini USB to Serial'], + [IFACE_FF_CON_KVM, 'KVM'], + ] + ], +] + +CONSOLE_IFACE_TYPES = [ + IFACE_FF_CON_RJ45, + IFACE_FF_CON_DE9, + IFACE_FF_CON_DB25, + IFACE_FF_CON_USB, + IFACE_FF_CON_MCUSB, + IFACE_FF_CON_MNUSB, + IFACE_FF_CON_KVM, +] + VIRTUAL_IFACE_TYPES = [ IFACE_FF_VIRTUAL, IFACE_FF_LAG, diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 1f5d50c4d..4e61f22e4 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -22,7 +22,7 @@ from virtualization.models import Cluster from .constants import ( CONNECTION_STATUS_CHOICES, CONNECTION_STATUS_CONNECTED, IFACE_FF_CHOICES, IFACE_FF_LAG, IFACE_ORDERING_CHOICES, RACK_FACE_CHOICES, RACK_TYPE_CHOICES, RACK_WIDTH_CHOICES, RACK_WIDTH_19IN, RACK_WIDTH_23IN, STATUS_CHOICES, - SUBDEVICE_ROLE_CHILD, SUBDEVICE_ROLE_PARENT, SUBDEVICE_ROLE_CHOICES, + SUBDEVICE_ROLE_CHILD, SUBDEVICE_ROLE_PARENT, SUBDEVICE_ROLE_CHOICES, CONSOLE_FF_CHOICES ) from .formfields import MACAddressFormField from .models import ( @@ -545,7 +545,7 @@ class ConsolePortTemplateForm(BootstrapMixin, forms.ModelForm): class Meta: model = ConsolePortTemplate - fields = ['device_type', 'name'] + fields = ['device_type', 'name', 'form_factor'] widgets = { 'device_type': forms.HiddenInput(), } @@ -553,13 +553,14 @@ class ConsolePortTemplateForm(BootstrapMixin, forms.ModelForm): class ConsolePortTemplateCreateForm(ComponentForm): name_pattern = ExpandableNameField(label='Name') + form_factor = forms.ChoiceField(choices=CONSOLE_FF_CHOICES) class ConsoleServerPortTemplateForm(BootstrapMixin, forms.ModelForm): class Meta: model = ConsoleServerPortTemplate - fields = ['device_type', 'name'] + fields = ['device_type', 'name', 'form_factor'] widgets = { 'device_type': forms.HiddenInput(), } @@ -567,6 +568,7 @@ class ConsoleServerPortTemplateForm(BootstrapMixin, forms.ModelForm): class ConsoleServerPortTemplateCreateForm(ComponentForm): name_pattern = ExpandableNameField(label='Name') + form_factor = forms.ChoiceField(choices=CONSOLE_FF_CHOICES) class PowerPortTemplateForm(BootstrapMixin, forms.ModelForm): @@ -1083,7 +1085,7 @@ class ConsolePortForm(BootstrapMixin, forms.ModelForm): class Meta: model = ConsolePort - fields = ['device', 'name'] + fields = ['device', 'name', 'form_factor'] widgets = { 'device': forms.HiddenInput(), } @@ -1091,6 +1093,7 @@ class ConsolePortForm(BootstrapMixin, forms.ModelForm): class ConsolePortCreateForm(ComponentForm): name_pattern = ExpandableNameField(label='Name') + form_factor = forms.ChoiceField(choices=CONSOLE_FF_CHOICES) class ConsoleConnectionCSVForm(forms.ModelForm): @@ -1252,7 +1255,7 @@ class ConsoleServerPortForm(BootstrapMixin, forms.ModelForm): class Meta: model = ConsoleServerPort - fields = ['device', 'name'] + fields = ['device', 'name', 'form_factor'] widgets = { 'device': forms.HiddenInput(), } @@ -1260,6 +1263,7 @@ class ConsoleServerPortForm(BootstrapMixin, forms.ModelForm): class ConsoleServerPortCreateForm(ComponentForm): name_pattern = ExpandableNameField(label='Name') + form_factor = forms.ChoiceField(choices=CONSOLE_FF_CHOICES) class ConsoleServerPortConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.Form): diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 0a1a03fb7..ea518eee8 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -641,6 +641,7 @@ class ConsolePortTemplate(models.Model): """ device_type = models.ForeignKey('DeviceType', related_name='console_port_templates', on_delete=models.CASCADE) name = models.CharField(max_length=50) + form_factor = models.PositiveSmallIntegerField(choices=CONSOLE_FF_CHOICES, default=IFACE_FF_CON_RJ45) class Meta: ordering = ['device_type', 'name'] @@ -657,6 +658,7 @@ class ConsoleServerPortTemplate(models.Model): """ device_type = models.ForeignKey('DeviceType', related_name='cs_port_templates', on_delete=models.CASCADE) name = models.CharField(max_length=50) + form_factor = models.PositiveSmallIntegerField(choices=CONSOLE_FF_CHOICES, default=IFACE_FF_CON_RJ45) class Meta: ordering = ['device_type', 'name'] @@ -961,11 +963,11 @@ class Device(CreatedUpdatedModel, CustomFieldModel): # If this is a new Device, instantiate all of the related components per the DeviceType definition if is_new: ConsolePort.objects.bulk_create( - [ConsolePort(device=self, name=template.name) for template in + [ConsolePort(device=self, name=template.name, form_factor=template.form_factor) for template in self.device_type.console_port_templates.all()] ) ConsoleServerPort.objects.bulk_create( - [ConsoleServerPort(device=self, name=template.name) for template in + [ConsoleServerPort(device=self, name=template.name, form_factor=template.form_factor) for template in self.device_type.cs_port_templates.all()] ) PowerPort.objects.bulk_create( @@ -1063,6 +1065,7 @@ class ConsolePort(models.Model): """ device = models.ForeignKey('Device', related_name='console_ports', on_delete=models.CASCADE) name = models.CharField(max_length=50) + form_factor = models.PositiveSmallIntegerField(choices=CONSOLE_FF_CHOICES, default=IFACE_FF_CON_RJ45) cs_port = models.OneToOneField('ConsoleServerPort', related_name='connected_console', on_delete=models.SET_NULL, verbose_name='Console server port', blank=True, null=True) connection_status = models.NullBooleanField(choices=CONNECTION_STATUS_CHOICES, default=CONNECTION_STATUS_CONNECTED) @@ -1113,6 +1116,7 @@ class ConsoleServerPort(models.Model): """ device = models.ForeignKey('Device', related_name='cs_ports', on_delete=models.CASCADE) name = models.CharField(max_length=50) + form_factor = models.PositiveSmallIntegerField(choices=CONSOLE_FF_CHOICES, default=IFACE_FF_CON_RJ45) objects = ConsoleServerPortManager() diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index e95277704..3f4ca91dd 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -304,7 +304,7 @@ class ConsolePortTemplateTable(BaseTable): class Meta(BaseTable.Meta): model = ConsolePortTemplate - fields = ('pk', 'name') + fields = ('pk', 'name', 'form_factor') empty_text = "None" @@ -313,7 +313,7 @@ class ConsoleServerPortTemplateTable(BaseTable): class Meta(BaseTable.Meta): model = ConsoleServerPortTemplate - fields = ('pk', 'name') + fields = ('pk', 'name', 'form_factor') empty_text = "None"