From db807ab4a6f5d0ff9ff84ae39b5f18688bb19a1a Mon Sep 17 00:00:00 2001
From: Hunter Johnston <64506580+huntabyte@users.noreply.github.com>
Date: Thu, 23 Jun 2022 14:16:09 -0400
Subject: [PATCH] Closes #7702: Add power feed defaults to user configurations

---
 netbox/dcim/models/power.py |  7 ++++---
 netbox/dcim/urls.py         |  2 +-
 netbox/dcim/views.py        | 12 ------------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/netbox/dcim/models/power.py b/netbox/dcim/models/power.py
index 08f89e3b0..5316951c6 100644
--- a/netbox/dcim/models/power.py
+++ b/netbox/dcim/models/power.py
@@ -6,6 +6,7 @@ from django.urls import reverse
 
 from dcim.choices import *
 from dcim.constants import *
+from netbox.config import ConfigItem
 from netbox.models import NetBoxModel
 from utilities.validators import ExclusionValidator
 from .device_components import LinkTermination, PathEndpoint
@@ -105,16 +106,16 @@ class PowerFeed(NetBoxModel, PathEndpoint, LinkTermination):
         default=PowerFeedPhaseChoices.PHASE_SINGLE
     )
     voltage = models.SmallIntegerField(
-        default=POWERFEED_VOLTAGE_DEFAULT,
+        default=ConfigItem('POWERFEED_DEFAULT_VOLTAGE')
         validators=[ExclusionValidator([0])]
     )
     amperage = models.PositiveSmallIntegerField(
         validators=[MinValueValidator(1)],
-        default=POWERFEED_AMPERAGE_DEFAULT
+        default=ConfigItem('POWERFEED_DEFAULT_AMPERAGE')
     )
     max_utilization = models.PositiveSmallIntegerField(
         validators=[MinValueValidator(1), MaxValueValidator(100)],
-        default=POWERFEED_MAX_UTILIZATION_DEFAULT,
+        default=ConfigItem('POWERFEED_DEFAULT_MAX_UTILIZATION')
         help_text="Maximum permissible draw (percentage)"
     )
     available_power = models.PositiveIntegerField(
diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 82ea3fec0..c5cd0fa65 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -489,7 +489,7 @@ urlpatterns = [
 
     # Power feeds
     path('power-feeds/', views.PowerFeedListView.as_view(), name='powerfeed_list'),
-    path('power-feeds/add/', views.PowerFeedCreateView.as_view(), name='powerfeed_add'),
+    path('power-feeds/add/', views.PowerFeedEditView.as_view(), name='powerfeed_add'),
     path('power-feeds/import/', views.PowerFeedBulkImportView.as_view(), name='powerfeed_import'),
     path('power-feeds/edit/', views.PowerFeedBulkEditView.as_view(), name='powerfeed_bulk_edit'),
     path('power-feeds/disconnect/', views.PowerFeedBulkDisconnectView.as_view(), name='powerfeed_bulk_disconnect'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 0716f595e..35a1056b2 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -16,7 +16,6 @@ from circuits.models import Circuit
 from extras.views import ObjectConfigContextView
 from ipam.models import ASN, IPAddress, Prefix, Service, VLAN, VLANGroup
 from ipam.tables import AssignedIPAddressesTable, InterfaceVLANTable
-from netbox.config import ConfigItem
 from netbox.views import generic
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator, get_paginate_count
@@ -3254,17 +3253,6 @@ class PowerFeedView(generic.ObjectView):
     queryset = PowerFeed.objects.prefetch_related('power_panel', 'rack')
 
 
-class PowerFeedCreateView(generic.ObjectEditView):
-    queryset = PowerFeed.objects.all()
-    form = forms.PowerFeedForm
-
-    def alter_object(self, obj, request, args, kwargs):
-        obj.voltage = ConfigItem('POWERFEED_DEFAULT_VOLTAGE')
-        obj.amperage = ConfigItem('POWERFEED_DEFAULT_AMPERAGE')
-        obj.max_utilization = ConfigItem('POWERFEED_DEFAULT_MAX_UTILIZATION')
-        return obj
-
-
 class PowerFeedEditView(generic.ObjectEditView):
     queryset = PowerFeed.objects.all()
     form = forms.PowerFeedForm