nautobot 2.4.14__py3-none-any.whl → 2.4.15__py3-none-any.whl

nautobot/dcim/forms.py

@@ -88,11 +88,14 @@ from .choices import (
     InterfaceTypeChoices,
     LocationDataToContactActionChoices,
     PortTypeChoices,
+    PowerFeedBreakerPoleChoices,
     PowerFeedPhaseChoices,
     PowerFeedSupplyChoices,
     PowerFeedTypeChoices,
     PowerOutletFeedLegChoices,
     PowerOutletTypeChoices,
+    PowerPanelTypeChoices,
+    PowerPathChoices,
     PowerPortTypeChoices,
     RackDimensionUnitChoices,
     RackTypeChoices,
@@ -1292,6 +1295,7 @@ class PowerPortTemplateForm(ModularComponentTemplateForm):
             "type",
             "maximum_draw",
             "allocated_draw",
+            "power_factor",
             "description",
         ]
 
@@ -1300,6 +1304,15 @@ class PowerPortTemplateCreateForm(ModularComponentTemplateCreateForm):
     type = forms.ChoiceField(choices=add_blank_choice(PowerPortTypeChoices), required=False)
     maximum_draw = forms.IntegerField(min_value=1, required=False, help_text="Maximum power draw (watts)")
     allocated_draw = forms.IntegerField(min_value=1, required=False, help_text="Allocated power draw (watts)")
+    power_factor = forms.DecimalField(
+        max_digits=4,
+        decimal_places=2,
+        min_value=0.01,
+        max_value=1.00,
+        required=False,
+        initial=0.95,
+        help_text="Power factor (0.01-1.00) for converting between watts (W) and volt-amps (VA).",
+    )
     field_order = (
         "device_type",
         "module_family",
@@ -1309,7 +1322,9 @@ class PowerPortTemplateCreateForm(ModularComponentTemplateCreateForm):
         "type",
         "maximum_draw",
         "allocated_draw",
+        "power_factor",
         "description",
+        "tags",
     )
 
 
@@ -1323,6 +1338,14 @@ class PowerPortTemplateBulkEditForm(NautobotBulkEditForm):
     )
     maximum_draw = forms.IntegerField(min_value=1, required=False, help_text="Maximum power draw (watts)")
     allocated_draw = forms.IntegerField(min_value=1, required=False, help_text="Allocated power draw (watts)")
+    power_factor = forms.DecimalField(
+        max_digits=4,
+        decimal_places=2,
+        min_value=0.01,
+        max_value=1.00,
+        required=False,
+        help_text="Power factor (0.01-1.00) for converting between watts and VA.",
+    )
     description = forms.CharField(required=False)
 
     class Meta:
@@ -1898,6 +1921,7 @@ class PowerPortTemplateImportForm(ComponentTemplateImportForm):
             "type",
             "maximum_draw",
             "allocated_draw",
+            "power_factor",
         ]
 
 
@@ -2906,6 +2930,7 @@ class PowerPortForm(ModularComponentEditForm):
             "type",
             "maximum_draw",
             "allocated_draw",
+            "power_factor",
             "description",
             "tags",
         ]
@@ -2919,6 +2944,15 @@ class PowerPortCreateForm(ModularComponentCreateForm):
     )
     maximum_draw = forms.IntegerField(min_value=1, required=False, help_text="Maximum draw in watts")
     allocated_draw = forms.IntegerField(min_value=1, required=False, help_text="Allocated draw in watts")
+    power_factor = forms.DecimalField(
+        max_digits=4,
+        decimal_places=2,
+        min_value=0.01,
+        max_value=1.00,
+        required=False,
+        initial=0.95,
+        help_text="Power factor (0.01-1.00) for converting between watts and VA.",
+    )
     field_order = (
         "device",
         "module_family",
@@ -2928,13 +2962,14 @@ class PowerPortCreateForm(ModularComponentCreateForm):
         "type",
         "maximum_draw",
         "allocated_draw",
+        "power_factor",
         "description",
         "tags",
     )
 
 
 class PowerPortBulkCreateForm(
-    form_from_model(PowerPort, ["type", "maximum_draw", "allocated_draw", "tags"]),
+    form_from_model(PowerPort, ["type", "maximum_draw", "allocated_draw", "power_factor", "tags"]),
     DeviceBulkAddComponentForm,
 ):
     field_order = (
@@ -2943,13 +2978,14 @@ class PowerPortBulkCreateForm(
         "type",
         "maximum_draw",
         "allocated_draw",
+        "power_factor",
         "description",
         "tags",
     )
 
 
 class ModulePowerPortBulkCreateForm(
-    form_from_model(PowerPort, ["type", "maximum_draw", "allocated_draw", "tags"]),
+    form_from_model(PowerPort, ["type", "maximum_draw", "allocated_draw", "power_factor", "tags"]),
     ModuleBulkAddComponentForm,
 ):
     field_order = (
@@ -2958,13 +2994,14 @@ class ModulePowerPortBulkCreateForm(
         "type",
         "maximum_draw",
         "allocated_draw",
+        "power_factor",
         "description",
         "tags",
     )
 
 
 class PowerPortBulkEditForm(
-    form_from_model(PowerPort, ["label", "type", "maximum_draw", "allocated_draw", "description"]),
+    form_from_model(PowerPort, ["label", "type", "maximum_draw", "allocated_draw", "power_factor", "description"]),
     TagsBulkEditFormMixin,
     NautobotBulkEditForm,
 ):
@@ -4638,8 +4675,15 @@ class PowerPanelForm(LocatableModelFormMixin, NautobotModelForm):
             "location",
             "rack_group",
             "name",
+            "panel_type",
+            "breaker_position_count",
+            "power_path",
             "tags",
         ]
+        widgets = {
+            "panel_type": StaticSelect2(),
+            "power_path": StaticSelect2(),
+        }
 
 
 class PowerPanelBulkEditForm(
@@ -4653,6 +4697,18 @@ class PowerPanelBulkEditForm(
         required=False,
         query_params={"location": "$location"},
     )
+    panel_type = forms.ChoiceField(
+        choices=add_blank_choice(PowerPanelTypeChoices),
+        required=False,
+        widget=StaticSelect2(),
+    )
+    breaker_position_count = forms.IntegerField(required=False, min_value=1)
+    power_path = forms.ChoiceField(
+        choices=add_blank_choice(PowerPathChoices),
+        required=False,
+        initial="",
+        widget=StaticSelect2(),
+    )
 
     class Meta:
         model = PowerPanel
@@ -4669,6 +4725,18 @@ class PowerPanelFilterForm(NautobotFilterForm, LocatableModelFilterFormMixin):
         null_option="None",
         query_params={"location": "$location"},
     )
+    panel_type = forms.MultipleChoiceField(
+        choices=add_blank_choice(PowerPanelTypeChoices),
+        required=False,
+        widget=StaticSelect2Multiple(),
+    )
+    breaker_position_count = forms.IntegerField(required=False, min_value=1)
+    power_path = forms.ChoiceField(
+        choices=add_blank_choice(PowerPathChoices),
+        required=False,
+        initial="",
+        widget=StaticSelect2(),
+    )
     tags = TagFilterField(model)
 
 
@@ -4683,41 +4751,56 @@ class PowerFeedForm(NautobotModelForm):
         required=False,
         initial_params={"power_panels": "$power_panel"},
     )
-    power_panel = DynamicModelChoiceField(queryset=PowerPanel.objects.all(), query_params={"location": "$location"})
+    power_panel = DynamicModelChoiceField(
+        queryset=PowerPanel.objects.all(),
+        query_params={"location": "$location"},
+    )
+    destination_panel = DynamicModelChoiceField(
+        queryset=PowerPanel.objects.all(),
+        required=False,
+        query_params={"location": "$location"},
+    )
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         required=False,
         query_params={"location": "$location"},
     )
-    comments = CommentField()
+    comments = CommentField(label="Comments")
 
     class Meta:
         model = PowerFeed
         fields = [
             "location",
             "power_panel",
+            "destination_panel",
             "rack",
             "name",
             "status",
             "type",
+            "power_path",
             "supply",
             "phase",
             "voltage",
             "amperage",
             "max_utilization",
+            "breaker_position",
+            "breaker_pole_count",
             "comments",
             "tags",
         ]
         widgets = {
             "type": StaticSelect2(),
+            "power_path": StaticSelect2(),
             "supply": StaticSelect2(),
             "phase": StaticSelect2(),
+            "breaker_pole_count": StaticSelect2(),
         }
 
 
 class PowerFeedBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=PowerFeed.objects.all(), widget=forms.MultipleHiddenInput)
     power_panel = DynamicModelChoiceField(queryset=PowerPanel.objects.all(), required=False)
+    destination_panel = DynamicModelChoiceField(queryset=PowerPanel.objects.all(), required=False)
     rack = DynamicModelChoiceField(queryset=Rack.objects.all(), required=False)
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerFeedTypeChoices),
@@ -4725,6 +4808,12 @@ class PowerFeedBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFormMixin,
         initial="",
         widget=StaticSelect2(),
     )
+    power_path = forms.ChoiceField(
+        choices=add_blank_choice(PowerPathChoices),
+        required=False,
+        initial="",
+        widget=StaticSelect2(),
+    )
     supply = forms.ChoiceField(
         choices=add_blank_choice(PowerFeedSupplyChoices),
         required=False,
@@ -4740,6 +4829,12 @@ class PowerFeedBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFormMixin,
     voltage = forms.IntegerField(required=False)
     amperage = forms.IntegerField(required=False)
     max_utilization = forms.IntegerField(required=False)
+    breaker_position = forms.IntegerField(required=False, min_value=1)
+    breaker_pole_count = forms.ChoiceField(
+        choices=add_blank_choice(PowerFeedBreakerPoleChoices),
+        required=False,
+        widget=StaticSelect2(),
+    )
     comments = CommentField(widget=SmallTextarea, label="Comments")
 
     class Meta:
@@ -4748,10 +4843,9 @@ class PowerFeedBulkEditForm(TagsBulkEditFormMixin, StatusModelBulkEditFormMixin,
         ]
 
 
-class PowerFeedFilterForm(NautobotFilterForm, StatusModelFilterFormMixin):
+class PowerFeedFilterForm(NautobotFilterForm, StatusModelFilterFormMixin, LocatableModelFilterFormMixin):
     model = PowerFeed
     q = forms.CharField(required=False, label="Search")
-    location = DynamicModelMultipleChoiceField(queryset=Location.objects.all(), to_field_name="name", required=False)
     power_panel = DynamicModelMultipleChoiceField(
         queryset=PowerPanel.objects.all(),
         required=False,
@@ -4759,6 +4853,13 @@ class PowerFeedFilterForm(NautobotFilterForm, StatusModelFilterFormMixin):
         null_option="None",
         query_params={"location": "$location"},
     )
+    destination_panel = DynamicModelMultipleChoiceField(
+        queryset=PowerPanel.objects.all(),
+        required=False,
+        label="Destination panel",
+        null_option="None",
+        query_params={"location": "$location"},
+    )
     rack = DynamicModelMultipleChoiceField(
         queryset=Rack.objects.all(),
         required=False,
@@ -4771,6 +4872,12 @@ class PowerFeedFilterForm(NautobotFilterForm, StatusModelFilterFormMixin):
         required=False,
         widget=StaticSelect2(),
     )
+    power_path = forms.ChoiceField(
+        choices=add_blank_choice(PowerPathChoices),
+        required=False,
+        initial="",
+        widget=StaticSelect2(),
+    )
     supply = forms.ChoiceField(
         choices=add_blank_choice(PowerFeedSupplyChoices),
         required=False,
@@ -4784,6 +4891,12 @@ class PowerFeedFilterForm(NautobotFilterForm, StatusModelFilterFormMixin):
     voltage = forms.IntegerField(required=False)
     amperage = forms.IntegerField(required=False)
     max_utilization = forms.IntegerField(required=False)
+    breaker_position = forms.IntegerField(required=False, min_value=1)
+    breaker_pole_count = forms.ChoiceField(
+        choices=add_blank_choice(PowerFeedBreakerPoleChoices),
+        required=False,
+        widget=StaticSelect2(),
+    )
     tags = TagFilterField(model)
 
 

nautobot/dcim/management/commands/trace_paths.py

@@ -47,7 +47,7 @@ class Command(BaseCommand):
         Draw a simple progress bar 20 increments wide illustrating the specified percentage.
         """
         bar_size = int(percentage / 5)
-        self.stdout.write(f"\r  [{'#' * bar_size}{' ' * (20-bar_size)}] {int(percentage)}%", ending="")
+        self.stdout.write(f"\r  [{'#' * bar_size}{' ' * (20 - bar_size)}] {int(percentage)}%", ending="")
 
     def handle(self, *model_names, **options):
         # If --force was passed, first delete all existing CablePaths

nautobot/dcim/migrations/0072_alter_powerfeed_options_and_more.py

@@ -0,0 +1,97 @@
+# Generated by Django 4.2.23 on 2025-08-11 21:07
+
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("dcim", "0071_alter_consoleport_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="powerfeed",
+            options={"ordering": ["power_panel", "breaker_position", "name"]},
+        ),
+        migrations.AlterUniqueTogether(
+            name="powerfeed",
+            unique_together={("power_panel", "name")},
+        ),
+        migrations.AddField(
+            model_name="powerfeed",
+            name="breaker_pole_count",
+            field=models.PositiveSmallIntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="powerfeed",
+            name="breaker_position",
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="powerfeed",
+            name="destination_panel",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="feeders",
+                to="dcim.powerpanel",
+            ),
+        ),
+        migrations.AddField(
+            model_name="powerfeed",
+            name="power_path",
+            field=models.CharField(blank=True, max_length=20),
+        ),
+        migrations.AddField(
+            model_name="powerpanel",
+            name="breaker_position_count",
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="powerpanel",
+            name="panel_type",
+            field=models.CharField(blank=True, max_length=30),
+        ),
+        migrations.AddField(
+            model_name="powerpanel",
+            name="power_path",
+            field=models.CharField(blank=True, max_length=20),
+        ),
+        migrations.AddField(
+            model_name="powerport",
+            name="power_factor",
+            field=models.DecimalField(
+                decimal_places=2,
+                default="0.95",
+                max_digits=4,
+                validators=[
+                    django.core.validators.MinValueValidator(0.01),
+                    django.core.validators.MaxValueValidator(1.0),
+                ],
+            ),
+        ),
+        migrations.AddField(
+            model_name="powerporttemplate",
+            name="power_factor",
+            field=models.DecimalField(
+                decimal_places=2,
+                default="0.95",
+                max_digits=4,
+                validators=[
+                    django.core.validators.MinValueValidator(0.01),
+                    django.core.validators.MaxValueValidator(1.0),
+                ],
+            ),
+        ),
+        migrations.AlterUniqueTogether(
+            name="powerfeed",
+            unique_together={("power_panel", "breaker_position"), ("power_panel", "name")},
+        ),
+        migrations.AddIndex(
+            model_name="powerfeed",
+            index=models.Index(fields=["power_panel", "breaker_position"], name="dcim_powerf_power_p_b4d96d_idx"),
+        ),
+    ]

nautobot/dcim/models/device_component_templates.py

@@ -249,6 +249,13 @@ class PowerPortTemplate(ModularComponentTemplateModel):
         validators=[MinValueValidator(1)],
         help_text="Allocated power draw (watts)",
     )
+    power_factor = models.DecimalField(
+        max_digits=4,
+        decimal_places=2,
+        default="0.95",
+        validators=[MinValueValidator(0.01), MaxValueValidator(1.00)],
+        help_text="Power factor (0.01-1.00) for converting between watts (W) and volt-amps (VA). Defaults to 0.95.",
+    )
 
     def instantiate(self, device, module=None):
         return self.instantiate_model(
@@ -258,6 +265,7 @@ class PowerPortTemplate(ModularComponentTemplateModel):
             type=self.type,
             maximum_draw=self.maximum_draw,
             allocated_draw=self.allocated_draw,
+            power_factor=self.power_factor,
         )
 
     def clean(self):

nautobot/dcim/models/device_components.py

@@ -36,6 +36,7 @@ from nautobot.dcim.constants import (
     VIRTUAL_IFACE_TYPES,
     WIRELESS_IFACE_TYPES,
 )
+from nautobot.dcim.utils import convert_watts_to_va
 from nautobot.extras.models import (
     ChangeLoggedModel,
     RelationshipModel,
@@ -398,6 +399,13 @@ class PowerPort(ModularComponentModel, CableTermination, PathEndpoint):
         validators=[MinValueValidator(1)],
         help_text="Allocated power draw (watts)",
     )
+    power_factor = models.DecimalField(
+        max_digits=4,
+        decimal_places=2,
+        default="0.95",
+        validators=[MinValueValidator(0.01), MaxValueValidator(1.00)],
+        help_text="Power factor (0.01-1.00) for converting between watts (W) and volt-amps (VA). Defaults to 0.95.",
+    )
 
     def clean(self):
         super().clean()
@@ -422,16 +430,19 @@ class PowerPort(ModularComponentModel, CableTermination, PathEndpoint):
                 maximum_draw_total=Sum("maximum_draw"),
                 allocated_draw_total=Sum("allocated_draw"),
             )
-            numerator = utilization["allocated_draw_total"] or 0
-            denominator = utilization["maximum_draw_total"] or 0
+
+            # Convert watts to VA for aggregated values
+            allocated_va = convert_watts_to_va(utilization["allocated_draw_total"], self.power_factor)
+            maximum_va = convert_watts_to_va(utilization["maximum_draw_total"], self.power_factor)
+
             ret = {
-                "allocated": utilization["allocated_draw_total"] or 0,
-                "maximum": utilization["maximum_draw_total"] or 0,
+                "allocated": allocated_va,
+                "maximum": maximum_va,
                 "outlet_count": len(outlet_ids),
                 "legs": [],
                 "utilization_data": UtilizationData(
-                    numerator=numerator,
-                    denominator=denominator,
+                    numerator=allocated_va,
+                    denominator=maximum_va,
                 ),
             }
 
@@ -446,11 +457,16 @@ class PowerPort(ModularComponentModel, CableTermination, PathEndpoint):
                         maximum_draw_total=Sum("maximum_draw"),
                         allocated_draw_total=Sum("allocated_draw"),
                     )
+
+                    # Convert watts to VA for leg values
+                    leg_allocated_va = convert_watts_to_va(utilization["allocated_draw_total"], self.power_factor)
+                    leg_maximum_va = convert_watts_to_va(utilization["maximum_draw_total"], self.power_factor)
+
                     ret["legs"].append(
                         {
                             "name": leg_name,
-                            "allocated": utilization["allocated_draw_total"] or 0,
-                            "maximum": utilization["maximum_draw_total"] or 0,
+                            "allocated": leg_allocated_va,
+                            "maximum": leg_maximum_va,
                             "outlet_count": len(outlet_ids),
                         }
                     )
@@ -462,13 +478,16 @@ class PowerPort(ModularComponentModel, CableTermination, PathEndpoint):
         else:
             denominator = 0
 
-        # Default to administratively defined values
+        # Convert administratively defined values from watts to VA
+        allocated_va = convert_watts_to_va(self.allocated_draw, self.power_factor)
+        maximum_va = convert_watts_to_va(self.maximum_draw, self.power_factor)
+
         return {
-            "allocated": self.allocated_draw or 0,
-            "maximum": self.maximum_draw or 0,
+            "allocated": allocated_va,
+            "maximum": maximum_va,
             "outlet_count": PowerOutlet.objects.filter(power_port=self).count(),
             "legs": [],
-            "utilization_data": UtilizationData(numerator=self.allocated_draw or 0, denominator=denominator),
+            "utilization_data": UtilizationData(numerator=allocated_va, denominator=denominator),
         }
 
 

nautobot/dcim/models/devices.py

@@ -829,7 +829,7 @@ class Device(PrimaryModel, ConfigContextModel):
             if existing_virtual_chassis and existing_virtual_chassis.master == self:
                 raise ValidationError(
                     {
-                        "virtual_chassis": f"The master device for the virtual chassis ({ existing_virtual_chassis}) may not be removed"
+                        "virtual_chassis": f"The master device for the virtual chassis ({existing_virtual_chassis}) may not be removed"
                     }
                 )