From 5b753923b61748c947877bd0db5569c906a3e895 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 11 Mar 2019 22:40:52 -0400 Subject: [PATCH 01/21] Initial work on power modeling (WIP) --- netbox/dcim/constants.py | 30 ++++ netbox/dcim/forms.py | 170 ++++++++++++++++++++- netbox/dcim/migrations/0072_powerfeeds.py | 74 +++++++++ netbox/dcim/models.py | 131 ++++++++++++++++ netbox/dcim/tables.py | 50 +++++- netbox/dcim/urls.py | 22 ++- netbox/dcim/views.py | 115 +++++++++++++- netbox/templates/dcim/powerfeed.html | 111 ++++++++++++++ netbox/templates/dcim/powerfeed_edit.html | 45 ++++++ netbox/templates/dcim/powerfeed_list.html | 22 +++ netbox/templates/dcim/powerpanel_list.html | 18 +++ netbox/templates/inc/nav_menu.html | 23 +++ 12 files changed, 804 insertions(+), 7 deletions(-) create mode 100644 netbox/dcim/migrations/0072_powerfeeds.py create mode 100644 netbox/templates/dcim/powerfeed.html create mode 100644 netbox/templates/dcim/powerfeed_edit.html create mode 100644 netbox/templates/dcim/powerfeed_list.html create mode 100644 netbox/templates/dcim/powerpanel_list.html diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 0b81e68bf..e68493af6 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -443,3 +443,33 @@ RACK_DIMENSION_UNIT_CHOICES = ( (LENGTH_UNIT_MILLIMETER, 'Millimeters'), (LENGTH_UNIT_INCH, 'Inches'), ) + +# Power feeds +POWERFEED_TYPE_PRIMARY = 1 +POWERFEED_TYPE_REDUNDANT = 2 +POWERFEED_TYPE_CHOICES = ( + (POWERFEED_TYPE_PRIMARY, 'AC'), + (POWERFEED_TYPE_REDUNDANT, 'DC'), +) +POWERFEED_SUPPLY_AC = 1 +POWERFEED_SUPPLY_DC = 2 +POWERFEED_SUPPLY_CHOICES = ( + (POWERFEED_SUPPLY_AC, 'AC'), + (POWERFEED_SUPPLY_DC, 'DC'), +) +POWERFEED_PHASE_SINGLE = 1 +POWERFEED_PHASE_3PHASE = 3 +POWERFEED_PHASE_CHOICES = ( + (POWERFEED_PHASE_SINGLE, 'Single phase'), + (POWERFEED_PHASE_3PHASE, 'Three-phase'), +) +POWERFEED_STATUS_OFFLINE = 0 +POWERFEED_STATUS_ACTIVE = 1 +POWERFEED_STATUS_PLANNED = 2 +POWERFEED_STATUS_FAILED = 4 +POWERFEED_STATUS_CHOICES = ( + (POWERFEED_STATUS_ACTIVE, 'Active'), + (POWERFEED_STATUS_OFFLINE, 'Offline'), + (POWERFEED_STATUS_PLANNED, 'Planned'), + (POWERFEED_STATUS_FAILED, 'Failed'), +) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index ab3da181f..8e429137a 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -26,8 +26,8 @@ from .constants import * from .models import ( Cable, DeviceBay, DeviceBayTemplate, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, Manufacturer, - InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, RackGroup, - RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis + InventoryItem, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, PowerPortTemplate, + Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) DEVICE_BY_PK_RE = r'{\d+\}' @@ -3156,3 +3156,169 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm): to_field_name='slug', null_label='-- None --', ) + + +# +# Power panels +# + +class PowerPanelForm(BootstrapMixin, forms.ModelForm): + rackgroup = ChainedModelChoiceField( + queryset=RackGroup.objects.all(), + chains=( + ('site', 'site'), + ), + required=False, + widget=APISelect( + api_url='/api/dcim/rack-groups/', + ) + ) + + class Meta: + model = PowerPanel + fields = [ + 'site', 'rackgroup', 'name', + ] + widgets = { + 'site': APISelect( + api_url="/api/dcim/sites/", + filter_for={ + 'rackgroup': 'site_id', + } + ), + } + + +class PowerPanelCSVForm(forms.ModelForm): + site = forms.ModelChoiceField( + queryset=Site.objects.all(), + to_field_name='name', + help_text='Name of parent site', + error_messages={ + 'invalid_choice': 'Site not found.', + } + ) + group_name = forms.CharField( + help_text='Name of rack group', + required=False + ) + + class Meta: + model = PowerPanel + fields = PowerPanel.csv_headers + + +# +# Power feeds +# + +class PowerFeedForm(BootstrapMixin, CustomFieldForm): + tags = TagField( + required=False + ) + + class Meta: + model = PowerFeed + fields = [ + 'powerpanel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', + 'comments', 'tags', + ] + widgets = { + 'site': APISelect( + api_url="/api/dcim/sites/", + filter_for={ + 'rackgroup': 'site_id', + } + ), + 'type': StaticSelect2(), + 'status': StaticSelect2(), + 'supply': StaticSelect2(), + 'phase': StaticSelect2(), + } + + +class PowerFeedCSVForm(forms.ModelForm): + type = CSVChoiceField( + choices=POWERFEED_TYPE_CHOICES, + required=False, + help_text='Primary or redundant' + ) + status = CSVChoiceField( + choices=POWERFEED_STATUS_CHOICES, + required=False, + help_text='Operational status' + ) + supply = CSVChoiceField( + choices=POWERFEED_SUPPLY_CHOICES, + required=False, + help_text='AC/DC' + ) + + class Meta: + model = PowerFeed + fields = PowerFeed.csv_headers + + +class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm): + pk = forms.ModelMultipleChoiceField( + queryset=PowerFeed.objects.all(), + widget=forms.MultipleHiddenInput + ) + powerpanel = forms.ModelChoiceField( + queryset=PowerPanel.objects.all(), + required=False, + widget=APISelect( + api_url="/api/dcim/sites", + filter_for={ + 'rackgroup': 'site_id', + } + ) + ) + rackgroup = forms.ModelChoiceField( + queryset=RackGroup.objects.all(), + required=False, + widget=APISelect( + api_url="/api/dcim/rack-groups", + ) + ) + type = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_TYPE_CHOICES), + required=False, + initial='', + widget=StaticSelect2() + ) + status = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_STATUS_CHOICES), + required=False, + initial='', + widget=StaticSelect2() + ) + supply = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_SUPPLY_CHOICES), + required=False, + initial='', + widget=StaticSelect2() + ) + voltage = forms.IntegerField( + required=False + ) + amperage = forms.IntegerField( + required=False + ) + phase = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_PHASE_CHOICES), + required=False, + initial='', + widget=StaticSelect2() + ) + max_utilization = forms.IntegerField( + required=False + ) + comments = forms.CharField( + required=False + ) + + class Meta: + nullable_fields = [ + 'rackgroup', 'comments', + ] diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py new file mode 100644 index 000000000..ddfbb8ec1 --- /dev/null +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -0,0 +1,74 @@ +# Generated by Django 2.1.7 on 2019-03-12 02:29 + +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion +import taggit.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0020_add_color_comments_changelog_to_tag'), + ('dcim', '0071_device_components_add_description'), + ] + + operations = [ + migrations.CreateModel( + name='PowerFeed', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('created', models.DateField(auto_now_add=True, null=True)), + ('last_updated', models.DateTimeField(auto_now=True, null=True)), + ('name', models.CharField(max_length=50)), + ('type', models.PositiveSmallIntegerField(default=1)), + ('status', models.PositiveSmallIntegerField(default=1)), + ('supply', models.PositiveSmallIntegerField(default=1)), + ('voltage', models.PositiveSmallIntegerField(default=120, validators=[django.core.validators.MinValueValidator(1)])), + ('amperage', models.PositiveSmallIntegerField(default=20, validators=[django.core.validators.MinValueValidator(1)])), + ('phase', models.PositiveSmallIntegerField(default=1)), + ('max_utilization', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), + ('comments', models.TextField(blank=True)), + ], + options={ + 'ordering': ['powerpanel', 'name'], + }, + ), + migrations.CreateModel( + name='PowerPanel', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), + ('created', models.DateField(auto_now_add=True, null=True)), + ('last_updated', models.DateTimeField(auto_now=True, null=True)), + ('name', models.CharField(max_length=50)), + ('rackgroup', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.RackGroup')), + ('site', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='dcim.Site')), + ], + options={ + 'ordering': ['site', 'name'], + }, + ), + migrations.AddField( + model_name='powerfeed', + name='powerpanel', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='powerfeeds', to='dcim.PowerPanel'), + ), + migrations.AddField( + model_name='powerfeed', + name='rack', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.Rack'), + ), + migrations.AddField( + model_name='powerfeed', + name='tags', + field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), + ), + migrations.AlterUniqueTogether( + name='powerpanel', + unique_together={('site', 'name')}, + ), + migrations.AlterUniqueTogether( + name='powerfeed', + unique_together={('powerpanel', 'name')}, + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index cbfce0b91..ad7e198fb 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2668,3 +2668,134 @@ class Cable(ChangeLoggedModel): b_endpoint = b_path[-1][2] return a_endpoint, b_endpoint, path_status + + +# +# Power +# + +class PowerPanel(ChangeLoggedModel): + """ + A distribution point for electrical power; e.g. a data center RPP. + """ + site = models.ForeignKey( + to='Site', + on_delete=models.PROTECT + ) + rackgroup = models.ForeignKey( + to='RackGroup', + on_delete=models.PROTECT, + blank=True, + null=True + ) + name = models.CharField( + max_length=50 + ) + + csv_headers = ['site', 'rackgroup', 'name'] + + class Meta: + ordering = ['site', 'name'] + unique_together = ['site', 'name'] + + def __str__(self): + return self.name + + def get_absolute_url(self): + return reverse('dcim:powerpanel', args=[self.pk]) + + def to_csv(self): + return ( + self.site.name, + self.rackgroup.name if self.rackgroup else None, + self.name, + ) + + +class PowerFeed(ChangeLoggedModel, CustomFieldModel): + """ + An electrical circuit delivered from a PowerPanel. + """ + powerpanel = models.ForeignKey( + to='PowerPanel', + on_delete=models.PROTECT, + related_name='powerfeeds' + ) + rack = models.ForeignKey( + to='Rack', + on_delete=models.PROTECT, + blank=True, + null=True + ) + name = models.CharField( + max_length=50 + ) + type = models.PositiveSmallIntegerField( + choices=POWERFEED_TYPE_CHOICES, + default=POWERFEED_TYPE_PRIMARY + ) + status = models.PositiveSmallIntegerField( + choices=POWERFEED_STATUS_CHOICES, + default=POWERFEED_STATUS_ACTIVE + ) + supply = models.PositiveSmallIntegerField( + choices=POWERFEED_SUPPLY_CHOICES, + default=POWERFEED_SUPPLY_AC + ) + voltage = models.PositiveSmallIntegerField( + validators=[MinValueValidator(1)], + default=120 + ) + amperage = models.PositiveSmallIntegerField( + validators=[MinValueValidator(1)], + default=20 + ) + phase = models.PositiveSmallIntegerField( + choices=POWERFEED_PHASE_CHOICES, + default=POWERFEED_PHASE_SINGLE + ) + max_utilization = models.PositiveSmallIntegerField( + validators=[MinValueValidator(1), MaxValueValidator(100)], + default=80, + help_text="Maximum permissible draw (percentage)" + ) + comments = models.TextField( + blank=True + ) + custom_field_values = GenericRelation( + to='extras.CustomFieldValue', + content_type_field='obj_type', + object_id_field='obj_id' + ) + + tags = TaggableManager(through=TaggedItem) + + csv_headers = [ + 'powerpanel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', + 'comments', + ] + + class Meta: + ordering = ['powerpanel', 'name'] + unique_together = ['powerpanel', 'name'] + + def __str__(self): + return self.name + + def get_absolute_url(self): + return reverse('dcim:powerfeed', args=[self.pk]) + + def to_csv(self): + return ( + self.powerpanel.name, + self.rack.name if self.rack else None, + self.name, + self.get_type_display(), + self.get_status_display(), + self.get_supply_display(), + self.voltage, + self.amperage, + self.get_phase_display(), + self.max_utilization, + self.comments, + ) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 436b9053d..8106d997a 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -6,8 +6,9 @@ from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + InventoryItem, Manufacturer, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) REGION_LINK = """ @@ -786,3 +787,48 @@ class VirtualChassisTable(BaseTable): class Meta(BaseTable.Meta): model = VirtualChassis fields = ('pk', 'master', 'domain', 'member_count', 'actions') + + +# +# Power panels +# + +class PowerPanelTable(BaseTable): + pk = ToggleColumn() + name = tables.LinkColumn() + powerfeed_count = tables.Column( + verbose_name='Feeds' + ) + actions = tables.TemplateColumn( + template_code=RACKROLE_ACTIONS, + attrs={ + 'td': {'class': 'text-right noprint'} + }, + verbose_name='' + ) + + class Meta(BaseTable.Meta): + model = PowerPanel + fields = ('pk', 'name', 'site', 'rackgroup', 'powerfeed_count', 'actions') + + +# +# Power feeds +# + +class PowerFeedTable(BaseTable): + pk = ToggleColumn() + name = tables.LinkColumn() + powerpanel = tables.LinkColumn( + viewname='dcim:powerpanel', + args=[Accessor('powerpanel.pk')], + + ) + rack = tables.LinkColumn( + viewname='dcim:rack', + accessor=Accessor('rack.pk') + ) + + class Meta(BaseTable.Meta): + model = PowerFeed + fields = ('pk', 'name', 'powerpanel', 'rack', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase') diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 21d620af1..a087a0ae9 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -6,7 +6,8 @@ from secrets.views import secret_add from . import views from .models import ( Cable, ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, FrontPort, Interface, Manufacturer, Platform, - PowerPort, PowerOutlet, Rack, RackGroup, RackReservation, RackRole, RearPort, Region, Site, VirtualChassis, + PowerFeed, PowerPanel, PowerPort, PowerOutlet, Rack, RackGroup, RackReservation, RackRole, RearPort, Region, Site, + VirtualChassis, ) app_name = 'dcim' @@ -279,4 +280,23 @@ urlpatterns = [ url(r'^virtual-chassis/(?P\d+)/add-member/$', views.VirtualChassisAddMemberView.as_view(), name='virtualchassis_add_member'), url(r'^virtual-chassis-members/(?P\d+)/delete/$', views.VirtualChassisRemoveMemberView.as_view(), name='virtualchassis_remove_member'), + # Power panels + url(r'^power-panels/$', views.PowerPanelListView.as_view(), name='powerpanel_list'), + url(r'^power-panels/add/$', views.PowerPanelCreateView.as_view(), name='powerpanel_add'), + url(r'^power-panels/import/$', views.PowerPanelBulkImportView.as_view(), name='powerpanel_import'), + url(r'^power-panels/delete/$', views.PowerPanelBulkDeleteView.as_view(), name='powerpanel_bulk_delete'), + url(r'^power-panels/(?P\d+)/edit/$', views.PowerPanelEditView.as_view(), name='powerpanel_edit'), + url(r'^power-panels/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerpanel_changelog', kwargs={'model': PowerPanel}), + + # Racks + url(r'^power-feeds/$', views.PowerFeedListView.as_view(), name='powerfeed_list'), + url(r'^power-feeds/add/$', views.PowerFeedEditView.as_view(), name='powerfeed_add'), + url(r'^power-feeds/import/$', views.PowerFeedBulkImportView.as_view(), name='powerfeed_import'), + url(r'^power-feeds/edit/$', views.PowerFeedBulkEditView.as_view(), name='powerfeed_bulk_edit'), + url(r'^power-feeds/delete/$', views.PowerFeedBulkDeleteView.as_view(), name='powerfeed_bulk_delete'), + url(r'^power-feeds/(?P\d+)/$', views.PowerFeedView.as_view(), name='powerfeed'), + url(r'^power-feeds/(?P\d+)/edit/$', views.PowerFeedEditView.as_view(), name='powerfeed_edit'), + url(r'^power-feeds/(?P\d+)/delete/$', views.PowerFeedDeleteView.as_view(), name='powerfeed_delete'), + url(r'^power-feeds/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerfeed_changelog', kwargs={'model': PowerFeed}), + ] diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 27f90a3a2..958975e16 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -30,8 +30,9 @@ from . import filters, forms, tables from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + InventoryItem, Manufacturer, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) @@ -2114,3 +2115,113 @@ class VirtualChassisRemoveMemberView(PermissionRequiredMixin, GetReturnURLMixin, 'form': form, 'return_url': self.get_return_url(request, device), }) + + +# +# Power panels +# + +class PowerPanelListView(ObjectListView): + queryset = PowerPanel.objects.select_related( + 'site', 'rackgroup' + ).annotate( + rack_count=Count('powerfeeds') + ) + table = tables.PowerPanelTable + template_name = 'dcim/powerpanel_list.html' + + +class PowerPanelCreateView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.add_powerpanel' + model = PowerPanel + model_form = forms.PowerPanelForm + default_return_url = 'dcim:powerpanel_list' + + +class PowerPanelEditView(PowerPanelCreateView): + permission_required = 'dcim.change_powerpanel' + + +class PowerPanelBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_powerpanel' + model_form = forms.PowerPanelCSVForm + table = tables.PowerPanelTable + default_return_url = 'dcim:powerpanel_list' + + +class PowerPanelBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_powerpanel' + queryset = PowerPanel.objects.select_related( + 'site', 'rack_group' + ).annotate( + rack_count=Count('powerfeeds') + ) + table = tables.PowerPanelTable + default_return_url = 'dcim:powerpanel_list' + + +# +# Power feeds +# + +class PowerFeedListView(ObjectListView): + queryset = PowerFeed.objects.select_related( + 'powerpanel', 'rack' + ) + # filter = filters.PowerFeedFilter + # filter_form = forms.PowerFeedFilterForm + table = tables.PowerFeedTable + template_name = 'dcim/powerfeed_list.html' + + +class PowerFeedView(View): + + def get(self, request, pk): + + powerfeed = get_object_or_404(PowerFeed.objects.select_related('panel', 'rack'), pk=pk) + + return render(request, 'dcim/powerfeed.html', { + 'powerfeed': powerfeed, + }) + + +class PowerFeedCreateView(PermissionRequiredMixin, ObjectEditView): + permission_required = 'dcim.add_powerfeed' + model = PowerFeed + model_form = forms.PowerFeedForm + template_name = 'dcim/powerfeed_edit.html' + default_return_url = 'dcim:powerfeed_list' + + +class PowerFeedEditView(PowerFeedCreateView): + permission_required = 'dcim.change_powerfeed' + + +class PowerFeedDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dcim.delete_powerfeed' + model = PowerFeed + default_return_url = 'dcim:powerfeed_list' + + +class PowerFeedBulkImportView(PermissionRequiredMixin, BulkImportView): + permission_required = 'dcim.add_powerfeed' + model_form = forms.PowerFeedCSVForm + table = tables.PowerFeedTable + default_return_url = 'dcim:powerfeed_list' + + +class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): + permission_required = 'dcim.change_powerfeed' + queryset = PowerFeed.objects.select_related('powerpanel', 'rack') + # filter = filters.PowerFeedFilter + table = tables.PowerFeedTable + form = forms.PowerFeedBulkEditForm + default_return_url = 'dcim:powerfeed_list' + + +class PowerFeedBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_powerfeed' + queryset = PowerFeed.objects.select_related('powerpanel', 'rack') + # filter = filters.PowerFeedFilter + table = tables.PowerFeedTable + default_return_url = 'dcim:powerfeed_list' diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html new file mode 100644 index 000000000..9dc4843f4 --- /dev/null +++ b/netbox/templates/dcim/powerfeed.html @@ -0,0 +1,111 @@ +{% extends '_base.html' %} +{% load static %} +{% load tz %} +{% load helpers %} + +{% block header %} +
+
+
    +
  1. Power Feeds
    2. +
  2. {{ powerfeed.site }}
    3. + {% if powerfeed.rackgroup %} +
  3. {{ powerfeed.rackgroup }}
    4. + {% endif %} +
  4. {{ site }}
    5. +
+
+
+
+
+ + + + +
+
+
+
+
+ {% if perms.dcim.change_powerfeed %} + + + Edit this power feed + + {% endif %} + {% if perms.dcim.delete_powerfeed %} + + + Delete this power feed + + {% endif %} +
+

{% block title %}{{ powerfeed }}{% endblock %}

+ {% include 'inc/created_updated.html' with obj=powerfeed %} +{% endblock %} + +{% block content %} +
+
+
+
+ Power Feed +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Power Panel + {{ powerfeed.powerpanel }} +
Rack + {% if powerfeed.rack %} + {{ powerfeed.rack }} + {% else %} + None + {% endif %} +
Type + {{ powerfeed.get_type_display }} +
Status + {{ powerfeed.get_status_display }} +
Supply{{ powerfeed.get_supply_display }}
Voltage{{ powerfeed.voltage }}V
Amperage{{ powerfeed.amperage }}A
Phase{{ powerfeed.get_phase_display }}
Max Utilization{{ powerfeed.max_utilization }}%
+
+
+
+
+
+{% endblock %} diff --git a/netbox/templates/dcim/powerfeed_edit.html b/netbox/templates/dcim/powerfeed_edit.html new file mode 100644 index 000000000..709112f93 --- /dev/null +++ b/netbox/templates/dcim/powerfeed_edit.html @@ -0,0 +1,45 @@ +{% extends 'utilities/obj_edit.html' %} +{% load form_helpers %} + +{% block form %} +
+
Power Feed
+
+ {% render_field form.powerpanel %} + {% render_field form.rack %} + {% render_field form.name %} + {% render_field form.type %} + {% render_field form.status %} +
+
+
+
Characteristics
+
+ {% render_field form.supply %} + {% render_field form.voltage %} + {% render_field form.amperage %} + {% render_field form.phase %} + {% render_field form.max_utilization %} +
+
+ {% if form.custom_fields %} +
+
Custom Fields
+
+ {% render_custom_fields form %} +
+
+ {% endif %} +
+
Tags
+
+ {% render_field form.tags %} +
+
+
+
Comments
+
+ {% render_field form.comments %} +
+
+{% endblock %} diff --git a/netbox/templates/dcim/powerfeed_list.html b/netbox/templates/dcim/powerfeed_list.html new file mode 100644 index 000000000..cfe2c989c --- /dev/null +++ b/netbox/templates/dcim/powerfeed_list.html @@ -0,0 +1,22 @@ +{% extends '_base.html' %} +{% load buttons %} + +{% block content %} +
+ {% if perms.dcim.add_powerfeed %} + {% add_button 'dcim:powerfeed_add' %} + {% import_button 'dcim:powerfeed_import' %} + {% endif %} + {% export_button content_type %} +
+

{% block title %}Power Feeds{% endblock %}

+
+
+ {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:powerfeed_bulk_edit' bulk_delete_url='dcim:powerfeed_bulk_delete' %} +
+
+ {% include 'inc/search_panel.html' %} + {% include 'inc/tags_panel.html' %} +
+
+{% endblock %} diff --git a/netbox/templates/dcim/powerpanel_list.html b/netbox/templates/dcim/powerpanel_list.html new file mode 100644 index 000000000..b58469c12 --- /dev/null +++ b/netbox/templates/dcim/powerpanel_list.html @@ -0,0 +1,18 @@ +{% extends '_base.html' %} +{% load buttons %} + +{% block content %} +
+ {% if perms.dcim.add_powerpanel %} + {% add_button 'dcim:powerpanel_add' %} + {% import_button 'dcim:powerpanel_import' %} + {% endif %} + {% export_button content_type %} +
+

{% block title %}Power Panels{% endblock %}

+
+
+ {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:powerpanel_bulk_delete' %} +
+
+{% endblock %} diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index 5f8f371d3..a08eb96e0 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -368,6 +368,29 @@ +
  • + +
      +
    • + {% if perms.dcim.add_powerfeed %} +
      + + +
      + {% endif %} + Power Feeds +
      • +
    • + {% if perms.dcim.add_powerpanel %} +
      + + +
      + {% endif %} + Power Panels +
      • +
    +
    • {% if request.user.is_authenticated %}
  • From 3b9c0e4c67665bf848a8a0d93784f5f56776da38 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 12 Mar 2019 10:15:56 -0400 Subject: [PATCH 02/21] Fixed up models & forms --- netbox/dcim/forms.py | 31 ++++++--- netbox/dcim/migrations/0072_powerfeeds.py | 10 +-- netbox/dcim/models.py | 16 ++--- netbox/dcim/urls.py | 2 + netbox/dcim/views.py | 19 +++++- netbox/templates/dcim/powerfeed.html | 10 +-- netbox/templates/dcim/powerfeed_edit.html | 3 +- netbox/templates/dcim/powerpanel.html | 79 +++++++++++++++++++++++ 8 files changed, 140 insertions(+), 30 deletions(-) create mode 100644 netbox/templates/dcim/powerpanel.html diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 8e429137a..6fe54cbbe 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3163,7 +3163,7 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm): # class PowerPanelForm(BootstrapMixin, forms.ModelForm): - rackgroup = ChainedModelChoiceField( + rack_group = ChainedModelChoiceField( queryset=RackGroup.objects.all(), chains=( ('site', 'site'), @@ -3177,7 +3177,7 @@ class PowerPanelForm(BootstrapMixin, forms.ModelForm): class Meta: model = PowerPanel fields = [ - 'site', 'rackgroup', 'name', + 'site', 'rack_group', 'name', ] widgets = { 'site': APISelect( @@ -3198,7 +3198,7 @@ class PowerPanelCSVForm(forms.ModelForm): 'invalid_choice': 'Site not found.', } ) - group_name = forms.CharField( + rackgroup_name = forms.CharField( help_text='Name of rack group', required=False ) @@ -3213,6 +3213,17 @@ class PowerPanelCSVForm(forms.ModelForm): # class PowerFeedForm(BootstrapMixin, CustomFieldForm): + site = ChainedModelChoiceField( + queryset=Site.objects.all(), + required=False, + widget=APISelect( + api_url='/api/dcim/sites/', + filter_for={ + 'power_panel': 'site_id', + 'rack': 'site_id', + } + ) + ) tags = TagField( required=False ) @@ -3220,15 +3231,15 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): class Meta: model = PowerFeed fields = [ - 'powerpanel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', - 'comments', 'tags', + 'site', 'power_panel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', + 'max_utilization', 'comments', 'tags', ] widgets = { - 'site': APISelect( - api_url="/api/dcim/sites/", - filter_for={ - 'rackgroup': 'site_id', - } + 'power_panel': APISelect( + api_url="/api/dcim/power-panels/" + ), + 'rack': APISelect( + api_url="/api/dcim/racks/" ), 'type': StaticSelect2(), 'status': StaticSelect2(), diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index ddfbb8ec1..57b86ff40 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-03-12 02:29 +# Generated by Django 2.1.7 on 2019-03-12 14:08 import django.core.validators from django.db import migrations, models @@ -31,7 +31,7 @@ class Migration(migrations.Migration): ('comments', models.TextField(blank=True)), ], options={ - 'ordering': ['powerpanel', 'name'], + 'ordering': ['power_panel', 'name'], }, ), migrations.CreateModel( @@ -41,7 +41,7 @@ class Migration(migrations.Migration): ('created', models.DateField(auto_now_add=True, null=True)), ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('name', models.CharField(max_length=50)), - ('rackgroup', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.RackGroup')), + ('rack_group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.RackGroup')), ('site', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='dcim.Site')), ], options={ @@ -50,7 +50,7 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='powerfeed', - name='powerpanel', + name='power_panel', field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='powerfeeds', to='dcim.PowerPanel'), ), migrations.AddField( @@ -69,6 +69,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='powerfeed', - unique_together={('powerpanel', 'name')}, + unique_together={('power_panel', 'name')}, ), ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index ad7e198fb..13efa6b8e 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2682,7 +2682,7 @@ class PowerPanel(ChangeLoggedModel): to='Site', on_delete=models.PROTECT ) - rackgroup = models.ForeignKey( + rack_group = models.ForeignKey( to='RackGroup', on_delete=models.PROTECT, blank=True, @@ -2692,7 +2692,7 @@ class PowerPanel(ChangeLoggedModel): max_length=50 ) - csv_headers = ['site', 'rackgroup', 'name'] + csv_headers = ['site', 'rack_group', 'name'] class Meta: ordering = ['site', 'name'] @@ -2707,7 +2707,7 @@ class PowerPanel(ChangeLoggedModel): def to_csv(self): return ( self.site.name, - self.rackgroup.name if self.rackgroup else None, + self.rack_group.name if self.rack_group else None, self.name, ) @@ -2716,7 +2716,7 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): """ An electrical circuit delivered from a PowerPanel. """ - powerpanel = models.ForeignKey( + power_panel = models.ForeignKey( to='PowerPanel', on_delete=models.PROTECT, related_name='powerfeeds' @@ -2771,13 +2771,13 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): tags = TaggableManager(through=TaggedItem) csv_headers = [ - 'powerpanel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', + 'power_panel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', 'comments', ] class Meta: - ordering = ['powerpanel', 'name'] - unique_together = ['powerpanel', 'name'] + ordering = ['power_panel', 'name'] + unique_together = ['power_panel', 'name'] def __str__(self): return self.name @@ -2787,7 +2787,7 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): def to_csv(self): return ( - self.powerpanel.name, + self.power_panel.name, self.rack.name if self.rack else None, self.name, self.get_type_display(), diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index a087a0ae9..f6ed55ff3 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -285,7 +285,9 @@ urlpatterns = [ url(r'^power-panels/add/$', views.PowerPanelCreateView.as_view(), name='powerpanel_add'), url(r'^power-panels/import/$', views.PowerPanelBulkImportView.as_view(), name='powerpanel_import'), url(r'^power-panels/delete/$', views.PowerPanelBulkDeleteView.as_view(), name='powerpanel_bulk_delete'), + url(r'^power-panels/(?P\d+)/$', views.PowerPanelView.as_view(), name='powerpanel'), url(r'^power-panels/(?P\d+)/edit/$', views.PowerPanelEditView.as_view(), name='powerpanel_edit'), + url(r'^power-panels/(?P\d+)/delete/$', views.PowerPanelDeleteView.as_view(), name='powerpanel_delete'), url(r'^power-panels/(?P\d+)/changelog/$', ObjectChangeLogView.as_view(), name='powerpanel_changelog', kwargs={'model': PowerPanel}), # Racks diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 958975e16..6c1518fe3 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2131,6 +2131,17 @@ class PowerPanelListView(ObjectListView): template_name = 'dcim/powerpanel_list.html' +class PowerPanelView(View): + + def get(self, request, pk): + + powerpanel = get_object_or_404(PowerPanel.objects.select_related('site', 'rack_group'), pk=pk) + + return render(request, 'dcim/powerpanel.html', { + 'powerpanel': powerpanel, + }) + + class PowerPanelCreateView(PermissionRequiredMixin, ObjectEditView): permission_required = 'dcim.add_powerpanel' model = PowerPanel @@ -2142,6 +2153,12 @@ class PowerPanelEditView(PowerPanelCreateView): permission_required = 'dcim.change_powerpanel' +class PowerPanelDeleteView(PermissionRequiredMixin, ObjectDeleteView): + permission_required = 'dcim.delete_powerpanel' + model = PowerPanel + default_return_url = 'dcim:powerpanel_list' + + class PowerPanelBulkImportView(PermissionRequiredMixin, BulkImportView): permission_required = 'dcim.add_powerpanel' model_form = forms.PowerPanelCSVForm @@ -2178,7 +2195,7 @@ class PowerFeedView(View): def get(self, request, pk): - powerfeed = get_object_or_404(PowerFeed.objects.select_related('panel', 'rack'), pk=pk) + powerfeed = get_object_or_404(PowerFeed.objects.select_related('power_panel', 'rack'), pk=pk) return render(request, 'dcim/powerfeed.html', { 'powerfeed': powerfeed, diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 9dc4843f4..91d08aa12 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -8,11 +8,11 @@
    1. Power Feeds
      2. -
    2. {{ powerfeed.site }}
      3. - {% if powerfeed.rackgroup %} -
    3. {{ powerfeed.rackgroup }}
      4. +
    4. {{ powerfeed.power_panel }}
      5. + {% if powerfeed.rack %} +
    5. {{ powerfeed.rack }}
      6. {% endif %} -
    6. {{ site }}
      7. +
    7. {{ powerfeed }}
    @@ -57,7 +57,7 @@ Power Panel - {{ powerfeed.powerpanel }} + {{ powerfeed.power_panel }} diff --git a/netbox/templates/dcim/powerfeed_edit.html b/netbox/templates/dcim/powerfeed_edit.html index 709112f93..df34746f8 100644 --- a/netbox/templates/dcim/powerfeed_edit.html +++ b/netbox/templates/dcim/powerfeed_edit.html @@ -5,7 +5,8 @@
    Power Feed
    - {% render_field form.powerpanel %} + {% render_field form.site %} + {% render_field form.power_panel %} {% render_field form.rack %} {% render_field form.name %} {% render_field form.type %} diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html new file mode 100644 index 000000000..b023321c3 --- /dev/null +++ b/netbox/templates/dcim/powerpanel.html @@ -0,0 +1,79 @@ +{% extends '_base.html' %} +{% load static %} +{% load tz %} +{% load helpers %} + +{% block header %} +
    +
    +
      +
    1. Power Panels
      2. +
    2. {{ powerpanel.site }}
      3. + {% if powerpanel.rack_group %} +
    3. {{ powerpanel.rack_group }}
      4. + {% endif %} +
    4. {{ powerpanel }}
      5. +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + {% if perms.dcim.change_powerpanel %} + + + Edit this power panel + + {% endif %} + {% if perms.dcim.delete_powerpanel %} + + + Delete this power panel + + {% endif %} +
    +

    {% block title %}{{ powerpanel }}{% endblock %}

    + {% include 'inc/created_updated.html' with obj=powerpanel %} +{% endblock %} + +{% block content %} +
    +
    +
    +
    + Power Panel +
    + + + + + + + + + +
    Site + {{ powerpanel.site }} +
    Rack Group + {% if powerpanel.rack_group %} + {{ powerpanel.rack_group }} + {% else %} + None + {% endif %} +
    +
    +
    +
    +
    +
    +{% endblock %} From e06dece00c148a0a397662f9dbaf36d33616172e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 12 Mar 2019 11:36:29 -0400 Subject: [PATCH 03/21] More power work --- netbox/dcim/api/nested_serializers.py | 26 +++++- netbox/dcim/api/serializers.py | 58 ++++++++++++- netbox/dcim/api/urls.py | 4 + netbox/dcim/api/views.py | 25 +++++- netbox/dcim/constants.py | 4 +- netbox/dcim/forms.py | 36 ++++----- netbox/dcim/models.py | 28 ++++--- netbox/dcim/tables.py | 27 +++---- netbox/dcim/views.py | 12 +-- netbox/templates/dcim/powerfeed_edit.html | 2 +- netbox/templates/dcim/rack.html | 99 +++++++++++++++-------- 11 files changed, 230 insertions(+), 91 deletions(-) diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py index e53259e94..edb1bb267 100644 --- a/netbox/dcim/api/nested_serializers.py +++ b/netbox/dcim/api/nested_serializers.py @@ -3,8 +3,8 @@ from rest_framework import serializers from dcim.constants import CONNECTION_STATUS_CHOICES from dcim.models import ( Cable, ConsolePort, ConsoleServerPort, Device, DeviceBay, DeviceType, DeviceRole, FrontPort, FrontPortTemplate, - Interface, Manufacturer, Platform, PowerOutlet, PowerPort, Rack, RackGroup, RackRole, RearPort, RearPortTemplate, - Region, Site, VirtualChassis, + Interface, Manufacturer, Platform, PowerFeed, PowerOutlet, PowerPanel, PowerPort, Rack, RackGroup, RackRole, + RearPort, RearPortTemplate, Region, Site, VirtualChassis, ) from utilities.api import ChoiceField, WritableNestedSerializer @@ -21,7 +21,9 @@ __all__ = [ 'NestedInterfaceSerializer', 'NestedManufacturerSerializer', 'NestedPlatformSerializer', + 'NestedPowerFeedSerializer', 'NestedPowerOutletSerializer', + 'NestedPowerPanelSerializer', 'NestedPowerPortSerializer', 'NestedRackGroupSerializer', 'NestedRackRoleSerializer', @@ -247,3 +249,23 @@ class NestedVirtualChassisSerializer(WritableNestedSerializer): class Meta: model = VirtualChassis fields = ['id', 'url', 'master'] + + +# +# Power panels/feeds +# + +class NestedPowerPanelSerializer(serializers.ModelSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerpanel-detail') + + class Meta: + model = PowerPanel + fields = ['id', 'url', 'name'] + + +class NestedPowerFeedSerializer(serializers.ModelSerializer): + url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerfeed-detail') + + class Meta: + model = PowerFeed + fields = ['id', 'url', 'name'] diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index d18c59be5..cbd0f7cb5 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -7,8 +7,9 @@ from dcim.constants import * from dcim.models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceType, DeviceRole, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + Manufacturer, InventoryItem, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) from extras.api.customfields import CustomFieldModelSerializer from ipam.api.nested_serializers import NestedIPAddressSerializer, NestedVLANSerializer @@ -587,3 +588,56 @@ class VirtualChassisSerializer(TaggitSerializer, ValidatedModelSerializer): class Meta: model = VirtualChassis fields = ['id', 'master', 'domain', 'tags'] + + +# +# Power panels +# + + +class PowerPanelSerializer(ValidatedModelSerializer): + site = NestedSiteSerializer() + rack_group = NestedRackGroupSerializer( + required=False, + allow_null=True, + default=None + ) + + class Meta: + model = PowerPanel + fields = ['id', 'site', 'rack_group', 'name'] + + +class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer): + power_panel = NestedPowerPanelSerializer() + rack = NestedRackSerializer( + required=False, + allow_null=True, + default=None + ) + type = ChoiceField( + choices=POWERFEED_TYPE_CHOICES, + default=POWERFEED_TYPE_PRIMARY + ) + status = ChoiceField( + choices=POWERFEED_STATUS_CHOICES, + default=POWERFEED_STATUS_ACTIVE + ) + supply = ChoiceField( + choices=POWERFEED_SUPPLY_CHOICES, + default=POWERFEED_SUPPLY_AC + ) + phase = ChoiceField( + choices=POWERFEED_PHASE_CHOICES, + default=POWERFEED_PHASE_SINGLE + ) + tags = TagListSerializerField( + required=False + ) + + class Meta: + model = PowerFeed + fields = [ + 'id', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', + 'max_utilization', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + ] diff --git a/netbox/dcim/api/urls.py b/netbox/dcim/api/urls.py index 006a61bad..fd55d9b05 100644 --- a/netbox/dcim/api/urls.py +++ b/netbox/dcim/api/urls.py @@ -68,6 +68,10 @@ router.register(r'cables', views.CableViewSet) # Virtual chassis router.register(r'virtual-chassis', views.VirtualChassisViewSet) +# Power +router.register(r'power-panels', views.PowerPanelViewSet) +router.register(r'power-feeds', views.PowerFeedViewSet) + # Miscellaneous router.register(r'connected-device', views.ConnectedDeviceViewSet, basename='connected-device') diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index bcb53c090..4f5edbee8 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -16,8 +16,9 @@ from dcim import filters from dcim.models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - Manufacturer, InventoryItem, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + Manufacturer, InventoryItem, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) from extras.api.serializers import RenderedGraphSerializer from extras.api.views import CustomFieldModelViewSet @@ -534,6 +535,26 @@ class VirtualChassisViewSet(ModelViewSet): serializer_class = serializers.VirtualChassisSerializer +# +# Power panels +# + +class PowerPanelViewSet(ModelViewSet): + queryset = PowerPanel.objects.all() + serializer_class = serializers.PowerPanelSerializer + # filterset_class = filters.PowerPanelFilter + + +# +# Power feeds +# + +class PowerFeedViewSet(ModelViewSet): + queryset = PowerFeed.objects.all() + serializer_class = serializers.PowerFeedSerializer + # filterset_class = filters.PowerFeedFilter + + # # Miscellaneous # diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index e68493af6..0783b8648 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -448,8 +448,8 @@ RACK_DIMENSION_UNIT_CHOICES = ( POWERFEED_TYPE_PRIMARY = 1 POWERFEED_TYPE_REDUNDANT = 2 POWERFEED_TYPE_CHOICES = ( - (POWERFEED_TYPE_PRIMARY, 'AC'), - (POWERFEED_TYPE_REDUNDANT, 'DC'), + (POWERFEED_TYPE_PRIMARY, 'Primary'), + (POWERFEED_TYPE_REDUNDANT, 'Redundant'), ) POWERFEED_SUPPLY_AC = 1 POWERFEED_SUPPLY_DC = 2 diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 6fe54cbbe..7f0a3265c 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3183,7 +3183,7 @@ class PowerPanelForm(BootstrapMixin, forms.ModelForm): 'site': APISelect( api_url="/api/dcim/sites/", filter_for={ - 'rackgroup': 'site_id', + 'rack_group': 'site_id', } ), } @@ -3231,7 +3231,7 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): class Meta: model = PowerFeed fields = [ - 'site', 'power_panel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', + 'site', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization', 'comments', 'tags', ] widgets = { @@ -3241,24 +3241,24 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): 'rack': APISelect( api_url="/api/dcim/racks/" ), - 'type': StaticSelect2(), 'status': StaticSelect2(), + 'type': StaticSelect2(), 'supply': StaticSelect2(), 'phase': StaticSelect2(), } class PowerFeedCSVForm(forms.ModelForm): - type = CSVChoiceField( - choices=POWERFEED_TYPE_CHOICES, - required=False, - help_text='Primary or redundant' - ) status = CSVChoiceField( choices=POWERFEED_STATUS_CHOICES, required=False, help_text='Operational status' ) + type = CSVChoiceField( + choices=POWERFEED_TYPE_CHOICES, + required=False, + help_text='Primary or redundant' + ) supply = CSVChoiceField( choices=POWERFEED_SUPPLY_CHOICES, required=False, @@ -3292,14 +3292,14 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd api_url="/api/dcim/rack-groups", ) ) - type = forms.ChoiceField( - choices=add_blank_choice(POWERFEED_TYPE_CHOICES), + status = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_STATUS_CHOICES), required=False, initial='', widget=StaticSelect2() ) - status = forms.ChoiceField( - choices=add_blank_choice(POWERFEED_STATUS_CHOICES), + type = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_TYPE_CHOICES), required=False, initial='', widget=StaticSelect2() @@ -3310,18 +3310,18 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd initial='', widget=StaticSelect2() ) - voltage = forms.IntegerField( - required=False - ) - amperage = forms.IntegerField( - required=False - ) phase = forms.ChoiceField( choices=add_blank_choice(POWERFEED_PHASE_CHOICES), required=False, initial='', widget=StaticSelect2() ) + voltage = forms.IntegerField( + required=False + ) + amperage = forms.IntegerField( + required=False + ) max_utilization = forms.IntegerField( required=False ) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 13efa6b8e..021d4e1a1 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2730,18 +2730,22 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): name = models.CharField( max_length=50 ) - type = models.PositiveSmallIntegerField( - choices=POWERFEED_TYPE_CHOICES, - default=POWERFEED_TYPE_PRIMARY - ) status = models.PositiveSmallIntegerField( choices=POWERFEED_STATUS_CHOICES, default=POWERFEED_STATUS_ACTIVE ) + type = models.PositiveSmallIntegerField( + choices=POWERFEED_TYPE_CHOICES, + default=POWERFEED_TYPE_PRIMARY + ) supply = models.PositiveSmallIntegerField( choices=POWERFEED_SUPPLY_CHOICES, default=POWERFEED_SUPPLY_AC ) + phase = models.PositiveSmallIntegerField( + choices=POWERFEED_PHASE_CHOICES, + default=POWERFEED_PHASE_SINGLE + ) voltage = models.PositiveSmallIntegerField( validators=[MinValueValidator(1)], default=120 @@ -2750,10 +2754,6 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): validators=[MinValueValidator(1)], default=20 ) - phase = models.PositiveSmallIntegerField( - choices=POWERFEED_PHASE_CHOICES, - default=POWERFEED_PHASE_SINGLE - ) max_utilization = models.PositiveSmallIntegerField( validators=[MinValueValidator(1), MaxValueValidator(100)], default=80, @@ -2771,7 +2771,7 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): tags = TaggableManager(through=TaggedItem) csv_headers = [ - 'power_panel', 'rack', 'name', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase', 'max_utilization', + 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization', 'comments', ] @@ -2790,12 +2790,18 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): self.power_panel.name, self.rack.name if self.rack else None, self.name, - self.get_type_display(), self.get_status_display(), + self.get_type_display(), self.get_supply_display(), + self.get_phase_display(), self.voltage, self.amperage, - self.get_phase_display(), self.max_utilization, self.comments, ) + + def get_type_class(self): + return STATUS_CLASSES[self.type] + + def get_status_class(self): + return STATUS_CLASSES[self.status] diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 8106d997a..532ee96c1 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -145,6 +145,10 @@ STATUS_LABEL = """ {{ record.get_status_display }} """ +TYPE_LABEL = """ +{{ record.get_type_display }} +""" + DEVICE_PRIMARY_IP = """ {{ record.primary_ip6.address.ip|default:"" }} {% if record.primary_ip6 and record.primary_ip4 %}
    {% endif %} @@ -799,17 +803,10 @@ class PowerPanelTable(BaseTable): powerfeed_count = tables.Column( verbose_name='Feeds' ) - actions = tables.TemplateColumn( - template_code=RACKROLE_ACTIONS, - attrs={ - 'td': {'class': 'text-right noprint'} - }, - verbose_name='' - ) class Meta(BaseTable.Meta): model = PowerPanel - fields = ('pk', 'name', 'site', 'rackgroup', 'powerfeed_count', 'actions') + fields = ('pk', 'name', 'site', 'rack_group', 'powerfeed_count') # @@ -819,16 +816,18 @@ class PowerPanelTable(BaseTable): class PowerFeedTable(BaseTable): pk = ToggleColumn() name = tables.LinkColumn() - powerpanel = tables.LinkColumn( + power_panel = tables.LinkColumn( viewname='dcim:powerpanel', - args=[Accessor('powerpanel.pk')], + args=[Accessor('power_panel.pk')], ) - rack = tables.LinkColumn( - viewname='dcim:rack', - accessor=Accessor('rack.pk') + status = tables.TemplateColumn( + template_code=STATUS_LABEL + ) + type = tables.TemplateColumn( + template_code=TYPE_LABEL ) class Meta(BaseTable.Meta): model = PowerFeed - fields = ('pk', 'name', 'powerpanel', 'rack', 'type', 'status', 'supply', 'voltage', 'amperage', 'phase') + fields = ('pk', 'name', 'power_panel', 'rack', 'status', 'type', 'supply', 'voltage', 'amperage', 'phase') diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 6c1518fe3..a97ef576b 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -392,10 +392,12 @@ class RackView(View): prev_rack = Rack.objects.filter(site=rack.site, name__lt=rack.name).order_by('-name').first() reservations = RackReservation.objects.filter(rack=rack) + power_feeds = PowerFeed.objects.filter(rack=rack).select_related('power_panel') return render(request, 'dcim/rack.html', { 'rack': rack, 'reservations': reservations, + 'power_feeds': power_feeds, 'nonracked_devices': nonracked_devices, 'next_rack': next_rack, 'prev_rack': prev_rack, @@ -2123,9 +2125,9 @@ class VirtualChassisRemoveMemberView(PermissionRequiredMixin, GetReturnURLMixin, class PowerPanelListView(ObjectListView): queryset = PowerPanel.objects.select_related( - 'site', 'rackgroup' + 'site', 'rack_group' ).annotate( - rack_count=Count('powerfeeds') + powerfeed_count=Count('powerfeeds') ) table = tables.PowerPanelTable template_name = 'dcim/powerpanel_list.html' @@ -2183,7 +2185,7 @@ class PowerPanelBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class PowerFeedListView(ObjectListView): queryset = PowerFeed.objects.select_related( - 'powerpanel', 'rack' + 'power_panel', 'rack' ) # filter = filters.PowerFeedFilter # filter_form = forms.PowerFeedFilterForm @@ -2229,7 +2231,7 @@ class PowerFeedBulkImportView(PermissionRequiredMixin, BulkImportView): class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_powerfeed' - queryset = PowerFeed.objects.select_related('powerpanel', 'rack') + queryset = PowerFeed.objects.select_related('power_panel', 'rack') # filter = filters.PowerFeedFilter table = tables.PowerFeedTable form = forms.PowerFeedBulkEditForm @@ -2238,7 +2240,7 @@ class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): class PowerFeedBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_powerfeed' - queryset = PowerFeed.objects.select_related('powerpanel', 'rack') + queryset = PowerFeed.objects.select_related('power_panel', 'rack') # filter = filters.PowerFeedFilter table = tables.PowerFeedTable default_return_url = 'dcim:powerfeed_list' diff --git a/netbox/templates/dcim/powerfeed_edit.html b/netbox/templates/dcim/powerfeed_edit.html index df34746f8..f4b3ada46 100644 --- a/netbox/templates/dcim/powerfeed_edit.html +++ b/netbox/templates/dcim/powerfeed_edit.html @@ -9,13 +9,13 @@ {% render_field form.power_panel %} {% render_field form.rack %} {% render_field form.name %} - {% render_field form.type %} {% render_field form.status %}
    Characteristics
    + {% render_field form.type %} {% render_field form.supply %} {% render_field form.voltage %} {% render_field form.amperage %} diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 68ea75b6c..2a142ae6c 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -190,47 +190,37 @@ {% endif %}
    -
    -
    - Non-Racked Devices -
    - {% if nonracked_devices %} - + {% if power_feeds %} +
    +
    + Power Feeds +
    +
    - - + + + - - {% for device in nonracked_devices %} - + {% for powerfeed in power_feeds %} + - - + {% endfor %}
    NameRolePanelFeedStatus TypeParent
    - {{ device }} + {{ powerfeed.power_panel.name }} + + + {{ powerfeed.name }} {{ device.device_role }}{{ device.device_type.display_name }} - {% if device.parent_bay %} - {{ device.parent_bay }} - {% else %} - — - {% endif %} + {{ powerfeed.get_status_display }} + + {{ powerfeed.get_type_display }}
    - {% else %} -
    None
    - {% endif %} - {% if perms.dcim.add_device %} -
    - - - Add a non-racked device - -
    - {% endif %} -
    +
    + {% endif %}
    Images @@ -307,11 +297,52 @@ {% include 'dcim/inc/rack_elevation.html' with primary_face=front_elevation secondary_face=rear_elevation face_id=0 reserved_units=rack.get_reserved_units %}
    -
    +

    Rear

    -
    - {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 reserved_units=rack.get_reserved_units %} +
    + {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 reserved_units=rack.get_reserved_units %}
    +
    +
    + Non-Racked Devices +
    + {% if nonracked_devices %} + + + + + + + + {% for device in nonracked_devices %} + + + + + + + {% endfor %} +
    NameRoleTypeParent
    + {{ device }} + {{ device.device_role }}{{ device.device_type.display_name }} + {% if device.parent_bay %} + {{ device.parent_bay }} + {% else %} + — + {% endif %} +
    + {% else %} +
    None
    + {% endif %} + {% if perms.dcim.add_device %} +
    + + + Add a non-racked device + +
    + {% endif %} +
    {% endblock %} From 705f82e416c7071d15d08c61ee075744ec485417 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 12 Mar 2019 12:05:58 -0400 Subject: [PATCH 04/21] Added filters for power panels & feeds --- netbox/dcim/api/views.py | 4 +- netbox/dcim/filters.py | 87 +++++++++++++++++++++- netbox/dcim/forms.py | 76 +++++++++++++++++++ netbox/dcim/views.py | 11 ++- netbox/templates/dcim/powerpanel_list.html | 5 +- 5 files changed, 172 insertions(+), 11 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 4f5edbee8..1c4ec7838 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -542,7 +542,7 @@ class VirtualChassisViewSet(ModelViewSet): class PowerPanelViewSet(ModelViewSet): queryset = PowerPanel.objects.all() serializer_class = serializers.PowerPanelSerializer - # filterset_class = filters.PowerPanelFilter + filterset_class = filters.PowerPanelFilter # @@ -552,7 +552,7 @@ class PowerPanelViewSet(ModelViewSet): class PowerFeedViewSet(ModelViewSet): queryset = PowerFeed.objects.all() serializer_class = serializers.PowerFeedSerializer - # filterset_class = filters.PowerFeedFilter + filterset_class = filters.PowerFeedFilter # diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 2e303e325..c4db4ef83 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -15,8 +15,9 @@ from .constants import * from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, - InventoryItem, Manufacturer, Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, Rack, - RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, VirtualChassis, + InventoryItem, Manufacturer, Platform, PowerFeed, PowerOutlet, PowerOutletTemplate, PowerPanel, PowerPort, + PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site, + VirtualChassis, ) @@ -37,7 +38,7 @@ class RegionFilter(NameSlugSearchFilterSet): fields = ['name', 'slug'] -class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): +class SiteFilter(CustomFieldFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -122,7 +123,7 @@ class RackRoleFilter(NameSlugSearchFilterSet): fields = ['name', 'slug', 'color'] -class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): +class RackFilter(CustomFieldFilterSet): id__in = NumericInFilter( field_name='id', lookup_expr='in' @@ -1065,3 +1066,81 @@ class InterfaceConnectionFilter(django_filters.FilterSet): Q(device__name__icontains=value) | Q(_connected_interface__device__name__icontains=value) ) + + +class PowerPanelFilter(django_filters.FilterSet): + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) + q = django_filters.CharFilter( + method='search', + label='Search', + ) + site_id = django_filters.ModelMultipleChoiceFilter( + queryset=Site.objects.all(), + label='Site (ID)', + ) + site = django_filters.ModelMultipleChoiceFilter( + field_name='site__slug', + queryset=Site.objects.all(), + to_field_name='slug', + label='Site name (slug)', + ) + rack_group_id = django_filters.ModelMultipleChoiceFilter( + field_name='rack_group', + queryset=RackGroup.objects.all(), + label='Rack group (ID)', + ) + + class Meta: + model = PowerPanel + fields = ['name'] + + def search(self, queryset, name, value): + if not value.strip(): + return queryset + qs_filter = ( + Q(name__icontains=value) + ) + return queryset.filter(qs_filter) + + +class PowerFeedFilter(CustomFieldFilterSet): + id__in = NumericInFilter( + field_name='id', + lookup_expr='in' + ) + q = django_filters.CharFilter( + method='search', + label='Search', + ) + site_id = django_filters.ModelMultipleChoiceFilter( + field_name='power_panel__site', + queryset=Site.objects.all(), + label='Site (ID)', + ) + site = django_filters.ModelMultipleChoiceFilter( + field_name='power_panel__site__slug', + queryset=Site.objects.all(), + to_field_name='slug', + label='Site name (slug)', + ) + rack_id = django_filters.ModelMultipleChoiceFilter( + field_name='rack', + queryset=Rack.objects.all(), + label='Rack (ID)', + ) + + class Meta: + model = PowerFeed + fields = ['name', 'status', 'type', 'supply', 'phase'] + + def search(self, queryset, name, value): + if not value.strip(): + return queryset + qs_filter = ( + Q(name__icontains=value) | + Q(comments__icontains=value) + ) + return queryset.filter(qs_filter) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 7f0a3265c..fd37f2839 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3208,6 +3208,34 @@ class PowerPanelCSVForm(forms.ModelForm): fields = PowerPanel.csv_headers +class PowerPanelFilterForm(BootstrapMixin, CustomFieldFilterForm): + model = PowerPanel + q = forms.CharField( + required=False, + label='Search' + ) + site = FilterChoiceField( + queryset=Site.objects.all(), + to_field_name='slug', + widget=APISelectMultiple( + api_url="/api/dcim/sites/", + value_field="slug", + filter_for={ + 'rack_id': 'site', + } + ) + ) + rack_group_id = FilterChoiceField( + queryset=RackGroup.objects.all(), + label='Rack group (ID)', + null_label='-- None --', + widget=APISelectMultiple( + api_url="/api/dcim/rack-groups/", + null_option=True, + ) + ) + + # # Power feeds # @@ -3333,3 +3361,51 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd nullable_fields = [ 'rackgroup', 'comments', ] + + +class PowerFeedFilterForm(BootstrapMixin, CustomFieldFilterForm): + model = PowerFeed + q = forms.CharField( + required=False, + label='Search' + ) + site = FilterChoiceField( + queryset=Site.objects.all(), + to_field_name='slug', + widget=APISelectMultiple( + api_url="/api/dcim/sites/", + value_field="slug", + filter_for={ + 'rack_id': 'site', + } + ) + ) + rack_id = FilterChoiceField( + queryset=Rack.objects.all(), + label='Rack', + null_label='-- None --', + widget=APISelectMultiple( + api_url="/api/dcim/racks/", + null_option=True, + ) + ) + status = forms.MultipleChoiceField( + choices=POWERFEED_STATUS_CHOICES, + required=False, + widget=StaticSelect2Multiple() + ) + type = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_TYPE_CHOICES), + required=False, + widget=StaticSelect2() + ) + supply = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_SUPPLY_CHOICES), + required=False, + widget=StaticSelect2() + ) + phase = forms.ChoiceField( + choices=add_blank_choice(POWERFEED_PHASE_CHOICES), + required=False, + widget=StaticSelect2() + ) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index a97ef576b..a8629245f 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2129,6 +2129,8 @@ class PowerPanelListView(ObjectListView): ).annotate( powerfeed_count=Count('powerfeeds') ) + filter = filters.PowerPanelFilter + filter_form = forms.PowerPanelFilterForm table = tables.PowerPanelTable template_name = 'dcim/powerpanel_list.html' @@ -2175,6 +2177,7 @@ class PowerPanelBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): ).annotate( rack_count=Count('powerfeeds') ) + filter = filters.PowerPanelFilter table = tables.PowerPanelTable default_return_url = 'dcim:powerpanel_list' @@ -2187,8 +2190,8 @@ class PowerFeedListView(ObjectListView): queryset = PowerFeed.objects.select_related( 'power_panel', 'rack' ) - # filter = filters.PowerFeedFilter - # filter_form = forms.PowerFeedFilterForm + filter = filters.PowerFeedFilter + filter_form = forms.PowerFeedFilterForm table = tables.PowerFeedTable template_name = 'dcim/powerfeed_list.html' @@ -2232,7 +2235,7 @@ class PowerFeedBulkImportView(PermissionRequiredMixin, BulkImportView): class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.change_powerfeed' queryset = PowerFeed.objects.select_related('power_panel', 'rack') - # filter = filters.PowerFeedFilter + filter = filters.PowerFeedFilter table = tables.PowerFeedTable form = forms.PowerFeedBulkEditForm default_return_url = 'dcim:powerfeed_list' @@ -2241,6 +2244,6 @@ class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView): class PowerFeedBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_powerfeed' queryset = PowerFeed.objects.select_related('power_panel', 'rack') - # filter = filters.PowerFeedFilter + filter = filters.PowerFeedFilter table = tables.PowerFeedTable default_return_url = 'dcim:powerfeed_list' diff --git a/netbox/templates/dcim/powerpanel_list.html b/netbox/templates/dcim/powerpanel_list.html index b58469c12..a0d49b30b 100644 --- a/netbox/templates/dcim/powerpanel_list.html +++ b/netbox/templates/dcim/powerpanel_list.html @@ -11,8 +11,11 @@

    {% block title %}Power Panels{% endblock %}

    -
    +
    {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:powerpanel_bulk_delete' %}
    +
    + {% include 'inc/search_panel.html' %} +
    {% endblock %} From 681e20133a8aacf1a764c28ec1b3235eb806e04d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 21 Mar 2019 17:47:43 -0400 Subject: [PATCH 05/21] Further work on power feed modeling --- netbox/dcim/api/views.py | 2 +- netbox/dcim/constants.py | 2 +- netbox/dcim/forms.py | 101 +++++++++++++++++++++- netbox/dcim/migrations/0072_powerfeeds.py | 27 +++++- netbox/dcim/models.py | 52 ++++++++++- netbox/dcim/views.py | 84 +++++++++++++++--- netbox/extras/models.py | 2 +- netbox/netbox/views.py | 2 +- netbox/templates/dcim/cable_connect.html | 43 +++++---- netbox/templates/dcim/inc/powerport.html | 6 +- 10 files changed, 282 insertions(+), 39 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 1c4ec7838..c1026dec7 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -496,7 +496,7 @@ class PowerConnectionViewSet(ListModelMixin, GenericViewSet): queryset = PowerPort.objects.select_related( 'device', 'connected_endpoint__device' ).filter( - connected_endpoint__isnull=False + _connected_poweroutlet__isnull=False ) serializer_class = serializers.PowerPortSerializer filterset_class = filters.PowerConnectionFilter diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index 0783b8648..c52806fe3 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -420,7 +420,7 @@ CABLE_TERMINATION_TYPE_CHOICES = { COMPATIBLE_TERMINATION_TYPES = { 'consoleport': ['consoleserverport', 'frontport', 'rearport'], 'consoleserverport': ['consoleport', 'frontport', 'rearport'], - 'powerport': ['poweroutlet'], + 'powerport': ['poweroutlet', 'powerfeed'], 'poweroutlet': ['powerport'], 'interface': ['interface', 'circuittermination', 'frontport', 'rearport'], 'frontport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport', 'circuittermination'], diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index fd37f2839..6abde2fc6 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -10,6 +10,7 @@ from mptt.forms import TreeNodeChoiceField from taggit.forms import TagField from timezone_field import TimeZoneFormField +from circuits.models import Circuit, CircuitTermination, Provider from extras.forms import AddRemoveTagsForm, CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm from ipam.models import IPAddress, VLAN, VLANGroup from tenancy.forms import TenancyForm @@ -2521,7 +2522,7 @@ class RearPortBulkDisconnectForm(ConfirmationForm): # Cables # -class CableCreateForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): +class ConnectCableToDeviceForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): termination_b_site = forms.ModelChoiceField( queryset=Site.objects.all(), label='Site', @@ -2602,6 +2603,104 @@ class CableCreateForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): ) +class ConnectCableToCircuitForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): + termination_b_provider = forms.ModelChoiceField( + queryset=Provider.objects.all(), + label='Provider', + widget=APISelect( + api_url='/api/circuits/providers/', + filter_for={ + 'termination_b_circuit': 'provider_id', + } + ) + ) + termination_b_circuit = ChainedModelChoiceField( + queryset=Circuit.objects.all(), + chains=( + ('provider', 'termination_b_provider'), + ), + label='Circuit', + widget=APISelect( + api_url='/api/circuits/circuits/', + display_field='cid', + filter_for={ + 'termination_b_id': 'circuit_id', + } + ) + ) + termination_b_id = forms.IntegerField( + label='Termination', + widget=APISelect( + api_url='/api/circuits/circuit-terminations/', + disabled_indicator='cable' + ) + ) + + class Meta: + model = Cable + fields = [ + 'termination_b_provider', 'termination_b_circuit', 'termination_b_id', 'type', 'status', 'label', 'color', + 'length', 'length_unit', + ] + + +class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): + termination_b_site = forms.ModelChoiceField( + queryset=Site.objects.all(), + label='Site', + widget=APISelect( + api_url='/api/dcim/sites/', + display_field='cid', + filter_for={ + 'termination_b_rackgroup': 'site_id', + 'termination_b_powerpanel': 'site_id', + } + ) + ) + termination_b_rackgroup = ChainedModelChoiceField( + queryset=RackGroup.objects.all(), + label='Rack Group', + chains=( + ('site', 'termination_b_site'), + ), + required=False, + widget=APISelect( + api_url='/api/dcim/rack-groups/', + display_field='cid', + filter_for={ + 'termination_b_powerpanel': 'rackgroup_id', + } + ) + ) + termination_b_powerpanel = ChainedModelChoiceField( + queryset=PowerPanel.objects.all(), + chains=( + ('site', 'termination_b_site'), + ('rack_group', 'termination_b_rackgroup'), + ), + label='Power Panel', + widget=APISelect( + api_url='/api/dcim/power-panels/', + filter_for={ + 'termination_b_powerfeed': 'powerpanel_id', + } + ) + ) + termination_b_id = forms.IntegerField( + label='Power Feed', + widget=APISelect( + api_url='/api/dcim/power-feeds/', + ) + ) + + class Meta: + model = Cable + fields = [ + 'termination_b_rackgroup', 'termination_b_powerpanel', 'termination_b_id', 'type', 'status', 'label', + 'color', 'length', 'length_unit', + ] + + class CableForm(BootstrapMixin, forms.ModelForm): class Meta: diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index 57b86ff40..dc99a89ac 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.7 on 2019-03-12 14:08 +# Generated by Django 2.1.7 on 2019-03-21 20:59 import django.core.validators from django.db import migrations, models @@ -21,14 +21,15 @@ class Migration(migrations.Migration): ('created', models.DateField(auto_now_add=True, null=True)), ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('name', models.CharField(max_length=50)), - ('type', models.PositiveSmallIntegerField(default=1)), ('status', models.PositiveSmallIntegerField(default=1)), + ('type', models.PositiveSmallIntegerField(default=1)), ('supply', models.PositiveSmallIntegerField(default=1)), + ('phase', models.PositiveSmallIntegerField(default=1)), ('voltage', models.PositiveSmallIntegerField(default=120, validators=[django.core.validators.MinValueValidator(1)])), ('amperage', models.PositiveSmallIntegerField(default=20, validators=[django.core.validators.MinValueValidator(1)])), - ('phase', models.PositiveSmallIntegerField(default=1)), ('max_utilization', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), ('comments', models.TextField(blank=True)), + ('cable', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable')), ], options={ 'ordering': ['power_panel', 'name'], @@ -63,6 +64,26 @@ class Migration(migrations.Migration): name='tags', field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), ), + migrations.AddField( + model_name='powerfeed', + name='connected_endpoint', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.PowerPort'), + ), + migrations.AddField( + model_name='powerfeed', + name='connection_status', + field=models.NullBooleanField(), + ), + migrations.RenameField( + model_name='powerport', + old_name='connected_endpoint', + new_name='_connected_poweroutlet', + ), + migrations.AddField( + model_name='powerport', + name='_connected_powerfeed', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.PowerFeed'), + ), migrations.AlterUniqueTogether( name='powerpanel', unique_together={('site', 'name')}, diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 021d4e1a1..0d9750dfd 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1828,13 +1828,20 @@ class PowerPort(CableTermination, ComponentModel): name = models.CharField( max_length=50 ) - connected_endpoint = models.OneToOneField( + _connected_poweroutlet = models.OneToOneField( to='dcim.PowerOutlet', on_delete=models.SET_NULL, related_name='connected_endpoint', blank=True, null=True ) + _connected_powerfeed = models.OneToOneField( + to='dcim.PowerFeed', + on_delete=models.SET_NULL, + related_name='+', + blank=True, + null=True + ) connection_status = models.NullBooleanField( choices=CONNECTION_STATUS_CHOICES, blank=True @@ -1862,6 +1869,28 @@ class PowerPort(CableTermination, ComponentModel): self.description, ) + @property + def connected_endpoint(self): + if self._connected_poweroutlet: + return self._connected_poweroutlet + return self._connected_powerfeed + + @connected_endpoint.setter + def connected_endpoint(self, value): + if value is None: + self._connected_poweroutlet = None + self._connected_powerfeed = None + elif isinstance(value, PowerOutlet): + self._connected_poweroutlet = value + self._connected_powerfeed = None + elif isinstance(value, PowerFeed): + self._connected_poweroutlet = None + self._connected_powerfeed = value + else: + raise ValueError( + "Connected endpoint must be a PowerOutlet or PowerFeed, not {}.".format(type(value)) + ) + # # Power outlets @@ -2646,6 +2675,14 @@ class Cable(ChangeLoggedModel): def get_status_class(self): return 'success' if self.status else 'info' + def get_compatible_types(self): + """ + Return all termination types compatible with termination A. + """ + if self.termination_a is None: + return + return COMPATIBLE_TERMINATION_TYPES[self.termination_a._meta.model_name] + def get_path_endpoints(self): """ Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be @@ -2712,7 +2749,7 @@ class PowerPanel(ChangeLoggedModel): ) -class PowerFeed(ChangeLoggedModel, CustomFieldModel): +class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): """ An electrical circuit delivered from a PowerPanel. """ @@ -2727,6 +2764,17 @@ class PowerFeed(ChangeLoggedModel, CustomFieldModel): blank=True, null=True ) + connected_endpoint = models.OneToOneField( + to='dcim.PowerPort', + on_delete=models.SET_NULL, + related_name='+', + blank=True, + null=True + ) + connection_status = models.NullBooleanField( + choices=CONNECTION_STATUS_CHOICES, + blank=True + ) name = models.CharField( max_length=50 ) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index a8629245f..853e6ed57 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -3,6 +3,7 @@ import re from django.conf import settings from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin +from django.contrib.contenttypes.models import ContentType from django.core.paginator import EmptyPage, PageNotAnInteger from django.db import transaction from django.db.models import Count, F @@ -10,10 +11,11 @@ from django.forms import modelformset_factory from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.html import escape +from django.utils.http import is_safe_url from django.utils.safestring import mark_safe from django.views.generic import View -from circuits.models import Circuit +from circuits.models import Circuit, CircuitTermination from extras.models import Graph, TopologyMap, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE from extras.views import ObjectConfigContextView from ipam.models import Prefix, VLAN @@ -913,7 +915,7 @@ class DeviceView(View): consoleserverports = device.consoleserverports.select_related('connected_endpoint__device', 'cable') # Power ports - power_ports = device.powerports.select_related('connected_endpoint__device', 'cable') + power_ports = device.powerports.select_related('_connected_poweroutlet__device', 'cable') # Power outlets poweroutlets = device.poweroutlets.select_related('connected_endpoint__device', 'cable') @@ -1673,20 +1675,76 @@ class CableTraceView(View): }) -class CableCreateView(PermissionRequiredMixin, ObjectEditView): +class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View): permission_required = 'dcim.add_cable' - model = Cable - model_form = forms.CableCreateForm template_name = 'dcim/cable_connect.html' - def alter_obj(self, obj, request, url_args, url_kwargs): + def _get_form_class(self): + if self.termination_b_type == 'circuit': + return forms.ConnectCableToCircuitForm + if self.termination_b_type == 'powerfeed': + return forms.ConnectCableToPowerFeedForm + return forms.ConnectCableToDeviceForm + + def dispatch(self, request, *args, **kwargs): # Retrieve endpoint A based on the given type and PK - termination_a_type = url_kwargs.get('termination_a_type') - termination_a_id = url_kwargs.get('termination_a_id') - obj.termination_a = termination_a_type.objects.get(pk=termination_a_id) + termination_a_type = kwargs.get('termination_a_type') + termination_a_id = kwargs.get('termination_a_id') + self.obj = Cable( + termination_a=termination_a_type.objects.get(pk=termination_a_id) + ) - return obj + self.termination_b_type = request.GET.get('type') + if self.termination_b_type == 'circuit': + self.obj.termination_b_type = ContentType.objects.get_for_model(CircuitTermination) + elif self.termination_b_type == 'powerfeed': + self.obj.termination_b_type = ContentType.objects.get_for_model(PowerFeed) + + return super().dispatch(request, *args, **kwargs) + + def get(self, request, *args, **kwargs): + + # Parse initial data manually to avoid setting field values as lists + initial_data = {k: request.GET[k] for k in request.GET} + + form = self._get_form_class()(instance=self.obj, initial=initial_data) + + return render(request, self.template_name, { + 'obj': self.obj, + 'obj_type': Cable._meta.verbose_name, + 'form': form, + 'return_url': self.get_return_url(request, self.obj), + }) + + def post(self, request, *args, **kwargs): + + form = self._get_form_class()(request.POST, request.FILES, instance=self.obj) + + if form.is_valid(): + obj = form.save() + + msg = 'Created cable {}'.format( + obj.get_absolute_url(), + escape(obj) + ) + messages.success(request, mark_safe(msg)) + + if '_addanother' in request.POST: + return redirect(request.get_full_path()) + + return_url = form.cleaned_data.get('return_url') + if return_url is not None and is_safe_url(url=return_url, allowed_hosts=request.get_host()): + return redirect(return_url) + else: + return redirect(self.get_return_url(request, obj)) + + return render(request, self.template_name, { + 'obj': self.obj, + 'obj_type': Cable._meta.verbose_name, + 'form': form, + 'return_url': self.get_return_url(request, self.obj), + }) class CableEditView(PermissionRequiredMixin, ObjectEditView): @@ -1763,11 +1821,11 @@ class ConsoleConnectionsListView(ObjectListView): class PowerConnectionsListView(ObjectListView): queryset = PowerPort.objects.select_related( - 'device', 'connected_endpoint__device' + 'device', '_connected_poweroutlet__device' ).filter( - connected_endpoint__isnull=False + _connected_poweroutlet__isnull=False ).order_by( - 'cable', 'connected_endpoint__device__name', 'connected_endpoint__name' + 'cable', '_connected_poweroutlet__device__name', '_connected_poweroutlet__name' ) filter = filters.PowerConnectionFilter filter_form = forms.PowerConnectionFilterForm diff --git a/netbox/extras/models.py b/netbox/extras/models.py index ccdcb51ab..7815a2fbf 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -541,7 +541,7 @@ class TopologyMap(models.Model): from dcim.models import PowerPort # Add all power connections to the graph - for pp in PowerPort.objects.filter(device__in=devices, connected_endpoint__device__in=devices): + for pp in PowerPort.objects.filter(device__in=devices, _connected_poweroutlet__device__in=devices): style = 'solid' if pp.connection_status == CONNECTION_STATUS_CONNECTED else 'dashed' self.graph.edge(pp.connected_endpoint.device.name, pp.device.name, style=style) diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index 837d9473d..a0e8d6a7e 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -166,7 +166,7 @@ class HomeView(View): connected_endpoint__isnull=False ) connected_powerports = PowerPort.objects.filter( - connected_endpoint__isnull=False + _connected_poweroutlet__isnull=False ) connected_interfaces = Interface.objects.filter( _connected_interface__isnull=False, diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index cad396966..52c1444d4 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -101,21 +101,34 @@ B Side
    - -
    - -
    - {% render_field form.termination_b_site %} - {% render_field form.termination_b_rack %} -
    -
    - {% render_field form.termination_b_device %} - {% render_field form.termination_b_type %} + {# TODO: Clean this up #} + {% if 'termination_b_site' in form.fields %} + {% render_field form.termination_b_site %} + {% endif %} + {% if 'termination_b_rackgroup' in form.fields %} + {% render_field form.termination_b_rackgroup %} + {% endif %} + {% if 'termination_b_rack' in form.fields %} + {% render_field form.termination_b_rack %} + {% endif %} + {% if 'termination_b_device' in form.fields %} + {% render_field form.termination_b_device %} + {% endif %} + {% if 'termination_b_type' in form.fields %} + {% render_field form.termination_b_type %} + {% endif %} + {% if 'termination_b_provider' in form.fields %} + {% render_field form.termination_b_provider %} + {% endif %} + {% if 'termination_b_circuit' in form.fields %} + {% render_field form.termination_b_circuit %} + {% endif %} + {% if 'termination_b_powerpanel' in form.fields %} + {% render_field form.termination_b_powerpanel %} + {% endif %} + {% if 'termination_b_powerfeed' in form.fields %} + {% render_field form.termination_b_powerfeed %} + {% endif %} {% render_field form.termination_b_id %}
    diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index f2fe89330..458d1267a 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -20,13 +20,17 @@ {# Connection #} - {% if pp.connected_endpoint %} + {% if pp.connected_endpoint.device %} {{ pp.connected_endpoint.device }} {{ pp.connected_endpoint }} + {% elif pp.connected_endpoint %} + + {{ pp.connected_endpoint }} + {% else %} Not connected From a208cd156d0f2a2bfa1b953672c3a6e39224090b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 22 Mar 2019 21:58:45 -0400 Subject: [PATCH 06/21] Template and table polish --- netbox/dcim/tables.py | 7 +++++-- netbox/dcim/views.py | 6 ++++++ netbox/templates/dcim/powerfeed.html | 21 ++++++++++++++++++++- netbox/templates/dcim/powerpanel.html | 7 ++++--- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 532ee96c1..233c254e4 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -818,8 +818,11 @@ class PowerFeedTable(BaseTable): name = tables.LinkColumn() power_panel = tables.LinkColumn( viewname='dcim:powerpanel', - args=[Accessor('power_panel.pk')], - + args=[Accessor('rack.pk')], + ) + rack = tables.LinkColumn( + viewname='dcim:rack', + args=[Accessor('pk')] ) status = tables.TemplateColumn( template_code=STATUS_LABEL diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 853e6ed57..37ed42dc0 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2198,9 +2198,15 @@ class PowerPanelView(View): def get(self, request, pk): powerpanel = get_object_or_404(PowerPanel.objects.select_related('site', 'rack_group'), pk=pk) + powerfeed_table = tables.PowerFeedTable( + data=PowerFeed.objects.filter(power_panel=powerpanel).select_related('rack'), + orderable=False + ) + powerfeed_table.exclude = ['power_panel'] return render(request, 'dcim/powerpanel.html', { 'powerpanel': powerpanel, + 'powerfeed_table': powerfeed_table, }) diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 91d08aa12..b48e2f602 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -48,7 +48,7 @@ {% block content %}
    -
    +
    Power Feed @@ -82,6 +82,25 @@ {{ powerfeed.get_status_display }} + + Connected Device + + {% if powerfeed.connected_endpoint %} + {{ powerfeed.connected_endpoint.device }} ({{ powerfeed.connected_endpoint }}) + {% else %} + None + {% endif %} + + + +
    +
    +
    +
    +
    + Electrical Characteristics +
    + diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html index b023321c3..88f90ae89 100644 --- a/netbox/templates/dcim/powerpanel.html +++ b/netbox/templates/dcim/powerpanel.html @@ -48,7 +48,7 @@ {% block content %}
    -
    +
    Power Panel @@ -73,7 +73,8 @@
    Supply {{ powerfeed.get_supply_display }}
    -
    -
    +
    + {% include 'panel_table.html' with table=powerfeed_table heading='Connected Feeds' %} +
    {% endblock %} From e0085ec8190bf2dc80a5710c941f9f27b8adc1c6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 2 Apr 2019 13:37:53 -0400 Subject: [PATCH 07/21] Fixed table columns --- netbox/dcim/tables.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 233c254e4..0d874bed2 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -800,6 +800,10 @@ class VirtualChassisTable(BaseTable): class PowerPanelTable(BaseTable): pk = ToggleColumn() name = tables.LinkColumn() + site = tables.LinkColumn( + viewname='dcim:site', + args=[Accessor('site.slug')] + ) powerfeed_count = tables.Column( verbose_name='Feeds' ) @@ -818,7 +822,7 @@ class PowerFeedTable(BaseTable): name = tables.LinkColumn() power_panel = tables.LinkColumn( viewname='dcim:powerpanel', - args=[Accessor('rack.pk')], + args=[Accessor('pk')], ) rack = tables.LinkColumn( viewname='dcim:rack', From 0e5dff212e61a6f8237321f8eb125c1dc131ba6b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 2 Apr 2019 13:50:57 -0400 Subject: [PATCH 08/21] Fix rack elevation display --- netbox/templates/dcim/rack.html | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 2a142ae6c..e702405a2 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -289,19 +289,21 @@ {% endif %}
    -
    -
    -
    -

    Front

    -
    - {% include 'dcim/inc/rack_elevation.html' with primary_face=front_elevation secondary_face=rear_elevation face_id=0 reserved_units=rack.get_reserved_units %} -
    -
    -
    -

    Rear

    -
    - {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 reserved_units=rack.get_reserved_units %} -
    +
    +
    +
    +
    +

    Front

    +
    + {% include 'dcim/inc/rack_elevation.html' with primary_face=front_elevation secondary_face=rear_elevation face_id=0 reserved_units=rack.get_reserved_units %} +
    +
    +
    +

    Rear

    +
    + {% include 'dcim/inc/rack_elevation.html' with primary_face=rear_elevation secondary_face=front_elevation face_id=1 reserved_units=rack.get_reserved_units %} +
    +
    Non-Racked Devices From 4884f3ac778cb27b153730c049900e7727a68894 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 2 Apr 2019 14:49:40 -0400 Subject: [PATCH 09/21] Fix column links --- netbox/dcim/tables.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 0d874bed2..e52e64fea 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -822,11 +822,11 @@ class PowerFeedTable(BaseTable): name = tables.LinkColumn() power_panel = tables.LinkColumn( viewname='dcim:powerpanel', - args=[Accessor('pk')], + args=[Accessor('power_panel.pk')], ) rack = tables.LinkColumn( viewname='dcim:rack', - args=[Accessor('pk')] + args=[Accessor('rack.pk')] ) status = tables.TemplateColumn( template_code=STATUS_LABEL From f1d1e8b537d521c364a9fda0fc1d2623c5f55dd5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 Apr 2019 14:22:45 -0400 Subject: [PATCH 10/21] Update migrations --- netbox/circuits/migrations/0015_custom_tag_models.py | 2 +- netbox/dcim/migrations/0070_custom_tag_models.py | 2 +- netbox/dcim/migrations/0072_powerfeeds.py | 2 +- .../{0018_tag_taggeditem.py => 0019_tag_taggeditem.py} | 2 +- netbox/extras/migrations/{0019_tag_data.py => 0020_tag_data.py} | 2 +- ...og_to_tag.py => 0021_add_color_comments_changelog_to_tag.py} | 2 +- netbox/ipam/migrations/0025_custom_tag_models.py | 2 +- netbox/secrets/migrations/0006_custom_tag_models.py | 2 +- netbox/tenancy/migrations/0006_custom_tag_models.py | 2 +- netbox/virtualization/migrations/0009_custom_tag_models.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename netbox/extras/migrations/{0018_tag_taggeditem.py => 0019_tag_taggeditem.py} (96%) rename netbox/extras/migrations/{0019_tag_data.py => 0020_tag_data.py} (97%) rename netbox/extras/migrations/{0020_add_color_comments_changelog_to_tag.py => 0021_add_color_comments_changelog_to_tag.py} (95%) diff --git a/netbox/circuits/migrations/0015_custom_tag_models.py b/netbox/circuits/migrations/0015_custom_tag_models.py index d00eb36d7..11bde72ff 100644 --- a/netbox/circuits/migrations/0015_custom_tag_models.py +++ b/netbox/circuits/migrations/0015_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('circuits', '0014_circuittermination_description'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ diff --git a/netbox/dcim/migrations/0070_custom_tag_models.py b/netbox/dcim/migrations/0070_custom_tag_models.py index e3b54b9cc..ee78bed02 100644 --- a/netbox/dcim/migrations/0070_custom_tag_models.py +++ b/netbox/dcim/migrations/0070_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('dcim', '0069_deprecate_nullablecharfield'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index dc99a89ac..676b431c3 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -9,7 +9,7 @@ import taggit.managers class Migration(migrations.Migration): dependencies = [ - ('extras', '0020_add_color_comments_changelog_to_tag'), + ('extras', '0021_add_color_comments_changelog_to_tag'), ('dcim', '0071_device_components_add_description'), ] diff --git a/netbox/extras/migrations/0018_tag_taggeditem.py b/netbox/extras/migrations/0019_tag_taggeditem.py similarity index 96% rename from netbox/extras/migrations/0018_tag_taggeditem.py rename to netbox/extras/migrations/0019_tag_taggeditem.py index 11a3a50a5..7f531a737 100644 --- a/netbox/extras/migrations/0018_tag_taggeditem.py +++ b/netbox/extras/migrations/0019_tag_taggeditem.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ ('contenttypes', '0002_remove_content_type_name'), - ('extras', '0017_exporttemplate_mime_type_length'), + ('extras', '0018_exporttemplate_add_jinja2'), ] operations = [ diff --git a/netbox/extras/migrations/0019_tag_data.py b/netbox/extras/migrations/0020_tag_data.py similarity index 97% rename from netbox/extras/migrations/0019_tag_data.py rename to netbox/extras/migrations/0020_tag_data.py index af4641daa..615ded8e2 100644 --- a/netbox/extras/migrations/0019_tag_data.py +++ b/netbox/extras/migrations/0020_tag_data.py @@ -48,7 +48,7 @@ def delete_taggit_tags(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ('circuits', '0015_custom_tag_models'), ('dcim', '0070_custom_tag_models'), ('ipam', '0025_custom_tag_models'), diff --git a/netbox/extras/migrations/0020_add_color_comments_changelog_to_tag.py b/netbox/extras/migrations/0021_add_color_comments_changelog_to_tag.py similarity index 95% rename from netbox/extras/migrations/0020_add_color_comments_changelog_to_tag.py rename to netbox/extras/migrations/0021_add_color_comments_changelog_to_tag.py index 33171db98..26ed34b31 100644 --- a/netbox/extras/migrations/0020_add_color_comments_changelog_to_tag.py +++ b/netbox/extras/migrations/0021_add_color_comments_changelog_to_tag.py @@ -7,7 +7,7 @@ import utilities.fields class Migration(migrations.Migration): dependencies = [ - ('extras', '0019_tag_data'), + ('extras', '0020_tag_data'), ] operations = [ diff --git a/netbox/ipam/migrations/0025_custom_tag_models.py b/netbox/ipam/migrations/0025_custom_tag_models.py index a47335b58..002aefcb2 100644 --- a/netbox/ipam/migrations/0025_custom_tag_models.py +++ b/netbox/ipam/migrations/0025_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('ipam', '0024_vrf_allow_null_rd'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ diff --git a/netbox/secrets/migrations/0006_custom_tag_models.py b/netbox/secrets/migrations/0006_custom_tag_models.py index 8e5fc1b80..399dcc5bf 100644 --- a/netbox/secrets/migrations/0006_custom_tag_models.py +++ b/netbox/secrets/migrations/0006_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('secrets', '0005_change_logging'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ diff --git a/netbox/tenancy/migrations/0006_custom_tag_models.py b/netbox/tenancy/migrations/0006_custom_tag_models.py index 92e333520..dd39ff471 100644 --- a/netbox/tenancy/migrations/0006_custom_tag_models.py +++ b/netbox/tenancy/migrations/0006_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('tenancy', '0005_change_logging'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ diff --git a/netbox/virtualization/migrations/0009_custom_tag_models.py b/netbox/virtualization/migrations/0009_custom_tag_models.py index 3f70d5469..04d589bee 100644 --- a/netbox/virtualization/migrations/0009_custom_tag_models.py +++ b/netbox/virtualization/migrations/0009_custom_tag_models.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('virtualization', '0008_virtualmachine_local_context_data'), - ('extras', '0018_tag_taggeditem'), + ('extras', '0019_tag_taggeditem'), ] operations = [ From cd655d289bff6a706a1a7aad838de714b8ad59ac Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 Apr 2019 14:55:17 -0400 Subject: [PATCH 11/21] Fix CSV import forms --- netbox/dcim/forms.py | 78 +++++++++++++++++++++++++++++++++++++++++-- netbox/dcim/models.py | 6 ++-- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index ccbe2a23e..d02241560 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3296,15 +3296,31 @@ class PowerPanelCSVForm(forms.ModelForm): 'invalid_choice': 'Site not found.', } ) - rackgroup_name = forms.CharField( - help_text='Name of rack group', - required=False + rack_group_name = forms.CharField( + required=False, + help_text="Rack group name (optional)" ) class Meta: model = PowerPanel fields = PowerPanel.csv_headers + def clean(self): + + super().clean() + + site = self.cleaned_data.get('site') + rack_group_name = self.cleaned_data.get('rack_group_name') + + # Validate rack group + if rack_group_name: + try: + self.instance.rack_group = RackGroup.objects.get(site=site, name=rack_group_name) + except RackGroup.DoesNotExist: + raise forms.ValidationError( + "Rack group {} not found in site {}".format(rack_group_name, site) + ) + class PowerPanelFilterForm(BootstrapMixin, CustomFieldFilterForm): model = PowerPanel @@ -3375,6 +3391,30 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): class PowerFeedCSVForm(forms.ModelForm): + site = forms.ModelChoiceField( + queryset=Site.objects.all(), + to_field_name='name', + help_text='Name of parent site', + error_messages={ + 'invalid_choice': 'Site not found.', + } + ) + panel_name = forms.ModelChoiceField( + queryset=PowerPanel.objects.all(), + to_field_name='name', + help_text='Name of upstream power panel', + error_messages={ + 'invalid_choice': 'Power panel not found.', + } + ) + rack_group = forms.CharField( + required=False, + help_text="Rack group name (optional)" + ) + rack_name = forms.CharField( + required=False, + help_text="Rack name (optional)" + ) status = CSVChoiceField( choices=POWERFEED_STATUS_CHOICES, required=False, @@ -3390,11 +3430,43 @@ class PowerFeedCSVForm(forms.ModelForm): required=False, help_text='AC/DC' ) + phase = CSVChoiceField( + choices=POWERFEED_PHASE_CHOICES, + required=False, + help_text='Single or three-phase' + ) class Meta: model = PowerFeed fields = PowerFeed.csv_headers + def clean(self): + + super().clean() + + site = self.cleaned_data.get('site') + panel_name = self.cleaned_data.get('panel_name') + rack_group = self.cleaned_data.get('rack_group') + rack_name = self.cleaned_data.get('rack_name') + + # Validate power panel + if panel_name: + try: + self.instance.power_panel = PowerPanel.objects.get(site=site, name=panel_name) + except Rack.DoesNotExist: + raise forms.ValidationError( + "Power panel {} not found in site {}".format(panel_name, site) + ) + + # Validate rack + if rack_name: + try: + self.instance.rack = Rack.objects.get(site=site, rack_group=rack_group, name=rack_name) + except Rack.DoesNotExist: + raise forms.ValidationError( + "Rack {} not found in site {}, group {}".format(rack_name, site, rack_group) + ) + class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm): pk = forms.ModelMultipleChoiceField( diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 0d9750dfd..f0fa4ea5f 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2729,7 +2729,7 @@ class PowerPanel(ChangeLoggedModel): max_length=50 ) - csv_headers = ['site', 'rack_group', 'name'] + csv_headers = ['site', 'rack_group_name', 'name'] class Meta: ordering = ['site', 'name'] @@ -2819,8 +2819,8 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): tags = TaggableManager(through=TaggedItem) csv_headers = [ - 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization', - 'comments', + 'site', 'panel_name', 'rack_group', 'rack_name', 'name', 'status', 'type', 'supply', 'phase', 'voltage', + 'amperage', 'max_utilization', 'comments', ] class Meta: From ef867e789d75ecfd7a83f4c2ac7427aee929bef0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 Apr 2019 15:37:31 -0400 Subject: [PATCH 12/21] Finish power outlet/feed connection forms --- netbox/dcim/filters.py | 4 ++++ netbox/dcim/forms.py | 2 +- netbox/templates/dcim/inc/powerport.html | 12 +++++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index c4db4ef83..581ed76bf 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -1126,6 +1126,10 @@ class PowerFeedFilter(CustomFieldFilterSet): to_field_name='slug', label='Site name (slug)', ) + power_panel_id = django_filters.ModelMultipleChoiceFilter( + queryset=PowerPanel.objects.all(), + label='Power panel (ID)', + ) rack_id = django_filters.ModelMultipleChoiceFilter( field_name='rack', queryset=Rack.objects.all(), diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index d02241560..f28a35997 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2681,7 +2681,7 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.Mode widget=APISelect( api_url='/api/dcim/power-panels/', filter_for={ - 'termination_b_powerfeed': 'powerpanel_id', + 'termination_b_id': 'power_panel_id', } ) ) diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index 458d1267a..c3a83ad69 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -42,9 +42,15 @@ {% if pp.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=pp.cable %} {% elif perms.dcim.add_cable %} - - - + + + + {% endif %} {% if perms.dcim.change_powerport %} From c1127148e28a3a70da19da5c1e5f8ca6ce594896 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 Apr 2019 16:49:04 -0400 Subject: [PATCH 13/21] Provide individual views for each type of cable connection --- netbox/circuits/urls.py | 2 +- netbox/dcim/forms.py | 124 +++++++++++++----- netbox/dcim/urls.py | 14 +- netbox/dcim/views.py | 41 +++--- netbox/templates/dcim/cable_connect.html | 29 ++-- netbox/templates/dcim/inc/consoleport.html | 13 +- .../templates/dcim/inc/consoleserverport.html | 13 +- netbox/templates/dcim/inc/frontport.html | 14 +- netbox/templates/dcim/inc/interface.html | 14 +- netbox/templates/dcim/inc/poweroutlet.html | 2 +- netbox/templates/dcim/inc/powerport.html | 4 +- netbox/templates/dcim/inc/rearport.html | 14 +- 12 files changed, 198 insertions(+), 86 deletions(-) diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index be1106308..5b818a945 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -43,7 +43,7 @@ urlpatterns = [ url(r'^circuits/(?P\d+)/terminations/add/$', views.CircuitTerminationCreateView.as_view(), name='circuittermination_add'), url(r'^circuit-terminations/(?P\d+)/edit/$', views.CircuitTerminationEditView.as_view(), name='circuittermination_edit'), url(r'^circuit-terminations/(?P\d+)/delete/$', views.CircuitTerminationDeleteView.as_view(), name='circuittermination_delete'), - url(r'^circuit-terminations/(?P\d+)/connect/$', CableCreateView.as_view(), name='circuittermination_connect', kwargs={'termination_a_type': CircuitTermination}), + url(r'^circuit-terminations/(?P\d+)/connect/(?P[\w-]+)/$', CableCreateView.as_view(), name='circuittermination_connect', kwargs={'termination_a_type': CircuitTermination}), url(r'^circuit-terminations/(?P\d+)/trace/$', CableTraceView.as_view(), name='circuittermination_trace', kwargs={'model': CircuitTermination}), ] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index f28a35997..661ec217b 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2522,6 +2522,9 @@ class RearPortBulkDisconnectForm(ConfirmationForm): # class ConnectCableToDeviceForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): + """ + Base form for connecting a Cable to a Device component + """ termination_b_site = forms.ModelChoiceField( queryset=Site.objects.all(), label='Site', @@ -2567,42 +2570,89 @@ class ConnectCableToDeviceForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFo } ) ) - termination_b_type = forms.ModelChoiceField( - queryset=ContentType.objects.all(), - label='Type', - widget=ContentTypeSelect() - ) - termination_b_id = forms.IntegerField( - label='Name', - widget=APISelect( - api_url='/api/dcim/{{termination_b_type}}s/', - disabled_indicator='cable', - conditional_query_params={ - 'termination_b_type__interface': 'type=physical', - } - ) - ) class Meta: model = Cable fields = [ - 'termination_b_site', 'termination_b_rack', 'termination_b_device', 'termination_b_type', - 'termination_b_id', 'type', 'status', 'label', 'color', 'length', 'length_unit', + 'termination_b_site', 'termination_b_rack', 'termination_b_device', 'termination_b_id', 'type', 'status', + 'label', 'color', 'length', 'length_unit', ] - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - # Define available types for endpoint B based on the type of endpoint A - termination_a_type = self.instance.termination_a._meta.model_name - self.fields['termination_b_type'].queryset = ContentType.objects.filter( - model__in=COMPATIBLE_TERMINATION_TYPES.get(termination_a_type) - ).exclude( - model='circuittermination' +class ConnectCableToConsolePortForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/console-ports/', + disabled_indicator='cable', ) + ) -class ConnectCableToCircuitForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): +class ConnectCableToConsoleServerPortForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/console-server-ports/', + disabled_indicator='cable', + ) + ) + + +class ConnectCableToPowerPortForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/power-ports/', + disabled_indicator='cable', + ) + ) + + +class ConnectCableToPowerOutletForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/power-outlets/', + disabled_indicator='cable', + ) + ) + + +class ConnectCableToInterfaceForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/interfaces/', + disabled_indicator='cable', + additional_query_params={ + 'type': 'physical', + } + ) + ) + + +class ConnectCableToFrontPortForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/front-ports/', + disabled_indicator='cable', + ) + ) + + +class ConnectCableToRearPortForm(ConnectCableToDeviceForm): + termination_b_id = forms.IntegerField( + label='Name', + widget=APISelect( + api_url='/api/dcim/rear-ports/', + disabled_indicator='cable', + ) + ) + + +class ConnectCableToCircuitTerminationForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm): termination_b_provider = forms.ModelChoiceField( queryset=Provider.objects.all(), label='Provider', @@ -2613,6 +2663,17 @@ class ConnectCableToCircuitForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF } ) ) + termination_b_site = forms.ModelChoiceField( + queryset=Site.objects.all(), + label='Site', + required=False, + widget=APISelect( + api_url='/api/dcim/sites/', + filter_for={ + 'termination_b_circuit': 'site_id', + } + ) + ) termination_b_circuit = ChainedModelChoiceField( queryset=Circuit.objects.all(), chains=( @@ -2628,18 +2689,19 @@ class ConnectCableToCircuitForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelF ) ) termination_b_id = forms.IntegerField( - label='Termination', + label='Side', widget=APISelect( api_url='/api/circuits/circuit-terminations/', - disabled_indicator='cable' + disabled_indicator='cable', + display_field='term_side' ) ) class Meta: model = Cable fields = [ - 'termination_b_provider', 'termination_b_circuit', 'termination_b_id', 'type', 'status', 'label', 'color', - 'length', 'length_unit', + 'termination_b_provider', 'termination_b_site', 'termination_b_circuit', 'termination_b_id', 'type', + 'status', 'label', 'color', 'length', 'length_unit', ] @@ -2686,7 +2748,7 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.Mode ) ) termination_b_id = forms.IntegerField( - label='Power Feed', + label='Name', widget=APISelect( api_url='/api/dcim/power-feeds/', ) diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index f6ed55ff3..82e32dad2 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -162,7 +162,7 @@ urlpatterns = [ url(r'^devices/console-ports/add/$', views.DeviceBulkAddConsolePortView.as_view(), name='device_bulk_add_consoleport'), url(r'^devices/(?P\d+)/console-ports/add/$', views.ConsolePortCreateView.as_view(), name='consoleport_add'), url(r'^devices/(?P\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), - url(r'^console-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}), + url(r'^console-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}), url(r'^console-ports/(?P\d+)/edit/$', views.ConsolePortEditView.as_view(), name='consoleport_edit'), url(r'^console-ports/(?P\d+)/delete/$', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'), url(r'^console-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleport_trace', kwargs={'model': ConsolePort}), @@ -171,7 +171,7 @@ urlpatterns = [ url(r'^devices/console-server-ports/add/$', views.DeviceBulkAddConsoleServerPortView.as_view(), name='device_bulk_add_consoleserverport'), url(r'^devices/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'), url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), - url(r'^console-server-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}), + url(r'^console-server-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}), url(r'^console-server-ports/(?P\d+)/edit/$', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'), url(r'^console-server-ports/(?P\d+)/delete/$', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'), url(r'^console-server-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}), @@ -182,7 +182,7 @@ urlpatterns = [ url(r'^devices/power-ports/add/$', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'), url(r'^devices/(?P\d+)/power-ports/add/$', views.PowerPortCreateView.as_view(), name='powerport_add'), url(r'^devices/(?P\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), - url(r'^power-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}), + url(r'^power-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}), url(r'^power-ports/(?P\d+)/edit/$', views.PowerPortEditView.as_view(), name='powerport_edit'), url(r'^power-ports/(?P\d+)/delete/$', views.PowerPortDeleteView.as_view(), name='powerport_delete'), url(r'^power-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='powerport_trace', kwargs={'model': PowerPort}), @@ -191,7 +191,7 @@ urlpatterns = [ url(r'^devices/power-outlets/add/$', views.DeviceBulkAddPowerOutletView.as_view(), name='device_bulk_add_poweroutlet'), url(r'^devices/(?P\d+)/power-outlets/add/$', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'), url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), - url(r'^power-outlets/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}), + url(r'^power-outlets/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}), url(r'^power-outlets/(?P\d+)/edit/$', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'), url(r'^power-outlets/(?P\d+)/delete/$', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'), url(r'^power-outlets/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}), @@ -203,7 +203,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/interfaces/add/$', views.InterfaceCreateView.as_view(), name='interface_add'), url(r'^devices/(?P\d+)/interfaces/edit/$', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), url(r'^devices/(?P\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), - url(r'^interfaces/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}), + url(r'^interfaces/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}), url(r'^interfaces/(?P\d+)/$', views.InterfaceView.as_view(), name='interface'), url(r'^interfaces/(?P\d+)/edit/$', views.InterfaceEditView.as_view(), name='interface_edit'), url(r'^interfaces/(?P\d+)/assign-vlans/$', views.InterfaceAssignVLANsView.as_view(), name='interface_assign_vlans'), @@ -218,7 +218,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/front-ports/add/$', views.FrontPortCreateView.as_view(), name='frontport_add'), url(r'^devices/(?P\d+)/front-ports/edit/$', views.FrontPortBulkEditView.as_view(), name='frontport_bulk_edit'), url(r'^devices/(?P\d+)/front-ports/delete/$', views.FrontPortBulkDeleteView.as_view(), name='frontport_bulk_delete'), - url(r'^front-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='frontport_connect', kwargs={'termination_a_type': FrontPort}), + url(r'^front-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='frontport_connect', kwargs={'termination_a_type': FrontPort}), url(r'^front-ports/(?P\d+)/edit/$', views.FrontPortEditView.as_view(), name='frontport_edit'), url(r'^front-ports/(?P\d+)/delete/$', views.FrontPortDeleteView.as_view(), name='frontport_delete'), url(r'^front-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='frontport_trace', kwargs={'model': FrontPort}), @@ -230,7 +230,7 @@ urlpatterns = [ url(r'^devices/(?P\d+)/rear-ports/add/$', views.RearPortCreateView.as_view(), name='rearport_add'), url(r'^devices/(?P\d+)/rear-ports/edit/$', views.RearPortBulkEditView.as_view(), name='rearport_bulk_edit'), url(r'^devices/(?P\d+)/rear-ports/delete/$', views.RearPortBulkDeleteView.as_view(), name='rearport_bulk_delete'), - url(r'^rear-ports/(?P\d+)/connect/$', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}), + url(r'^rear-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}), url(r'^rear-ports/(?P\d+)/edit/$', views.RearPortEditView.as_view(), name='rearport_edit'), url(r'^rear-ports/(?P\d+)/delete/$', views.RearPortDeleteView.as_view(), name='rearport_delete'), url(r'^rear-ports/(?P\d+)/trace/$', views.CableTraceView.as_view(), name='rearport_trace', kwargs={'model': RearPort}), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 37ed42dc0..b1403745d 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -15,7 +15,7 @@ from django.utils.http import is_safe_url from django.utils.safestring import mark_safe from django.views.generic import View -from circuits.models import Circuit, CircuitTermination +from circuits.models import Circuit from extras.models import Graph, TopologyMap, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE from extras.views import ObjectConfigContextView from ipam.models import Prefix, VLAN @@ -1679,27 +1679,28 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View): permission_required = 'dcim.add_cable' template_name = 'dcim/cable_connect.html' - def _get_form_class(self): - if self.termination_b_type == 'circuit': - return forms.ConnectCableToCircuitForm - if self.termination_b_type == 'powerfeed': - return forms.ConnectCableToPowerFeedForm - return forms.ConnectCableToDeviceForm - def dispatch(self, request, *args, **kwargs): - # Retrieve endpoint A based on the given type and PK termination_a_type = kwargs.get('termination_a_type') termination_a_id = kwargs.get('termination_a_id') - self.obj = Cable( - termination_a=termination_a_type.objects.get(pk=termination_a_id) - ) - self.termination_b_type = request.GET.get('type') - if self.termination_b_type == 'circuit': - self.obj.termination_b_type = ContentType.objects.get_for_model(CircuitTermination) - elif self.termination_b_type == 'powerfeed': - self.obj.termination_b_type = ContentType.objects.get_for_model(PowerFeed) + termination_b_type_name = kwargs.get('termination_b_type') + self.termination_b_type = ContentType.objects.get(model=termination_b_type_name.replace('-', '')) + + self.obj = Cable( + termination_a=termination_a_type.objects.get(pk=termination_a_id), + termination_b_type=self.termination_b_type + ) + self.form_class = { + 'console-port': forms.ConnectCableToConsolePortForm, + 'console-server-port': forms.ConnectCableToConsoleServerPortForm, + 'power-port': forms.ConnectCableToPowerPortForm, + 'power-outlet': forms.ConnectCableToPowerOutletForm, + 'interface': forms.ConnectCableToInterfaceForm, + 'front-port': forms.ConnectCableToFrontPortForm, + 'power-feed': forms.ConnectCableToPowerFeedForm, + 'circuit-termination': forms.ConnectCableToCircuitTerminationForm, + }[termination_b_type_name] return super().dispatch(request, *args, **kwargs) @@ -1708,18 +1709,19 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View): # Parse initial data manually to avoid setting field values as lists initial_data = {k: request.GET[k] for k in request.GET} - form = self._get_form_class()(instance=self.obj, initial=initial_data) + form = self.form_class(instance=self.obj, initial=initial_data) return render(request, self.template_name, { 'obj': self.obj, 'obj_type': Cable._meta.verbose_name, + 'termination_b_type': self.termination_b_type.name, 'form': form, 'return_url': self.get_return_url(request, self.obj), }) def post(self, request, *args, **kwargs): - form = self._get_form_class()(request.POST, request.FILES, instance=self.obj) + form = self.form_class(request.POST, request.FILES, instance=self.obj) if form.is_valid(): obj = form.save() @@ -1742,6 +1744,7 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View): return render(request, self.template_name, { 'obj': self.obj, 'obj_type': Cable._meta.verbose_name, + 'termination_b_type': self.termination_b_type.name, 'form': form, 'return_url': self.get_return_url(request, self.obj), }) diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index 52c1444d4..b1609f578 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -22,7 +22,7 @@
    {% endif %} {% with termination_a=form.instance.termination_a %} -

    {% block title %}Connect {{ termination_a.device }} {{ termination_a }}{% endblock %}

    +

    {% block title %}Connect {{ termination_a.device }} {{ termination_a }} to {{ termination_b_type|bettertitle }}{% endblock %}

    @@ -101,7 +101,16 @@ B Side
    - {# TODO: Clean this up #} + {% if tabs %} + + {% endif %} + {% if 'termination_b_provider' in form.fields %} + {% render_field form.termination_b_provider %} + {% endif %} {% if 'termination_b_site' in form.fields %} {% render_field form.termination_b_site %} {% endif %} @@ -117,18 +126,18 @@ {% if 'termination_b_type' in form.fields %} {% render_field form.termination_b_type %} {% endif %} - {% if 'termination_b_provider' in form.fields %} - {% render_field form.termination_b_provider %} + {% if 'termination_b_powerpanel' in form.fields %} + {% render_field form.termination_b_powerpanel %} {% endif %} {% if 'termination_b_circuit' in form.fields %} {% render_field form.termination_b_circuit %} {% endif %} - {% if 'termination_b_powerpanel' in form.fields %} - {% render_field form.termination_b_powerpanel %} - {% endif %} - {% if 'termination_b_powerfeed' in form.fields %} - {% render_field form.termination_b_powerfeed %} - {% endif %} +
    + +
    +

    {{ termination_b_type|capfirst }}

    +
    +
    {% render_field form.termination_b_id %}
    diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index eea23db93..be531ef1b 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -38,9 +38,16 @@ {% if cp.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=cp.cable %} {% elif perms.dcim.add_cable %} - - - + + + + {% endif %} {% if perms.dcim.change_consoleport %} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index 2ce7818b6..d1dce00d3 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -47,9 +47,16 @@ {% if csp.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=csp.cable %} {% elif perms.dcim.add_cable %} - - - + + + + {% endif %} {% if perms.dcim.change_consoleserverport %} diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html index 2b468725d..ae86a36b4 100644 --- a/netbox/templates/dcim/inc/frontport.html +++ b/netbox/templates/dcim/inc/frontport.html @@ -58,9 +58,17 @@ {% if frontport.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=frontport.cable %} {% elif perms.dcim.add_cable %} - - - + + + + {% endif %} {% if perms.dcim.change_frontport %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 584d1754d..4aa4e377d 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -151,9 +151,17 @@ {% if iface.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=iface.cable %} {% elif iface.is_connectable and perms.dcim.add_cable %} - - - + + + + {% endif %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 74f946495..042c9142a 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -47,7 +47,7 @@ {% if po.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=po.cable %} {% elif perms.dcim.add_cable %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index c3a83ad69..e74e4f368 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -47,8 +47,8 @@ {% endif %} diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html index 63aae1127..27609e726 100644 --- a/netbox/templates/dcim/inc/rearport.html +++ b/netbox/templates/dcim/inc/rearport.html @@ -57,9 +57,17 @@ {% if rearport.cable %} {% include 'dcim/inc/cable_toggle_buttons.html' with cable=rearport.cable %} {% elif perms.dcim.add_cable %} - - - + + + + {% endif %} {% if perms.dcim.change_rearport %} From 8230ea1c83d4eaf8c2f0fbe068a1c4f27b0f6c73 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 9 Apr 2019 17:32:04 -0400 Subject: [PATCH 14/21] Add max/allocated current draw fields to PowerPort --- netbox/dcim/api/serializers.py | 4 ++-- netbox/dcim/forms.py | 13 +++++----- netbox/dcim/migrations/0072_powerfeeds.py | 20 ++++++++++++++++ netbox/dcim/models.py | 28 +++++++++++++++++++++- netbox/templates/dcim/inc/consoleport.html | 1 + netbox/templates/dcim/inc/powerport.html | 9 +++++++ 6 files changed, 65 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 59ac3b0ef..f9452cebf 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -210,7 +210,7 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer): class Meta: model = PowerPortTemplate - fields = ['id', 'device_type', 'name'] + fields = ['id', 'device_type', 'name', 'maximum_draw', 'allocated_draw'] class PowerOutletTemplateSerializer(ValidatedModelSerializer): @@ -391,7 +391,7 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer): class Meta: model = PowerPort fields = [ - 'id', 'device', 'name', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', + 'id', 'device', 'name', 'maximum_draw', 'allocated_draw', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'tags', ] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 661ec217b..cb97f0e84 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -10,17 +10,16 @@ from mptt.forms import TreeNodeChoiceField from taggit.forms import TagField from timezone_field import TimeZoneFormField -from circuits.models import Circuit, CircuitTermination, Provider +from circuits.models import Circuit, Provider from extras.forms import AddRemoveTagsForm, CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm from ipam.models import IPAddress, VLAN, VLANGroup from tenancy.forms import TenancyForm from tenancy.models import Tenant from utilities.forms import ( APISelect, APISelectMultiple, add_blank_choice, ArrayFieldSelectMultiple, BootstrapMixin, BulkEditForm, - BulkEditNullBooleanSelect, ChainedFieldsMixin, ChainedModelChoiceField, ColorSelect, CommentField, - ComponentForm, ConfirmationForm, ContentTypeSelect, CSVChoiceField, ExpandableNameField, - FilterChoiceField, FlexibleModelChoiceField, JSONField, SelectWithPK, SmallTextarea, SlugField, - StaticSelect2, StaticSelect2Multiple, BOOLEAN_WITH_BLANK_CHOICES + BulkEditNullBooleanSelect, ChainedFieldsMixin, ChainedModelChoiceField, ColorSelect, CommentField, ComponentForm, + ConfirmationForm, CSVChoiceField, ExpandableNameField, FilterChoiceField, FlexibleModelChoiceField, JSONField, + SelectWithPK, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple, BOOLEAN_WITH_BLANK_CHOICES ) from virtualization.models import Cluster, ClusterGroup from .constants import * @@ -964,7 +963,7 @@ class PowerPortTemplateForm(BootstrapMixin, forms.ModelForm): class Meta: model = PowerPortTemplate fields = [ - 'device_type', 'name', + 'device_type', 'name', 'maximum_draw', 'allocated_draw', ] widgets = { 'device_type': forms.HiddenInput(), @@ -1948,7 +1947,7 @@ class PowerPortForm(BootstrapMixin, forms.ModelForm): class Meta: model = PowerPort fields = [ - 'device', 'name', 'description', 'tags', + 'device', 'name', 'maximum_draw', 'allocated_draw', 'description', 'tags', ] widgets = { 'device': forms.HiddenInput(), diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index 676b431c3..d8dcbf252 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -84,6 +84,26 @@ class Migration(migrations.Migration): name='_connected_powerfeed', field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.PowerFeed'), ), + migrations.AddField( + model_name='powerport', + name='allocated_draw', + field=models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + ), + migrations.AddField( + model_name='powerport', + name='maximum_draw', + field=models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + ), + migrations.AddField( + model_name='powerporttemplate', + name='allocated_draw', + field=models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + ), + migrations.AddField( + model_name='powerporttemplate', + name='maximum_draw', + field=models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + ), migrations.AlterUniqueTogether( name='powerpanel', unique_together={('site', 'name')}, diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index f0fa4ea5f..9e2be6a43 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1053,6 +1053,18 @@ class PowerPortTemplate(ComponentTemplateModel): name = models.CharField( max_length=50 ) + maximum_draw = models.PositiveSmallIntegerField( + blank=True, + null=True, + validators=[MinValueValidator(1)], + help_text="Maximum current draw (watts)" + ) + allocated_draw = models.PositiveSmallIntegerField( + blank=True, + null=True, + validators=[MinValueValidator(1)], + help_text="Allocated current draw (watts)" + ) objects = DeviceComponentManager() @@ -1828,6 +1840,18 @@ class PowerPort(CableTermination, ComponentModel): name = models.CharField( max_length=50 ) + maximum_draw = models.PositiveSmallIntegerField( + blank=True, + null=True, + validators=[MinValueValidator(1)], + help_text="Maximum current draw (watts)" + ) + allocated_draw = models.PositiveSmallIntegerField( + blank=True, + null=True, + validators=[MinValueValidator(1)], + help_text="Allocated current draw (watts)" + ) _connected_poweroutlet = models.OneToOneField( to='dcim.PowerOutlet', on_delete=models.SET_NULL, @@ -1850,7 +1874,7 @@ class PowerPort(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) - csv_headers = ['device', 'name', 'description'] + csv_headers = ['device', 'name', 'maximum_draw', 'allocated_draw', 'description'] class Meta: ordering = ['device', 'name'] @@ -1866,6 +1890,8 @@ class PowerPort(CableTermination, ComponentModel): return ( self.device.identifier, self.name, + self.maximum_draw, + self.allocated_draw, self.description, ) diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index be531ef1b..e75e09076 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -4,6 +4,7 @@ {{ cp }} + {# Description #} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index e74e4f368..e8cd77857 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -5,6 +5,15 @@ {{ pp }} + {# Current draw #} + + {% if pp.allocated_draw %} + {{ pp.allocated_draw }}W{% if pp.maximum_draw %} ({{ pp.maximum_draw }}W max){% endif %} + {% elif pp.maximum_draw %} + {{ pp.maximum_draw }}W + {% endif %} + + {# Description #} {{ pp.description }} From 0ddd71fc36675ac936a29ee69113453b035f757e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 10 Apr 2019 13:05:51 -0400 Subject: [PATCH 15/21] Include draw numbers of connected power ports --- netbox/templates/dcim/device.html | 2 +- netbox/templates/dcim/inc/poweroutlet.html | 23 +++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index a2eddc15f..5e01ef413 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -629,7 +629,7 @@ Name Description Cable - Connection + Connection diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 042c9142a..f3a420c2e 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -30,14 +30,23 @@ {# Connection #} {% if po.connected_endpoint %} - - {{ po.connected_endpoint.device }} - - - {{ po.connected_endpoint }} - + {% with pp=po.connected_endpoint %} + + {{ pp.device }} + + + {{ pp }} + + + {% if pp.allocated_draw %} + {{ pp.allocated_draw }}W{% if pp.maximum_draw %} ({{ pp.maximum_draw }}W max){% endif %} + {% elif pp.maximum_draw %} + {{ pp.maximum_draw }}W + {% endif %} + + {% endwith %} {% else %} - + Not connected {% endif %} From 3d5f85c0cab0a0c5f003304b2b005bae13b97f2a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 10 Apr 2019 14:16:16 -0400 Subject: [PATCH 16/21] Add associatiton from power outlet to power port/phase --- netbox/dcim/api/serializers.py | 26 +++++++++--- netbox/dcim/api/views.py | 2 + netbox/dcim/constants.py | 8 ++++ netbox/dcim/forms.py | 33 +++++++++++++++- netbox/dcim/migrations/0072_powerfeeds.py | 22 ++++++++++- netbox/dcim/models.py | 46 +++++++++++++++++++++- netbox/templates/dcim/device.html | 1 + netbox/templates/dcim/inc/poweroutlet.html | 9 +++++ 8 files changed, 137 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index f9452cebf..402fc5e13 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -215,10 +215,16 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer): class PowerOutletTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() + power_port = PowerPortTemplateSerializer() + feed_leg = ChoiceField( + choices=POWERFEED_LEG_CHOICES, + required=False, + allow_null=True + ) class Meta: model = PowerOutletTemplate - fields = ['id', 'device_type', 'name'] + fields = ['id', 'device_type', 'name', 'power_port', 'feed_leg'] class InterfaceTemplateSerializer(ValidatedModelSerializer): @@ -372,14 +378,24 @@ class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer): class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer): device = NestedDeviceSerializer() - cable = NestedCableSerializer(read_only=True) - tags = TagListSerializerField(required=False) + power_port = NestedPowerPortSerializer() + feed_leg = ChoiceField( + choices=POWERFEED_LEG_CHOICES, + required=False, + allow_null=True + ) + cable = NestedCableSerializer( + read_only=True + ) + tags = TagListSerializerField( + required=False + ) class Meta: model = PowerOutlet fields = [ - 'id', 'device', 'name', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', - 'cable', 'tags', + 'id', 'device', 'name', 'power_port', 'feed_leg', 'description', 'connected_endpoint_type', + 'connected_endpoint', 'connection_status', 'cable', 'tags', ] diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index d4909b8e4..037a5a765 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -44,6 +44,8 @@ class DCIMFieldChoicesViewSet(FieldChoicesViewSet): (FrontPortTemplate, ['type']), (Interface, ['form_factor', 'mode']), (InterfaceTemplate, ['form_factor']), + (PowerOutlet, ['feed_leg']), + (PowerOutletTemplate, ['feed_leg']), (PowerPort, ['connection_status']), (Rack, ['outer_unit', 'status', 'type', 'width']), (RearPort, ['type']), diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index e3f4f190b..6c135254c 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -475,3 +475,11 @@ POWERFEED_STATUS_CHOICES = ( (POWERFEED_STATUS_PLANNED, 'Planned'), (POWERFEED_STATUS_FAILED, 'Failed'), ) +POWERFEED_LEG_A = 1 +POWERFEED_LEG_B = 2 +POWERFEED_LEG_C = 3 +POWERFEED_LEG_CHOICES = ( + (POWERFEED_LEG_A, 'A'), + (POWERFEED_LEG_B, 'B'), + (POWERFEED_LEG_C, 'C'), +) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index cb97f0e84..f8aa7708d 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -977,16 +977,29 @@ class PowerPortTemplateCreateForm(ComponentForm): class PowerOutletTemplateForm(BootstrapMixin, forms.ModelForm): + power_port = forms.ModelChoiceField( + queryset=PowerPortTemplate.objects.all(), + required=False + ) class Meta: model = PowerOutletTemplate fields = [ - 'device_type', 'name', + 'device_type', 'name', 'power_port', 'feed_leg', ] widgets = { 'device_type': forms.HiddenInput(), } + def __init__(self, *args, **kwargs): + + super().__init__(*args, **kwargs) + + # Limit power_port choices to current DeviceType + self.fields['power_port'].queryset = PowerPortTemplate.objects.filter( + device_type=self.parent + ) + class PowerOutletTemplateCreateForm(ComponentForm): name_pattern = ExpandableNameField( @@ -1972,6 +1985,10 @@ class PowerPortCreateForm(ComponentForm): # class PowerOutletForm(BootstrapMixin, forms.ModelForm): + power_port = forms.ModelChoiceField( + queryset=PowerPort.objects.all(), + required=False + ) tags = TagField( required=False ) @@ -1979,12 +1996,20 @@ class PowerOutletForm(BootstrapMixin, forms.ModelForm): class Meta: model = PowerOutlet fields = [ - 'device', 'name', 'description', 'tags', + 'device', 'name', 'power_port', 'feed_leg', 'description', 'tags', ] widgets = { 'device': forms.HiddenInput(), } + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + # Limit power_port choices to the local device + self.fields['power_port'].queryset = PowerPort.objects.filter( + device=self.instance.device + ) + class PowerOutletCreateForm(ComponentForm): name_pattern = ExpandableNameField( @@ -2004,6 +2029,10 @@ class PowerOutletBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): queryset=PowerOutlet.objects.all(), widget=forms.MultipleHiddenInput() ) + feed_leg = forms.ChoiceField( + choices=POWERFEED_LEG_CHOICES, + required=False, + ) description = forms.CharField( max_length=100, required=False diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index d8dcbf252..4eb43c20b 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -1,5 +1,3 @@ -# Generated by Django 2.1.7 on 2019-03-21 20:59 - import django.core.validators from django.db import migrations, models import django.db.models.deletion @@ -112,4 +110,24 @@ class Migration(migrations.Migration): name='powerfeed', unique_together={('power_panel', 'name')}, ), + migrations.AddField( + model_name='poweroutlet', + name='feed_leg', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='poweroutlet', + name='power_port', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='poweroutlets', to='dcim.PowerPort'), + ), + migrations.AddField( + model_name='poweroutlettemplate', + name='feed_leg', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='poweroutlettemplate', + name='power_port', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='poweroutlet_templates', to='dcim.PowerPortTemplate'), + ), ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 9e2be6a43..fcf3252cf 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1088,6 +1088,19 @@ class PowerOutletTemplate(ComponentTemplateModel): name = models.CharField( max_length=50 ) + power_port = models.ForeignKey( + to='dcim.PowerPortTemplate', + on_delete=models.SET_NULL, + blank=True, + null=True, + related_name='poweroutlet_templates' + ) + feed_leg = models.PositiveSmallIntegerField( + choices=POWERFEED_LEG_CHOICES, + blank=True, + null=True, + help_text="Phase (for three-phase feeds)" + ) objects = DeviceComponentManager() @@ -1098,6 +1111,14 @@ class PowerOutletTemplate(ComponentTemplateModel): def __str__(self): return self.name + def clean(self): + + # Validate power port assignment + if self.power_port and self.power_port.device_type != self.device_type: + raise ValidationError( + "Parent power port ({}) must belong to the same device type".format(self.power_port) + ) + class InterfaceTemplate(ComponentTemplateModel): """ @@ -1934,6 +1955,19 @@ class PowerOutlet(CableTermination, ComponentModel): name = models.CharField( max_length=50 ) + power_port = models.ForeignKey( + to='dcim.PowerPort', + on_delete=models.SET_NULL, + blank=True, + null=True, + related_name='poweroutlets' + ) + feed_leg = models.PositiveSmallIntegerField( + choices=POWERFEED_LEG_CHOICES, + blank=True, + null=True, + help_text="Phase (for three-phase feeds)" + ) connection_status = models.NullBooleanField( choices=CONNECTION_STATUS_CHOICES, blank=True @@ -1942,7 +1976,7 @@ class PowerOutlet(CableTermination, ComponentModel): objects = DeviceComponentManager() tags = TaggableManager(through=TaggedItem) - csv_headers = ['device', 'name', 'description'] + csv_headers = ['device', 'name', 'power_port', 'feed_leg', 'description'] class Meta: unique_together = ['device', 'name'] @@ -1957,9 +1991,19 @@ class PowerOutlet(CableTermination, ComponentModel): return ( self.device.identifier, self.name, + self.power_port.name if self.power_port else None, + self.get_feed_leg_display(), self.description, ) + def clean(self): + + # Validate power port assignment + if self.power_port and self.power_port.device != self.device: + raise ValidationError( + "Parent power port ({}) must belong to the same device".format(self.power_port) + ) + # # Interfaces diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 5e01ef413..34811c4c0 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -627,6 +627,7 @@ {% endif %} Name + Input/Leg Description Cable Connection diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index f3a420c2e..bebf677f9 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -14,6 +14,15 @@ {{ po }} + {# Power port #} + + {% if po.power_port %} + {{ po.power_port }}{% if po.feed_leg %} / {{ po.get_feed_leg_display }}{% endif %} + {% else %} + None + {% endif %} + + {# Description #} {{ po.description|placeholder }} From ac3e899f5ec5cf4979325b4c072e386c22f5fb2d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 10 Apr 2019 16:32:13 -0400 Subject: [PATCH 17/21] First stab at power utilization tracking --- netbox/dcim/models.py | 44 ++++++++++++++++++++++++++++++- netbox/templates/dcim/device.html | 43 ++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index fcf3252cf..d1f9f59f2 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -9,7 +9,7 @@ from django.contrib.postgres.fields import ArrayField, JSONField from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models -from django.db.models import Count, Q +from django.db.models import Count, Q, Sum from django.urls import reverse from mptt.models import MPTTModel, TreeForeignKey from taggit.managers import TaggableManager @@ -1938,6 +1938,41 @@ class PowerPort(CableTermination, ComponentModel): "Connected endpoint must be a PowerOutlet or PowerFeed, not {}.".format(type(value)) ) + def get_power_stats(self): + """ + Return power utilization statistics + """ + feed = self._connected_powerfeed + if not feed or not self.poweroutlets.count(): + return None + + stats = [] + powerfeed_available = self._connected_powerfeed.available_power + + outlet_ids = PowerOutlet.objects.filter(power_port=self).values_list('pk', flat=True) + utilization = PowerPort.objects.filter(_connected_poweroutlet_id__in=outlet_ids).aggregate( + maximum_draw=Sum('maximum_draw'), + allocated_draw=Sum('allocated_draw'), + ) + utilization['outlets'] = len(outlet_ids) + utilization['available_power'] = powerfeed_available + stats.append(utilization) + + # Per-leg stats for three-phase feeds + if feed.phase == POWERFEED_PHASE_3PHASE: + for leg, leg_name in POWERFEED_LEG_CHOICES: + outlet_ids = PowerOutlet.objects.filter(power_port=self, feed_leg=leg).values_list('pk', flat=True) + utilization = PowerPort.objects.filter(_connected_poweroutlet_id__in=outlet_ids).aggregate( + maximum_draw=Sum('maximum_draw'), + allocated_draw=Sum('allocated_draw'), + ) + utilization['name'] = 'Leg {}'.format(leg_name) + utilization['outlets'] = len(outlet_ids) + utilization['available_power'] = powerfeed_available / 3 + stats.append(utilization) + + return stats + # # Power outlets @@ -2923,3 +2958,10 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): def get_status_class(self): return STATUS_CLASSES[self.status] + + @property + def available_power(self): + kva = self.voltage * self.amperage * self.max_utilization + if self.phase == POWERFEED_PHASE_3PHASE: + return kva * 1.732 + return kva diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 34811c4c0..b9f283837 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -332,6 +332,49 @@ {% endif %}
    {% endif %} + {% if power_ports and poweroutlets %} +
    +
    + Power Utilization +
    + + + + + + + + {% for pp in power_ports %} + {% for leg in pp.get_power_stats %} + + {% if leg.name %} + + {% else %} + + {% endif %} + + + + + {% endfor %} + {% endfor %} +
    InputOutletsAllocated/Max (W)Available (VA)
    {{ leg.name }}{{ pp }}{{ leg.outlets|placeholder }}{{ leg.allocated_draw }} / {{ leg.maximum_draw }}{{ leg.available_power }}
    + {% if perms.dcim.add_interface or perms.dcim.add_consoleport or perms.dcim.add_powerport %} +
    + {% if perms.dcim.add_consoleport %} + + Add console port + + {% endif %} + {% if perms.dcim.add_powerport %} + + Add power port + + {% endif %} +
    + {% endif %} +
    + {% endif %} {% if request.user.is_authenticated %}
    From b22fd2bc44db3b98adf8cce41d1cf0c754c4fdf5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 10 Apr 2019 16:36:38 -0400 Subject: [PATCH 18/21] Rename max_utilization to power_factor --- netbox/dcim/api/serializers.py | 2 +- netbox/dcim/forms.py | 4 ++-- netbox/dcim/migrations/0072_powerfeeds.py | 2 +- netbox/dcim/models.py | 8 ++++---- netbox/templates/dcim/powerfeed.html | 2 +- netbox/templates/dcim/powerfeed_edit.html | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 402fc5e13..8c3364a1b 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -660,5 +660,5 @@ class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer): model = PowerFeed fields = [ 'id', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', - 'max_utilization', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + 'power_factor', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', ] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index f8aa7708d..8fcad0bfe 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3464,7 +3464,7 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): model = PowerFeed fields = [ 'site', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', - 'max_utilization', 'comments', 'tags', + 'power_factor', 'comments', 'tags', ] widgets = { 'power_panel': APISelect( @@ -3610,7 +3610,7 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd amperage = forms.IntegerField( required=False ) - max_utilization = forms.IntegerField( + power_factor = forms.IntegerField( required=False ) comments = forms.CharField( diff --git a/netbox/dcim/migrations/0072_powerfeeds.py b/netbox/dcim/migrations/0072_powerfeeds.py index 4eb43c20b..9bd24e041 100644 --- a/netbox/dcim/migrations/0072_powerfeeds.py +++ b/netbox/dcim/migrations/0072_powerfeeds.py @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('phase', models.PositiveSmallIntegerField(default=1)), ('voltage', models.PositiveSmallIntegerField(default=120, validators=[django.core.validators.MinValueValidator(1)])), ('amperage', models.PositiveSmallIntegerField(default=20, validators=[django.core.validators.MinValueValidator(1)])), - ('max_utilization', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), + ('power_factor', models.PositiveSmallIntegerField(default=80, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), ('comments', models.TextField(blank=True)), ('cable', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.Cable')), ], diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index d1f9f59f2..cdaf247c8 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2907,7 +2907,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): validators=[MinValueValidator(1)], default=20 ) - max_utilization = models.PositiveSmallIntegerField( + power_factor = models.PositiveSmallIntegerField( validators=[MinValueValidator(1), MaxValueValidator(100)], default=80, help_text="Maximum permissible draw (percentage)" @@ -2925,7 +2925,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): csv_headers = [ 'site', 'panel_name', 'rack_group', 'rack_name', 'name', 'status', 'type', 'supply', 'phase', 'voltage', - 'amperage', 'max_utilization', 'comments', + 'amperage', 'power_factor', 'comments', ] class Meta: @@ -2949,7 +2949,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): self.get_phase_display(), self.voltage, self.amperage, - self.max_utilization, + self.power_factor, self.comments, ) @@ -2961,7 +2961,7 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): @property def available_power(self): - kva = self.voltage * self.amperage * self.max_utilization + kva = self.voltage * self.amperage * self.power_factor if self.phase == POWERFEED_PHASE_3PHASE: return kva * 1.732 return kva diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index b48e2f602..0686afd20 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -119,7 +119,7 @@ Max Utilization - {{ powerfeed.max_utilization }}% + {{ powerfeed.power_factor }}%
    diff --git a/netbox/templates/dcim/powerfeed_edit.html b/netbox/templates/dcim/powerfeed_edit.html index f4b3ada46..bdfbfd77d 100644 --- a/netbox/templates/dcim/powerfeed_edit.html +++ b/netbox/templates/dcim/powerfeed_edit.html @@ -20,7 +20,7 @@ {% render_field form.voltage %} {% render_field form.amperage %} {% render_field form.phase %} - {% render_field form.max_utilization %} + {% render_field form.power_factor %}
    {% if form.custom_fields %} From 05c19af2a37eb77b648f6d4ac10d3a77cb417497 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Apr 2019 10:49:43 -0400 Subject: [PATCH 19/21] Misc cleanup --- netbox/dcim/api/views.py | 6 +++--- netbox/dcim/filters.py | 3 ++- netbox/dcim/forms.py | 24 +++++++++++++++++++++--- netbox/dcim/models.py | 16 ++++++++++++++++ netbox/templates/dcim/powerfeed.html | 3 ++- 5 files changed, 44 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 037a5a765..ee17c0062 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -544,7 +544,7 @@ class VirtualChassisViewSet(ModelViewSet): # class PowerPanelViewSet(ModelViewSet): - queryset = PowerPanel.objects.all() + queryset = PowerPanel.objects.select_related('site', 'rack_group') serializer_class = serializers.PowerPanelSerializer filterset_class = filters.PowerPanelFilter @@ -553,8 +553,8 @@ class PowerPanelViewSet(ModelViewSet): # Power feeds # -class PowerFeedViewSet(ModelViewSet): - queryset = PowerFeed.objects.all() +class PowerFeedViewSet(CustomFieldModelViewSet): + queryset = PowerFeed.objects.select_related('power_panel', 'rack').prefetch_related('tags') serializer_class = serializers.PowerFeedSerializer filterset_class = filters.PowerFeedFilter diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 581ed76bf..ea535f4f2 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -1135,10 +1135,11 @@ class PowerFeedFilter(CustomFieldFilterSet): queryset=Rack.objects.all(), label='Rack (ID)', ) + tag = TagFilter() class Meta: model = PowerFeed - fields = ['name', 'status', 'type', 'supply', 'phase'] + fields = ['name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'power_factor'] def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 8fcad0bfe..ba639a646 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -3456,6 +3456,7 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): } ) ) + comments = CommentField() tags = TagField( required=False ) @@ -3479,6 +3480,14 @@ class PowerFeedForm(BootstrapMixin, CustomFieldForm): 'phase': StaticSelect2(), } + def __init__(self, *args, **kwargs): + + super().__init__(*args, **kwargs) + + # Initialize site field + if self.instance and self.instance.power_panel: + self.initial['site'] = self.instance.power_panel.site + class PowerFeedCSVForm(forms.ModelForm): site = forms.ModelChoiceField( @@ -3573,11 +3582,11 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd } ) ) - rackgroup = forms.ModelChoiceField( - queryset=RackGroup.objects.all(), + rack = forms.ModelChoiceField( + queryset=Rack.objects.all(), required=False, widget=APISelect( - api_url="/api/dcim/rack-groups", + api_url="/api/dcim/racks", ) ) status = forms.ChoiceField( @@ -3669,3 +3678,12 @@ class PowerFeedFilterForm(BootstrapMixin, CustomFieldFilterForm): required=False, widget=StaticSelect2() ) + voltage = forms.IntegerField( + required=False + ) + amperage = forms.IntegerField( + required=False + ) + power_factor = forms.IntegerField( + required=False + ) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index cdaf247c8..020d30618 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2853,6 +2853,14 @@ class PowerPanel(ChangeLoggedModel): self.name, ) + def clean(self): + + # RackGroup must belong to assigned Site + if self.rack_group and self.rack_group.site != self.site: + raise ValidationError("Rack group {} ({}) is in a different site than {}".format( + self.rack_group, self.rack_group.site, self.site + )) + class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): """ @@ -2953,6 +2961,14 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel): self.comments, ) + def clean(self): + + # Rack must belong to same Site as PowerPanel + if self.rack and self.rack.site != self.power_panel.site: + raise ValidationError("Rack {} ({}) and power panel {} ({}) are in different sites".format( + self.rack, self.rack.site, self.power_panel, self.power_panel.site + )) + def get_type_class(self): return STATUS_CLASSES[self.type] diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 0686afd20..f2c16927b 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -8,6 +8,7 @@
    1. Power Feeds
      2. +
    2. {{ powerfeed.power_panel.site }}
    3. {{ powerfeed.power_panel }}
      4. {% if powerfeed.rack %}
    4. {{ powerfeed.rack }}
      5. @@ -118,7 +119,7 @@ {{ powerfeed.get_phase_display }} - Max Utilization + Power Factor {{ powerfeed.power_factor }}% From bfa07aec39476a4151adfed16ba15681ede2ef96 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Apr 2019 11:37:44 -0400 Subject: [PATCH 20/21] Fix tests --- netbox/dcim/api/serializers.py | 8 ++++-- netbox/dcim/api/views.py | 2 +- netbox/dcim/fixtures/dcim.json | 50 +++++++++++++++++----------------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 8c3364a1b..c31dc5c09 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -215,7 +215,9 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer): class PowerOutletTemplateSerializer(ValidatedModelSerializer): device_type = NestedDeviceTypeSerializer() - power_port = PowerPortTemplateSerializer() + power_port = PowerPortTemplateSerializer( + required=False + ) feed_leg = ChoiceField( choices=POWERFEED_LEG_CHOICES, required=False, @@ -378,7 +380,9 @@ class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer): class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer): device = NestedDeviceSerializer() - power_port = NestedPowerPortSerializer() + power_port = NestedPowerPortSerializer( + required=False + ) feed_leg = ChoiceField( choices=POWERFEED_LEG_CHOICES, required=False, diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index ee17c0062..88d604505 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -410,7 +410,7 @@ class ConsoleServerPortViewSet(CableTraceMixin, ModelViewSet): class PowerPortViewSet(CableTraceMixin, ModelViewSet): queryset = PowerPort.objects.select_related( - 'device', 'connected_endpoint__device', 'cable' + 'device', '_connected_poweroutlet__device', '_connected_powerfeed', 'cable' ).prefetch_related( 'tags' ) diff --git a/netbox/dcim/fixtures/dcim.json b/netbox/dcim/fixtures/dcim.json index 215fbb702..cdcc860e8 100644 --- a/netbox/dcim/fixtures/dcim.json +++ b/netbox/dcim/fixtures/dcim.json @@ -2667,7 +2667,7 @@ "fields": { "device": 1, "name": "PEM0", - "connected_endpoint": 25, + "_connected_poweroutlet": 25, "connection_status": true } }, @@ -2677,7 +2677,7 @@ "fields": { "device": 1, "name": "PEM1", - "connected_endpoint": 49, + "_connected_poweroutlet": 49, "connection_status": true } }, @@ -2687,7 +2687,7 @@ "fields": { "device": 1, "name": "PEM2", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2697,7 +2697,7 @@ "fields": { "device": 1, "name": "PEM3", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2707,7 +2707,7 @@ "fields": { "device": 2, "name": "PEM0", - "connected_endpoint": 26, + "_connected_poweroutlet": 26, "connection_status": true } }, @@ -2717,7 +2717,7 @@ "fields": { "device": 2, "name": "PEM1", - "connected_endpoint": 50, + "_connected_poweroutlet": 50, "connection_status": true } }, @@ -2727,7 +2727,7 @@ "fields": { "device": 2, "name": "PEM2", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2737,7 +2737,7 @@ "fields": { "device": 2, "name": "PEM3", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2747,7 +2747,7 @@ "fields": { "device": 4, "name": "PSU0", - "connected_endpoint": 28, + "_connected_poweroutlet": 28, "connection_status": true } }, @@ -2757,7 +2757,7 @@ "fields": { "device": 4, "name": "PSU1", - "connected_endpoint": 52, + "_connected_poweroutlet": 52, "connection_status": true } }, @@ -2767,7 +2767,7 @@ "fields": { "device": 5, "name": "PSU0", - "connected_endpoint": 56, + "_connected_poweroutlet": 56, "connection_status": true } }, @@ -2777,7 +2777,7 @@ "fields": { "device": 5, "name": "PSU1", - "connected_endpoint": 32, + "_connected_poweroutlet": 32, "connection_status": true } }, @@ -2787,7 +2787,7 @@ "fields": { "device": 3, "name": "PSU0", - "connected_endpoint": 27, + "_connected_poweroutlet": 27, "connection_status": true } }, @@ -2797,7 +2797,7 @@ "fields": { "device": 3, "name": "PSU1", - "connected_endpoint": 51, + "_connected_poweroutlet": 51, "connection_status": true } }, @@ -2807,7 +2807,7 @@ "fields": { "device": 7, "name": "PEM0", - "connected_endpoint": 53, + "_connected_poweroutlet": 53, "connection_status": true } }, @@ -2817,7 +2817,7 @@ "fields": { "device": 7, "name": "PEM1", - "connected_endpoint": 29, + "_connected_poweroutlet": 29, "connection_status": true } }, @@ -2827,7 +2827,7 @@ "fields": { "device": 7, "name": "PEM2", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2837,7 +2837,7 @@ "fields": { "device": 7, "name": "PEM3", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2847,7 +2847,7 @@ "fields": { "device": 8, "name": "PEM0", - "connected_endpoint": 54, + "_connected_poweroutlet": 54, "connection_status": true } }, @@ -2857,7 +2857,7 @@ "fields": { "device": 8, "name": "PEM1", - "connected_endpoint": 30, + "_connected_poweroutlet": 30, "connection_status": true } }, @@ -2867,7 +2867,7 @@ "fields": { "device": 8, "name": "PEM2", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2877,7 +2877,7 @@ "fields": { "device": 8, "name": "PEM3", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, @@ -2887,7 +2887,7 @@ "fields": { "device": 6, "name": "PSU0", - "connected_endpoint": 55, + "_connected_poweroutlet": 55, "connection_status": true } }, @@ -2897,7 +2897,7 @@ "fields": { "device": 6, "name": "PSU1", - "connected_endpoint": 31, + "_connected_poweroutlet": 31, "connection_status": true } }, @@ -2907,7 +2907,7 @@ "fields": { "device": 9, "name": "PSU", - "connected_endpoint": null, + "_connected_poweroutlet": null, "connection_status": true } }, From 3b062517202a4ae3c0b35c9d4b5582d400acd32c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Apr 2019 12:29:43 -0400 Subject: [PATCH 21/21] Added tests for power panels, power feeds --- netbox/dcim/api/nested_serializers.py | 4 +- netbox/dcim/tests/test_api.py | 261 +++++++++++++++++++++++++- 2 files changed, 261 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py index edb1bb267..16d77bd69 100644 --- a/netbox/dcim/api/nested_serializers.py +++ b/netbox/dcim/api/nested_serializers.py @@ -255,7 +255,7 @@ class NestedVirtualChassisSerializer(WritableNestedSerializer): # Power panels/feeds # -class NestedPowerPanelSerializer(serializers.ModelSerializer): +class NestedPowerPanelSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerpanel-detail') class Meta: @@ -263,7 +263,7 @@ class NestedPowerPanelSerializer(serializers.ModelSerializer): fields = ['id', 'url', 'name'] -class NestedPowerFeedSerializer(serializers.ModelSerializer): +class NestedPowerFeedSerializer(WritableNestedSerializer): url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerfeed-detail') class Meta: diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 3f9021bc6..f572047b5 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -7,8 +7,8 @@ from dcim.constants import * from dcim.models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, Interface, InterfaceTemplate, Manufacturer, - InventoryItem, Platform, PowerPort, PowerPortTemplate, PowerOutlet, PowerOutletTemplate, Rack, RackGroup, - RackReservation, RackRole, RearPort, Region, Site, VirtualChassis, + InventoryItem, Platform, PowerFeed, PowerPort, PowerPortTemplate, PowerOutlet, PowerOutletTemplate, PowerPanel, + Rack, RackGroup, RackReservation, RackRole, RearPort, Region, Site, VirtualChassis, ) from ipam.models import IPAddress, VLAN from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE @@ -3532,3 +3532,260 @@ class VirtualChassisTest(APITestCase): self.assertTrue( Device.objects.filter(pk=d.pk, virtual_chassis=None, vc_position=None, vc_priority=None) ) + + +class PowerPanelTest(APITestCase): + + def setUp(self): + + super().setUp() + + self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1') + self.rackgroup1 = RackGroup.objects.create(site=self.site1, name='Test Rack Group 1', slug='test-rack-group-1') + self.rackgroup2 = RackGroup.objects.create(site=self.site1, name='Test Rack Group 2', slug='test-rack-group-2') + self.rackgroup3 = RackGroup.objects.create(site=self.site1, name='Test Rack Group 3', slug='test-rack-group-3') + self.powerpanel1 = PowerPanel.objects.create( + site=self.site1, rack_group=self.rackgroup1, name='Test Power Panel 1' + ) + self.powerpanel2 = PowerPanel.objects.create( + site=self.site1, rack_group=self.rackgroup2, name='Test Power Panel 2' + ) + self.powerpanel3 = PowerPanel.objects.create( + site=self.site1, rack_group=self.rackgroup3, name='Test Power Panel 3' + ) + + def test_get_powerpanel(self): + + url = reverse('dcim-api:powerpanel-detail', kwargs={'pk': self.powerpanel1.pk}) + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['name'], self.powerpanel1.name) + + def test_list_powerpanels(self): + + url = reverse('dcim-api:powerpanel-list') + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['count'], 3) + + def test_list_powerpanels_brief(self): + + url = reverse('dcim-api:powerpanel-list') + response = self.client.get('{}?brief=1'.format(url), **self.header) + + self.assertEqual( + sorted(response.data['results'][0]), + ['id', 'name', 'url'] + ) + + def test_create_powerpanel(self): + + data = { + 'name': 'Test Power Panel 4', + 'site': self.site1.pk, + 'rack_group': self.rackgroup1.pk, + } + + url = reverse('dcim-api:powerpanel-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(PowerPanel.objects.count(), 4) + powerpanel4 = PowerPanel.objects.get(pk=response.data['id']) + self.assertEqual(powerpanel4.name, data['name']) + self.assertEqual(powerpanel4.site_id, data['site']) + self.assertEqual(powerpanel4.rack_group_id, data['rack_group']) + + def test_create_powerpanel_bulk(self): + + data = [ + { + 'name': 'Test Power Panel 4', + 'site': self.site1.pk, + 'rack_group': self.rackgroup1.pk, + }, + { + 'name': 'Test Power Panel 5', + 'site': self.site1.pk, + 'rack_group': self.rackgroup2.pk, + }, + { + 'name': 'Test Power Panel 6', + 'site': self.site1.pk, + 'rack_group': self.rackgroup3.pk, + }, + ] + + url = reverse('dcim-api:powerpanel-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(PowerPanel.objects.count(), 6) + self.assertEqual(response.data[0]['name'], data[0]['name']) + self.assertEqual(response.data[1]['name'], data[1]['name']) + self.assertEqual(response.data[2]['name'], data[2]['name']) + + def test_update_powerpanel(self): + + data = { + 'name': 'Test Power Panel X', + 'rack_group': self.rackgroup2.pk, + } + + url = reverse('dcim-api:powerpanel-detail', kwargs={'pk': self.powerpanel1.pk}) + response = self.client.patch(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_200_OK) + self.assertEqual(PowerPanel.objects.count(), 3) + powerpanel1 = PowerPanel.objects.get(pk=response.data['id']) + self.assertEqual(powerpanel1.name, data['name']) + self.assertEqual(powerpanel1.rack_group_id, data['rack_group']) + + def test_delete_powerpanel(self): + + url = reverse('dcim-api:powerpanel-detail', kwargs={'pk': self.powerpanel1.pk}) + response = self.client.delete(url, **self.header) + + self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) + self.assertEqual(PowerPanel.objects.count(), 2) + + +class PowerFeedTest(APITestCase): + + def setUp(self): + + super().setUp() + + self.site1 = Site.objects.create(name='Test Site 1', slug='test-site-1') + self.rackgroup1 = RackGroup.objects.create(site=self.site1, name='Test Rack Group 1', slug='test-rack-group-1') + self.rackrole1 = RackRole.objects.create(name='Test Rack Role 1', slug='test-rack-role-1', color='ff0000') + self.rack1 = Rack.objects.create( + site=self.site1, group=self.rackgroup1, role=self.rackrole1, name='Test Rack 1', u_height=42, + ) + self.rack2 = Rack.objects.create( + site=self.site1, group=self.rackgroup1, role=self.rackrole1, name='Test Rack 2', u_height=42, + ) + self.rack3 = Rack.objects.create( + site=self.site1, group=self.rackgroup1, role=self.rackrole1, name='Test Rack 3', u_height=42, + ) + self.rack4 = Rack.objects.create( + site=self.site1, group=self.rackgroup1, role=self.rackrole1, name='Test Rack 4', u_height=42, + ) + self.powerpanel1 = PowerPanel.objects.create( + site=self.site1, rack_group=self.rackgroup1, name='Test Power Panel 1' + ) + self.powerpanel2 = PowerPanel.objects.create( + site=self.site1, rack_group=self.rackgroup1, name='Test Power Panel 2' + ) + self.powerfeed1 = PowerFeed.objects.create( + power_panel=self.powerpanel1, rack=self.rack1, name='Test Power Feed 1A', type=POWERFEED_TYPE_PRIMARY + ) + self.powerfeed2 = PowerFeed.objects.create( + power_panel=self.powerpanel2, rack=self.rack1, name='Test Power Feed 1B', type=POWERFEED_TYPE_REDUNDANT + ) + self.powerfeed3 = PowerFeed.objects.create( + power_panel=self.powerpanel1, rack=self.rack2, name='Test Power Feed 2A', type=POWERFEED_TYPE_PRIMARY + ) + self.powerfeed4 = PowerFeed.objects.create( + power_panel=self.powerpanel2, rack=self.rack2, name='Test Power Feed 2B', type=POWERFEED_TYPE_REDUNDANT + ) + self.powerfeed5 = PowerFeed.objects.create( + power_panel=self.powerpanel1, rack=self.rack3, name='Test Power Feed 3A', type=POWERFEED_TYPE_PRIMARY + ) + self.powerfeed6 = PowerFeed.objects.create( + power_panel=self.powerpanel2, rack=self.rack3, name='Test Power Feed 3B', type=POWERFEED_TYPE_REDUNDANT + ) + + def test_get_powerfeed(self): + + url = reverse('dcim-api:powerfeed-detail', kwargs={'pk': self.powerfeed1.pk}) + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['name'], self.powerfeed1.name) + + def test_list_powerfeeds(self): + + url = reverse('dcim-api:powerfeed-list') + response = self.client.get(url, **self.header) + + self.assertEqual(response.data['count'], 6) + + def test_list_powerfeeds_brief(self): + + url = reverse('dcim-api:powerfeed-list') + response = self.client.get('{}?brief=1'.format(url), **self.header) + + self.assertEqual( + sorted(response.data['results'][0]), + ['id', 'name', 'url'] + ) + + def test_create_powerfeed(self): + + data = { + 'name': 'Test Power Feed 4A', + 'power_panel': self.powerpanel1.pk, + 'rack': self.rack4.pk, + 'type': POWERFEED_TYPE_PRIMARY, + } + + url = reverse('dcim-api:powerfeed-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(PowerFeed.objects.count(), 7) + powerfeed4 = PowerFeed.objects.get(pk=response.data['id']) + self.assertEqual(powerfeed4.name, data['name']) + self.assertEqual(powerfeed4.power_panel_id, data['power_panel']) + self.assertEqual(powerfeed4.rack_id, data['rack']) + + def test_create_powerfeed_bulk(self): + + data = [ + { + 'name': 'Test Power Feed 4A', + 'power_panel': self.powerpanel1.pk, + 'rack': self.rack4.pk, + 'type': POWERFEED_TYPE_PRIMARY, + }, + { + 'name': 'Test Power Feed 4B', + 'power_panel': self.powerpanel1.pk, + 'rack': self.rack4.pk, + 'type': POWERFEED_TYPE_REDUNDANT, + }, + ] + + url = reverse('dcim-api:powerfeed-list') + response = self.client.post(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_201_CREATED) + self.assertEqual(PowerFeed.objects.count(), 8) + self.assertEqual(response.data[0]['name'], data[0]['name']) + self.assertEqual(response.data[1]['name'], data[1]['name']) + + def test_update_powerfeed(self): + + data = { + 'name': 'Test Power Feed X', + 'rack': self.rack4.pk, + 'type': POWERFEED_TYPE_REDUNDANT, + } + + url = reverse('dcim-api:powerfeed-detail', kwargs={'pk': self.powerfeed1.pk}) + response = self.client.patch(url, data, format='json', **self.header) + + self.assertHttpStatus(response, status.HTTP_200_OK) + self.assertEqual(PowerFeed.objects.count(), 6) + powerfeed1 = PowerFeed.objects.get(pk=response.data['id']) + self.assertEqual(powerfeed1.name, data['name']) + self.assertEqual(powerfeed1.rack_id, data['rack']) + self.assertEqual(powerfeed1.type, data['type']) + + def test_delete_powerfeed(self): + + url = reverse('dcim-api:powerfeed-detail', kwargs={'pk': self.powerfeed1.pk}) + response = self.client.delete(url, **self.header) + + self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT) + self.assertEqual(PowerFeed.objects.count(), 5)