nautobot 2.3.0__py3-none-any.whl → 2.3.0b1__py3-none-any.whl

nautobot/core/views/generic.py

@@ -586,7 +586,6 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
 
         if form.is_valid():
             logger.debug("Form validation was successful")
-            msg = f"Deleted {self.queryset.model._meta.verbose_name} {obj}"
 
             try:
                 obj.delete()
@@ -595,6 +594,7 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                 handle_protectederror([obj], request, e)
                 return redirect(obj.get_absolute_url())
 
+            msg = f"Deleted {self.queryset.model._meta.verbose_name} {obj}"
             logger.info(msg)
             messages.success(request, msg)
 

nautobot/core/views/mixins.py

@@ -745,8 +745,8 @@ class ObjectDestroyViewMixin(NautobotViewSetMixin, mixins.DestroyModelMixin):
         queryset = self.get_queryset()
         try:
             with transaction.atomic():
-                msg = f"Deleted {queryset.model._meta.verbose_name} {obj}"
                 obj.delete()
+                msg = f"Deleted {queryset.model._meta.verbose_name} {obj}"
                 self.logger.info(msg)
                 messages.success(request, msg)
                 self.success_url = self.get_return_url(request, obj)

nautobot/core/views/utils.py

@@ -360,14 +360,12 @@ def common_detail_view_context(request, instance):
 
     if instance.is_metadata_associable_model:
         paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
-        object_metadata = instance.associated_object_metadata.restrict(request.user, "view").order_by(
-            "metadata_type", "scoped_fields"
-        )
-        object_metadata_table = ObjectMetadataTable(object_metadata, orderable=False)
-        object_metadata_table.columns.hide("assigned_object")
-        RequestConfig(request, paginate).configure(object_metadata_table)
-        context["associated_object_metadata_table"] = object_metadata_table
+        object_metadatas = instance.associated_object_metadatas.restrict(request.user, "view").order_by("scoped_fields")
+        object_metadatas_table = ObjectMetadataTable(object_metadatas, orderable=False)
+        object_metadatas_table.columns.hide("assigned_object")
+        RequestConfig(request, paginate).configure(object_metadatas_table)
+        context["associated_object_metadatas_table"] = object_metadatas_table
     else:
-        context["associated_object_metadata_table"] = None
+        context["associated_object_metadatas_table"] = None
 
     return context

nautobot/dcim/factory.py

@@ -760,16 +760,13 @@ module_types = (
 class ModuleTypeFactory(PrimaryModelFactory):
     class Meta:
         model = ModuleType
-        exclude = ("has_part_number", "has_comments")
+        exclude = ("has_part_number",)
 
     manufacturer = random_instance(Manufacturer, allow_null=False)
 
     has_part_number = NautobotBoolIterator()
     part_number = factory.Maybe("has_part_number", factory.Faker("ean", length=8), "")
 
-    has_comments = NautobotBoolIterator()
-    comments = factory.Maybe("has_comments", factory.Faker("bs"))
-
     @factory.lazy_attribute
     def model(self):
         """

nautobot/dcim/filters/__init__.py

@@ -1999,10 +1999,6 @@ class ModuleTypeFilterSet(DeviceTypeModuleTypeCommonFiltersMixin, NautobotFilter
                 "lookup_expr": "icontains",
                 "preprocessor": str.strip,
             },
-            "comments": {
-                "lookup_expr": "icontains",
-                "preprocessor": str.strip,
-            },
         },
     )
     has_modules = RelatedMembershipBooleanFilter(

nautobot/dcim/forms.py

@@ -886,7 +886,6 @@ class DeviceTypeBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     software_image_files = DynamicModelMultipleChoiceField(queryset=SoftwareImageFile.objects.all(), required=False)
     u_height = forms.IntegerField(required=False)
     is_full_depth = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect(), label="Is full depth")
-    comments = CommentField(label="Comments", required=False)
 
     class Meta:
         nullable_fields = ["device_family", "software_image_files"]
@@ -947,7 +946,6 @@ class DeviceTypeFilterForm(NautobotFilterForm):
 
 class ModuleTypeForm(NautobotModelForm):
     manufacturer = DynamicModelChoiceField(queryset=Manufacturer.objects.all())
-    comments = CommentField(label="Comments")
 
     class Meta:
         model = ModuleType
@@ -955,7 +953,6 @@ class ModuleTypeForm(NautobotModelForm):
             "manufacturer",
             "model",
             "part_number",
-            "comments",
             "tags",
         ]
 
@@ -977,7 +974,6 @@ class ModuleTypeImportForm(BootstrapMixin, forms.ModelForm):
             "manufacturer",
             "model",
             "part_number",
-            "comments",
         ]
 
 
@@ -985,7 +981,6 @@ class ModuleTypeBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=ModuleType.objects.all(), widget=forms.MultipleHiddenInput())
     manufacturer = DynamicModelChoiceField(queryset=Manufacturer.objects.all(), required=False)
     part_number = forms.CharField(required=False)
-    comments = CommentField(label="Comments", required=False)
 
     class Meta:
         nullable_fields = []

nautobot/dcim/migrations/0061_module_models.py

@@ -138,7 +138,6 @@ class Migration(migrations.Migration):
                 ),
                 ("model", models.CharField(max_length=255)),
                 ("part_number", models.CharField(blank=True, max_length=255)),
-                ("comments", models.TextField(blank=True)),
             ],
             options={
                 "ordering": ("manufacturer", "model"),

nautobot/dcim/models/device_components.py

@@ -26,7 +26,6 @@ from nautobot.dcim.choices import (
     PowerOutletFeedLegChoices,
     PowerOutletTypeChoices,
     PowerPortTypeChoices,
-    SubdeviceRoleChoices,
 )
 from nautobot.dcim.constants import (
     NONCONNECTABLE_IFACE_TYPES,
@@ -1097,12 +1096,6 @@ class DeviceBay(ComponentModel):
                         "installed_device": f"Cannot install the specified device; device is already installed in {current_bay}"
                     }
                 )
-            if self.installed_device.device_type.subdevice_role != SubdeviceRoleChoices.ROLE_CHILD:
-                raise ValidationError(
-                    {
-                        "installed_device": f'Cannot install device "{self.installed_device}"; device-type "{self.installed_device.device_type}" subdevice_role is not "child".'
-                    }
-                )
 
 
 #

nautobot/dcim/models/devices.py

@@ -452,6 +452,7 @@ class Platform(OrganizationalModel):
 @extras_features(
     "custom_links",
     "custom_validators",
+    "dynamic_groups",
     "export_templates",
     "graphql",
     "locations",
@@ -1108,6 +1109,7 @@ class VirtualChassis(PrimaryModel):
 @extras_features(
     "custom_links",
     "custom_validators",
+    "dynamic_groups",
     "export_templates",
     "graphql",
     "statuses",
@@ -1153,10 +1155,6 @@ class DeviceRedundancyGroup(PrimaryModel):
     def devices_sorted(self):
         return self.devices.order_by("device_redundancy_group_priority")
 
-    @property
-    def controllers_sorted(self):
-        return self.controllers.order_by("name")
-
     def __str__(self):
         return self.name
 
@@ -1339,6 +1337,7 @@ class SoftwareVersion(PrimaryModel):
 @extras_features(
     "custom_links",
     "custom_validators",
+    "dynamic_groups",
     "export_templates",
     "graphql",
     "locations",
@@ -1422,6 +1421,7 @@ class Controller(PrimaryModel):
 @extras_features(
     "custom_links",
     "custom_validators",
+    "dynamic_groups",
     "export_templates",
     "graphql",
     "webhooks",
@@ -1510,7 +1510,6 @@ class ModuleType(PrimaryModel):
     part_number = models.CharField(
         max_length=CHARFIELD_MAX_LENGTH, blank=True, help_text="Discrete part number (optional)"
     )
-    comments = models.TextField(blank=True)
 
     clone_fields = [
         "manufacturer",
@@ -1531,7 +1530,6 @@ class ModuleType(PrimaryModel):
                 ("manufacturer", self.manufacturer.name),
                 ("model", self.model),
                 ("part_number", self.part_number),
-                ("comments", self.comments),
             )
         )
 

nautobot/dcim/models/racks.py

@@ -91,6 +91,7 @@ class RackGroup(TreeModel, OrganizationalModel):
 @extras_features(
     "custom_links",
     "custom_validators",
+    "dynamic_groups",
     "export_templates",
     "graphql",
     "locations",

nautobot/dcim/tables/devices.py

@@ -261,7 +261,7 @@ class ModuleTable(StatusTableMixin, RoleTableMixin, BaseTable):
     )
     location = tables.Column(linkify=True)
     tenant = TenantColumn()
-    tags = TagColumn(url_name="dcim:module_list")
+    tags = TagColumn(url_name="dcim:device_list")
     actions = ButtonsColumn(Module, prepend_template=MODULE_BUTTONS)
 
     class Meta(BaseTable.Meta):
@@ -1125,27 +1125,13 @@ class DeviceRedundancyGroupTable(BaseTable):
         url_params={"device_redundancy_group": "pk"},
         verbose_name="Devices",
     )
-    controller_count = LinkedCountColumn(
-        viewname="dcim:controller_list",
-        url_params={"controller_device_redundancy_group": "pk"},
-        verbose_name="Controllers",
-    )
     secrets_group = tables.Column(linkify=True)
     tags = TagColumn(url_name="dcim:deviceredundancygroup_list")
 
     class Meta(BaseTable.Meta):
         model = DeviceRedundancyGroup
-        fields = (
-            "pk",
-            "name",
-            "status",
-            "failover_strategy",
-            "controller_count",
-            "device_count",
-            "secrets_group",
-            "tags",
-        )
-        default_columns = ("pk", "name", "status", "failover_strategy", "controller_count", "device_count")
+        fields = ("pk", "name", "status", "failover_strategy", "device_count", "secrets_group", "tags")
+        default_columns = ("pk", "name", "status", "failover_strategy", "device_count")
 
 
 #

nautobot/dcim/tables/devicetypes.py

@@ -160,7 +160,7 @@ class ModuleTypeTable(BaseTable):
         url_params={"module_type": "pk"},
         verbose_name="Modules",
     )
-    tags = TagColumn(url_name="dcim:moduletype_list")
+    tags = TagColumn(url_name="dcim:devicetype_list")
 
     class Meta(BaseTable.Meta):
         model = ModuleType

nautobot/dcim/templates/dcim/device/base.html

@@ -71,7 +71,7 @@
                 <a href="{% url 'dcim:device_modulebays' pk=object.pk %}">Modules {% badge module_count %}</a>
             </li>
         {% endif %}
-        {% with interface_count=object.vc_interfaces.count %}
+        {% with interface_count=object.all_interfaces.count %}
             {% if interface_count %}
                 <li role="presentation" {% if active_tab == 'interfaces' %} class="active"{% endif %}>
                     <a href="{% url 'dcim:device_interfaces' pk=object.pk %}">Interfaces {% badge interface_count %}</a>

nautobot/dcim/templates/dcim/device.html

@@ -427,7 +427,7 @@
     </div>
 {% endif %}
 {% if object.is_metadata_associable_model and perms.extras.view_objectmetadata %}
-    <div id="object_metadata" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadata' %}active{% else %}fade{% endif %}">
+    <div id="object_metadatas" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadatas' %}active{% else %}fade{% endif %}">
         <div class="row">
             <div class="col-md-12">
                 <form method="post">
@@ -440,7 +440,7 @@
                             </div>
                         </div>
                         <div class="table-responsive">
-                            {% render_table associated_object_metadata_table 'inc/table.html' %}
+                            {% render_table associated_object_metadatas_table 'inc/table.html' %}
                         </div>
                     </div>
                 </form>

nautobot/dcim/templates/dcim/deviceredundancygroup_retrieve.html

@@ -45,12 +45,6 @@
 {% endblock content_right_page %}
 
 {% block content_full_width_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Controllers</strong>
-            </div>
-            {% include 'responsive_table.html' with table=controllers_table %}
-        </div>
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>Devices</strong>

nautobot/dcim/templates/dcim/moduletype_retrieve.html

@@ -113,23 +113,6 @@
             </div>
 {% endblock content_left_page %}
 
-{% block content_right_page %}
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <strong>Comments</strong>
-    </div>
-    <div class="panel-body rendered-markdown">
-        {% if object.comments %}
-            {{ object.comments|render_markdown }}
-        {% else %}
-            <span class="text-muted">None</span>
-        {% endif %}
-    </div>
-</div>
-{% endblock content_right_page %}
-
-
-
 {% block extra_tab_content %}
                 <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'interfaces' %}active{% else %}fade{% endif %}" id="interfaces">
                     {% include 'dcim/inc/moduletype_component_table.html' with table=interface_table title='Interfaces' tab='interfaces' %}

nautobot/dcim/templates/dcim/softwareimagefile_retrieve.html

@@ -236,7 +236,7 @@
             </div>
         {% endif %}
         {% if object.is_metadata_associable_model and perms.extras.view_objectmetadata %}
-            <div id="object_metadata" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadata' %}active{% else %}fade{% endif %}">
+            <div id="object_metadatas" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadatas' %}active{% else %}fade{% endif %}">
                 <div class="row">
                     <div class="col-md-12">
                         <form method="post">
@@ -249,7 +249,7 @@
                                     </div>
                                 </div>
                                 <div class="table-responsive">
-                                    {% render_table associated_object_metadata_table 'inc/table.html' %}
+                                    {% render_table associated_object_metadatas_table 'inc/table.html' %}
                                 </div>
                             </div>
                         </form>

nautobot/dcim/tests/test_api.py

@@ -1022,7 +1022,6 @@ class ModuleTypeTest(APIViewTestCases.APIViewTestCase):
     model = ModuleType
     bulk_update_data = {
         "part_number": "ABC123",
-        "comments": "changed comment",
     }
 
     @classmethod
@@ -1034,7 +1033,6 @@ class ModuleTypeTest(APIViewTestCases.APIViewTestCase):
                 "manufacturer": manufacturer_id,
                 "model": "Module Type 1",
                 "part_number": "123456",
-                "comments": "test comment",
             },
             {
                 "manufacturer": manufacturer_id,

nautobot/dcim/tests/test_filters.py

@@ -656,15 +656,9 @@ def common_test_data(cls):
     device_redundancy_groups = iter(DeviceRedundancyGroup.objects.all())
 
     module_types = (
-        ModuleType.objects.create(
-            manufacturer=cls.manufacturers[0], model="Filter Test Module Type 1", comments="Module Type 1"
-        ),
-        ModuleType.objects.create(
-            manufacturer=cls.manufacturers[1], model="Filter Test Module Type 2", comments="Module Type 2"
-        ),
-        ModuleType.objects.create(
-            manufacturer=cls.manufacturers[2], model="Filter Test Module Type 3", comments="Module Type 3"
-        ),
+        ModuleType.objects.create(manufacturer=cls.manufacturers[0], model="Filter Test Module Type 1"),
+        ModuleType.objects.create(manufacturer=cls.manufacturers[1], model="Filter Test Module Type 2"),
+        ModuleType.objects.create(manufacturer=cls.manufacturers[2], model="Filter Test Module Type 3"),
     )
 
     # Create 3 of each component template on the first two module types
@@ -904,7 +898,7 @@ class ModularDeviceComponentTestMixin(DeviceComponentTestMixin):
         )
         parent_module_bay = ModuleBay.objects.create(name="Parent module bay", position="1", parent_device=device)
         module_type = ModuleType.objects.create(
-            manufacturer=manufacturer, model=f"Test Device Filter for {model} Module Type", comments="Module Type test"
+            manufacturer=manufacturer, model=f"Test Device Filter for {model} Module Type"
         )
         module = Module.objects.create(
             module_type=module_type, parent_module_bay=parent_module_bay, status=self.module_statuses[0]
@@ -2532,7 +2526,7 @@ class InterfaceTestCase(PathEndpointModelTestMixin, ModularDeviceComponentTestMi
             name="Parent module bay", position="1", parent_device=device_vc_master
         )
         module_type = ModuleType.objects.create(
-            manufacturer=manufacturer, model="Test Device Filter for Interface Module Type", comments="Module Type test"
+            manufacturer=manufacturer, model="Test Device Filter for Interface Module Type"
         )
         module = Module.objects.create(
             module_type=module_type, parent_module_bay=parent_module_bay, status=self.module_statuses[0]
@@ -2778,7 +2772,7 @@ class FrontPortTestCase(ModularDeviceComponentTestMixin, FilterTestCases.FilterT
         )
         parent_module_bay = ModuleBay.objects.create(name="Parent module bay", position="1", parent_device=device)
         module_type = ModuleType.objects.create(
-            manufacturer=manufacturer, model="Test Device Filter for FrontPort Module Type", comments="Module Type test"
+            manufacturer=manufacturer, model="Test Device Filter for FrontPort Module Type"
         )
         module = Module.objects.create(
             module_type=module_type, parent_module_bay=parent_module_bay, status=self.module_statuses[0]
@@ -3363,7 +3357,7 @@ class CableTestCase(FilterTestCases.FilterTestCase):
         )
         parent_module_bay = ModuleBay.objects.create(name="Parent module bay", position="1", parent_device=device)
         module_type = ModuleType.objects.create(
-            manufacturer=manufacturer, model="Test Device Filter for Cable Module Type", comments="Module Type test"
+            manufacturer=manufacturer, model="Test Device Filter for Cable Module Type"
         )
         module = Module.objects.create(
             module_type=module_type, parent_module_bay=parent_module_bay, status=self.module_statuses[0]
@@ -4018,7 +4012,6 @@ class ModuleTypeTestCase(FilterTestCases.FilterTestCase):
     queryset = ModuleType.objects.all()
     filterset = ModuleTypeFilterSet
     generic_filter_tests = [
-        ("comments",),
         ("manufacturer", "manufacturer__id"),
         ("manufacturer", "manufacturer__name"),
         ("model",),

nautobot/dcim/tests/test_models.py

@@ -1903,37 +1903,6 @@ class DeviceTestCase(ModelTestCases.BaseModelTestCase):
         self.assertNotEqual(child_mtime_after_parent_rack_update_save, child_mtime_after_parent_site_update_save)
 
 
-class DeviceBayTestCase(ModelTestCases.BaseModelTestCase):
-    model = DeviceBay
-
-    def setUp(self):
-        self.devices = Device.objects.filter(device_type__subdevice_role=SubdeviceRoleChoices.ROLE_PARENT)
-        devicetype = DeviceType.objects.create(
-            manufacturer=self.devices[0].device_type.manufacturer,
-            model="TestDeviceType1",
-            u_height=0,
-            subdevice_role=SubdeviceRoleChoices.ROLE_CHILD,
-        )
-        child_device = Device.objects.create(
-            device_type=devicetype,
-            role=self.devices[0].role,
-            name="TestDevice1",
-            status=self.devices[0].status,
-            location=self.devices[0].location,
-        )
-        DeviceBay.objects.create(device=self.devices[0], name="Device Bay 1", installed_device=child_device)
-
-    def test_assigning_installed_device(self):
-        server = Device.objects.exclude(device_type__subdevice_role=SubdeviceRoleChoices.ROLE_CHILD).last()
-        bay = DeviceBay(device=self.devices[1], name="Device Bay Err", installed_device=server)
-        with self.assertRaises(ValidationError) as err:
-            bay.validated_save()
-        self.assertIn(
-            f'Cannot install device "{server}"; device-type "{server.device_type}" subdevice_role is not "child".',
-            str(err.exception),
-        )
-
-
 class DeviceTypeToSoftwareImageFileTestCase(ModelTestCases.BaseModelTestCase):
     model = DeviceTypeToSoftwareImageFile
 

nautobot/dcim/tests/test_views.py

@@ -817,7 +817,6 @@ class DeviceTypeTestCase(
         cls.bulk_edit_data = {
             "u_height": 0,
             "is_full_depth": False,
-            "comments": "changed comment",
         }
 
     def test_list_has_correct_links(self):
@@ -1197,7 +1196,6 @@ class ModuleTypeTestCase(
         ModuleType.objects.create(
             model="Test Module Type 1",
             manufacturer=manufacturers[0],
-            comments="test comment",
         )
         ModuleType.objects.create(
             model="Test Module Type 2",
@@ -1217,12 +1215,10 @@ class ModuleTypeTestCase(
             "model": "Test Module Type X",
             "part_number": "123ABC",
             "tags": [t.pk for t in Tag.objects.get_for_model(ModuleType)],
-            "comments": "test comment",
         }
 
         cls.bulk_edit_data = {
             "manufacturer": manufacturers[1].pk,
-            "comments": "changed comment",
         }
 
     def test_list_has_correct_links(self):
@@ -2363,19 +2359,6 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
                 sorted(interface_ips),
             )
 
-        with self.subTest("Assert Assigning IPAddress Without Selecting Any IPAddress Raises Exception"):
-            assign_ip_form_data["pk"] = []
-            assign_ip_request = {
-                "path": reverse("ipam:ipaddress_assign")
-                + f"?interface={self.interfaces[1].id}&return_url={device_list_url}",
-                "data": post_data(assign_ip_form_data),
-            }
-            response = self.client.post(**assign_ip_request, follow=True)
-            self.assertHttpStatus(response, 200)
-            self.assertIn(
-                "Please select at least one IP Address from the table.", response.content.decode(response.charset)
-            )
-
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_device_rearports(self):
         device = Device.objects.first()
@@ -4189,28 +4172,6 @@ class VirtualChassisTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "domain": "domain-x",
         }
 
-    def test_device_interfaces_count_correct(self):
-        """
-        This checks whether the other memebers' interfaces are included in the
-        interfaces tab of the master device and whether the interface count on the tab header is
-        rendered correctly.
-        """
-        self.user.is_superuser = True
-        self.user.save()
-        interface_status = Status.objects.get_for_model(Interface).first()
-        Interface.objects.create(device=self.devices[0], name="eth0", status=interface_status)
-        Interface.objects.create(device=self.devices[0], name="eth1", status=interface_status)
-        Interface.objects.create(device=self.devices[1], name="device 1 interface 1", status=interface_status)
-        Interface.objects.create(device=self.devices[1], name="device 1 interface 2", status=interface_status)
-        Interface.objects.create(device=self.devices[2], name="device 2 interface 1", status=interface_status)
-        Interface.objects.create(device=self.devices[2], name="device 2 interface 2", status=interface_status)
-        response = self.client.get(reverse("dcim:device_interfaces", kwargs={"pk": self.devices[0].pk}))
-        self.assertIn('Interfaces <span class="badge">6</span>', str(response.content))
-        self.assertIn("device 1 interface 1", str(response.content))
-        self.assertIn("device 1 interface 2", str(response.content))
-        self.assertIn("device 2 interface 1", str(response.content))
-        self.assertIn("device 2 interface 2", str(response.content))
-
     def test_device_column_visible(self):
         """
         This checks whether the device column on a device's interfaces

nautobot/dcim/views.py

@@ -1923,7 +1923,7 @@ class DeviceInterfacesView(DeviceComponentTabView):
 
     def get_extra_context(self, request, instance):
         interfaces = (
-            instance.vc_interfaces.restrict(request.user, "view")
+            instance.all_interfaces.restrict(request.user, "view")
             .prefetch_related(
                 Prefetch("ip_addresses", queryset=IPAddress.objects.restrict(request.user)),
                 Prefetch("member_interfaces", queryset=Interface.objects.restrict(request.user)),
@@ -4049,9 +4049,6 @@ class DeviceRedundancyGroupUIViewSet(NautobotUIViewSet):
             devices_table = tables.DeviceTable(devices)
             devices_table.columns.show("device_redundancy_group_priority")
             context["devices_table"] = devices_table
-            controllers = instance.controllers_sorted.restrict(request.user)
-            controllers_table = tables.ControllerTable(controllers)
-            context["controllers_table"] = controllers_table
         return context
 
 

nautobot/extras/api/views.py

@@ -1,3 +1,5 @@
+from datetime import timedelta
+
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.forms import ValidationError as FormsValidationError
@@ -490,6 +492,59 @@ class ImageAttachmentViewSet(ModelViewSet):
 #
 
 
+def _create_schedule(serializer, data, job_model, user, approval_required, task_queue=None):
+    """
+    This is an internal function to create a scheduled job from API data.
+    It has to handle both once-offs (i.e. of type TYPE_FUTURE) and interval
+    jobs.
+    """
+    type_ = serializer["interval"]
+    if type_ == JobExecutionType.TYPE_IMMEDIATELY:
+        time = timezone.now()
+        name = serializer.get("name") or f"{job_model.name} - {time}"
+    elif type_ == JobExecutionType.TYPE_CUSTOM:
+        time = serializer.get("start_time")  # doing .get("key", "default") returns None instead of "default"
+        if time is None:
+            # "start_time" is checked against models.ScheduledJob.earliest_possible_time()
+            # which returns timezone.now() + timedelta(seconds=15)
+            time = timezone.now() + timedelta(seconds=20)
+        name = serializer["name"]
+    else:
+        time = serializer["start_time"]
+        name = serializer["name"]
+    crontab = serializer.get("crontab", "")
+
+    celery_kwargs = {
+        "nautobot_job_profile": False,
+        "queue": task_queue,
+    }
+
+    # 2.0 TODO: To revisit this as part of a larger Jobs cleanup in 2.0.
+    #
+    # We pass in task and job_model here partly for forward/backward compatibility logic, and
+    # part fallback safety. It's mildly useful to store both the task module/class name and the JobModel
+    # FK on the ScheduledJob, as in the case where the JobModel gets deleted (and the FK becomes
+    # null) you still have a bit of context on the ScheduledJob as to what it was originally
+    # scheduled for.
+    scheduled_job = ScheduledJob(
+        name=name,
+        task=job_model.class_path,
+        job_model=job_model,
+        start_time=time,
+        description=f"Nautobot job {name} scheduled by {user} for {time}",
+        kwargs=data,
+        celery_kwargs=celery_kwargs,
+        interval=type_,
+        one_off=(type_ == JobExecutionType.TYPE_FUTURE),
+        user=user,
+        approval_required=approval_required,
+        crontab=crontab,
+        queue=task_queue,
+    )
+    scheduled_job.validated_save()
+    return scheduled_job
+
+
 class JobViewSetBase(
     NautobotAPIVersionMixin,
     # note no CreateModelMixin
@@ -689,16 +744,13 @@ class JobViewSetBase(
 
         # Try to create a ScheduledJob, or...
         if schedule_data:
-            schedule = ScheduledJob.create_schedule(
+            schedule = _create_schedule(
+                schedule_data,
+                job_class.serialize_data(cleaned_data),
                 job_model,
                 request.user,
-                name=schedule_data.get("name"),
-                start_time=schedule_data.get("start_time"),
-                interval=schedule_data.get("interval"),
-                crontab=schedule_data.get("crontab", ""),
-                approval_required=approval_required,
+                approval_required,
                 task_queue=input_serializer.validated_data.get("task_queue", None),
-                **job_class.serialize_data(cleaned_data),
             )
         else:
             schedule = None