nautobot 2.1.0b1__py3-none-any.whl → 2.1.1__py3-none-any.whl

nautobot/dcim/factory.py

@@ -1,22 +1,20 @@
-import factory
 import logging
-import pytz
-import random
-
-from faker import Faker
 
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
+import factory
+from faker import Faker
+import pytz
 
+from nautobot.circuits.models import CircuitTermination
 from nautobot.core.factory import (
     NautobotBoolIterator,
     OrganizationalModelFactory,
     PrimaryModelFactory,
-    UniqueFaker,
     random_instance,
+    UniqueFaker,
 )
-from nautobot.circuits.models import CircuitTermination
 from nautobot.dcim.choices import (
     DeviceRedundancyGroupFailoverStrategyChoices,
     RackDimensionUnitChoices,
@@ -28,14 +26,14 @@ from nautobot.dcim.models import (
     Device,
     DeviceRedundancyGroup,
     DeviceType,
-    Manufacturer,
-    Platform,
     Location,
     LocationType,
+    Manufacturer,
+    Platform,
+    PowerPanel,
     Rack,
     RackGroup,
     RackReservation,
-    PowerPanel,
 )
 from nautobot.extras.models import Role, Status
 from nautobot.extras.utils import FeatureQuery
@@ -43,7 +41,6 @@ from nautobot.ipam.models import Prefix, VLAN, VLANGroup
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster
 
-
 logger = logging.getLogger(__name__)
 
 User = get_user_model()
@@ -99,6 +96,121 @@ def get_rack_reservation_units(obj):
     return [unit for unit in available_units if unit not in unavailable_units][:1]
 
 
+def get_random_platform_for_manufacturer(manufacturer):
+    qs = Platform.objects.filter(manufacturer=manufacturer)
+    return factory.random.randgen.choice(qs) if qs.exists() else None
+
+
+class DeviceFactory(PrimaryModelFactory):
+    class Meta:
+        model = Device
+        exclude = (
+            "has_tenant",
+            "has_platform",
+            "has_serial",
+            "has_asset_tag",
+            "has_device_redundancy_group",
+            "has_comments",
+        )
+
+    device_type = random_instance(DeviceType, allow_null=False)
+    status = random_instance(
+        lambda: Status.objects.get_for_model(Device),
+        allow_null=False,
+    )
+    role = random_instance(
+        lambda: Role.objects.get_for_model(Device),
+        allow_null=False,
+    )
+    location = random_instance(
+        lambda: Location.objects.filter(location_type__content_types=ContentType.objects.get_for_model(Device)),
+        allow_null=False,
+    )
+    name = factory.LazyAttributeSequence(lambda o, n: f"{o.device_type.model} Device - {o.location} - {n + 1}")
+
+    has_tenant = NautobotBoolIterator()
+    tenant = factory.Maybe("has_tenant", random_instance(Tenant))
+    has_platform = NautobotBoolIterator()
+    platform = factory.Maybe(
+        "has_platform",
+        factory.LazyAttribute(lambda o: get_random_platform_for_manufacturer(o.device_type.manufacturer)),
+        None,
+    )
+
+    has_serial = NautobotBoolIterator()
+    serial = factory.Maybe("has_serial", factory.Faker("ean", length=8), "")
+
+    has_asset_tag = NautobotBoolIterator()
+    asset_tag = factory.Maybe("has_asset_tag", UniqueFaker("uuid4"), None)
+
+    has_device_redundancy_group = NautobotBoolIterator()
+    device_redundancy_group = factory.Maybe(
+        "has_device_redundancy_group",
+        random_instance(DeviceRedundancyGroup),
+    )
+    device_redundancy_group_priority = factory.Maybe(
+        "has_device_redundancy_group",
+        factory.Faker("pyint", min_value=1, max_value=500),
+    )
+
+    has_comments = NautobotBoolIterator()
+    comments = factory.Maybe("has_comments", factory.Faker("bs"))
+
+    # TODO to be done after these model factories are done.
+    # has_cluster = NautobotBoolIterator()
+    # cluster = factory.Maybe(
+    #     "has_cluster",
+    #     random_instance(Cluster),
+    # )
+
+    # has_virtual_chassis = NautobotBoolIterator()
+    # virtual_chassis = factory.Maybe(
+    #     "has_virtual_chassis",
+    #     random_instance(VirtualChassis),
+    # )
+    # has_vc_position = NautobotBoolIterator()
+    # vc_position = factory.Maybe(
+    #     "has_vc_position",
+    #     factory.Faker("pyint", min_value=1, max_value=256),
+    # )
+    # has_vc_priority = NautobotBoolIterator()
+    # vc_priority = factory.Maybe(
+    #     "has_vc_priority",
+    #     factory.Faker("pyint", min_value=1, max_value=256),
+    # )
+
+    # has_secrets_group = NautobotBoolIterator()
+    # secrets_group = factory.Maybe(
+    #     "has_secrets_group",
+    #     random_instance(SecretsGroup),
+    # )
+
+    # has_rack = NautobotBoolIterator()
+    # rack = factory.Maybe(
+    #     "has_rack",
+    #     random_instance(Rack),
+    # )
+    # has_position = NautobotBoolIterator()
+    # position = factory.Maybe("has_position", factory.Faker("pyint", min_value=1, max_value=256))
+    # has_face = NautobotBoolIterator()
+    # face = factory.Maybe(
+    #     "has_face",
+    #     factory.Iterator(DeviceFaceChoices.CHOICES, getter=lambda choice: choice[0]),
+    #     None,
+    # )
+    # has_primary_ip4 = NautobotBoolIterator()
+    # primary_ip4 = factory.Maybe(
+    #     "has_primary_ip4",
+    #     random_instance(lambda: IPAddress.objects.filter(ip_version=4), allow_null=False),
+    # )
+
+    # has_primary_ip6 = NautobotBoolIterator()
+    # primary_ip6 = factory.Maybe(
+    #     "has_primary_ip6",
+    #     random_instance(lambda: IPAddress.objects.filter(ip_version=6), allow_null=False),
+    # )
+
+
 class DeviceTypeFactory(PrimaryModelFactory):
     class Meta:
         model = DeviceType
@@ -183,7 +295,7 @@ class PlatformFactory(OrganizationalModelFactory):
     # If it has a manufacturer, it *might* have a napalm_driver.
     napalm_driver = factory.Maybe(
         "has_manufacturer",
-        factory.LazyAttribute(lambda o: random.choice(NAPALM_DRIVERS.get(o.manufacturer.name, [""]))),
+        factory.LazyAttribute(lambda o: factory.random.randgen.choice(NAPALM_DRIVERS.get(o.manufacturer.name, [""]))),
         "",
     )
 
@@ -195,7 +307,7 @@ class PlatformFactory(OrganizationalModelFactory):
     has_description = NautobotBoolIterator()
     network_driver = factory.Maybe(
         "has_manufacturer",
-        factory.LazyAttribute(lambda o: random.choice(NETWORK_DRIVERS.get(o.manufacturer.name, [""]))),
+        factory.LazyAttribute(lambda o: factory.random.randgen.choice(NETWORK_DRIVERS.get(o.manufacturer.name, [""]))),
         "",
     )
 

nautobot/dcim/fields.py

@@ -3,6 +3,7 @@ from django.db import models
 
 from nautobot.core.models.fields import JSONArrayField
 from nautobot.ipam.constants import BGP_ASN_MAX, BGP_ASN_MIN
+
 from .lookups import PathContains
 
 

nautobot/dcim/filters/__init__.py

@@ -1,6 +1,6 @@
-import django_filters
 from django.contrib.auth import get_user_model
 from django.db.models import Q
+import django_filters
 from drf_spectacular.utils import extend_schema_field
 from timezone_field import TimeZoneField
 
@@ -71,8 +71,8 @@ from nautobot.dcim.models import (
     VirtualChassis,
 )
 from nautobot.extras.filters import (
-    NautobotFilterSet,
     LocalContextModelFilterSetMixin,
+    NautobotFilterSet,
     RoleModelFilterSetMixin,
     StatusModelFilterSetMixin,
 )
@@ -83,7 +83,6 @@ from nautobot.tenancy.filters import TenancyModelFilterSetMixin
 from nautobot.tenancy.models import Tenant
 from nautobot.virtualization.models import Cluster
 
-
 __all__ = (
     "CableFilterSet",
     "CableTerminationFilterSet",

nautobot/dcim/filters/mixins.py

@@ -4,8 +4,8 @@ import django_filters
 from nautobot.core.filters import (
     MultiValueCharFilter,
     MultiValueUUIDFilter,
-    NaturalKeyOrPKMultipleChoiceFilter,
     NameSearchFilterSet,
+    NaturalKeyOrPKMultipleChoiceFilter,
     RelatedMembershipBooleanFilter,
     SearchFilter,
     TreeNodeMultipleChoiceFilter,

nautobot/dcim/forms.py

@@ -3,16 +3,14 @@ import re
 from django import forms
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
-
 from django.db.models import Q
-
 from timezone_field import TimeZoneFormField
 
 from nautobot.circuits.models import Circuit, CircuitTermination, Provider
 from nautobot.core.forms import (
+    add_blank_choice,
     APISelect,
     APISelectMultiple,
-    add_blank_choice,
     BootstrapMixin,
     BulkEditNullBooleanSelect,
     ColorSelect,
@@ -38,13 +36,13 @@ from nautobot.dcim.form_mixins import (
 from nautobot.extras.forms import (
     CustomFieldModelBulkEditFormMixin,
     CustomFieldModelCSVForm,
+    LocalContextFilterForm,
+    LocalContextModelBulkEditForm,
+    LocalContextModelForm,
     NautobotBulkEditForm,
-    NautobotModelForm,
     NautobotFilterForm,
+    NautobotModelForm,
     NoteModelFormMixin,
-    LocalContextFilterForm,
-    LocalContextModelForm,
-    LocalContextModelBulkEditForm,
     RoleModelBulkEditFormMixin,
     RoleModelFilterFormMixin,
     StatusModelBulkEditFormMixin,
@@ -57,6 +55,7 @@ from nautobot.ipam.models import IPAddress, IPAddressToInterface, VLAN, VRF
 from nautobot.tenancy.forms import TenancyFilterForm, TenancyForm
 from nautobot.tenancy.models import Tenant, TenantGroup
 from nautobot.virtualization.models import Cluster, ClusterGroup
+
 from .choices import (
     CableLengthUnitChoices,
     CableTypeChoices,
@@ -84,17 +83,16 @@ from .constants import (
     REARPORT_POSITIONS_MAX,
     REARPORT_POSITIONS_MIN,
 )
-
 from .models import (
     Cable,
-    DeviceBay,
-    DeviceBayTemplate,
-    DeviceRedundancyGroup,
     ConsolePort,
     ConsolePortTemplate,
     ConsoleServerPort,
     ConsoleServerPortTemplate,
     Device,
+    DeviceBay,
+    DeviceBayTemplate,
+    DeviceRedundancyGroup,
     DeviceType,
     FrontPort,
     FrontPortTemplate,
@@ -102,10 +100,10 @@ from .models import (
     InterfaceRedundancyGroup,
     InterfaceRedundancyGroupAssociation,
     InterfaceTemplate,
+    InventoryItem,
     Location,
     LocationType,
     Manufacturer,
-    InventoryItem,
     Platform,
     PowerFeed,
     PowerOutlet,
@@ -2361,12 +2359,6 @@ class InterfaceBulkEditForm(
     NautobotBulkEditForm,
 ):
     pk = forms.ModelMultipleChoiceField(queryset=Interface.objects.all(), widget=forms.MultipleHiddenInput())
-    device = forms.ModelChoiceField(
-        queryset=Device.objects.all(),
-        required=False,
-        disabled=True,
-        widget=forms.HiddenInput(),
-    )
     enabled = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect)
     parent_interface = DynamicModelChoiceField(
         queryset=Interface.objects.all(),
@@ -2401,6 +2393,11 @@ class InterfaceBulkEditForm(
             "location": "null",
         },
     )
+    vrf = DynamicModelChoiceField(
+        queryset=VRF.objects.all(),
+        label="VRF",
+        required=False,
+    )
 
     class Meta:
         nullable_fields = [
@@ -2414,42 +2411,38 @@ class InterfaceBulkEditForm(
             "mode",
             "untagged_vlan",
             "tagged_vlans",
+            "vrf",
         ]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        # Limit LAG choices to interfaces which belong to the parent device (or VC master)
-        if "device" in self.initial:
-            device = Device.objects.filter(pk=self.initial["device"]).first()
+        if "pk" not in self.initial:
+            return
+
+        devices = Device.objects.filter(interfaces__in=self.initial["pk"]).only("pk").distinct()
+        locations = Location.objects.without_tree_fields().order_by().filter(devices__in=devices).only("pk").distinct()
+        device_count = devices.count()
 
-            # Restrict parent/bridge/LAG interface assignment by device
+        if device_count > 0:
+            device = devices.first()
+
+            # Limit VRF choices to only VRFs available on the first parent device
+            # TODO: The choices for this field should be only VRFs that are associated to every parent device
+            self.fields["vrf"].widget.add_query_param("device", device.pk)
+
+            # Limit VLAN choices by Location
+            if locations.count() == 1:
+                location = locations.first()
+                self.fields["untagged_vlan"].widget.add_query_param("location", location.pk)
+                self.fields["tagged_vlans"].widget.add_query_param("location", location.pk)
+
+        # Restrict parent/bridge/LAG interface assignment by device (or VC master)
+        if device_count == 1:
             self.fields["parent_interface"].widget.add_query_param("device_with_common_vc", device.pk)
             self.fields["bridge"].widget.add_query_param("device_with_common_vc", device.pk)
             self.fields["lag"].widget.add_query_param("device_with_common_vc", device.pk)
-
-            # Add current location to VLANs query params
-            self.fields["untagged_vlan"].widget.add_query_param("location", device.location.pk)
-            self.fields["tagged_vlans"].widget.add_query_param("location", device.location.pk)
         else:
-            # See netbox-community/netbox#4523
-            if "pk" in self.initial:
-                location = None
-                interfaces = Interface.objects.filter(pk__in=self.initial["pk"]).select_related("device__location")
-
-                # Check interface locations.  First interface should set location, further interfaces will either continue the
-                # loop or reset back to no location and break the loop.
-                for interface in interfaces:
-                    if location is None:
-                        location = interface.device.location
-                    elif interface.device.location is not location:
-                        location = None
-                        break
-
-                if location is not None:
-                    self.fields["untagged_vlan"].widget.add_query_param("location", location.pk)
-                    self.fields["tagged_vlans"].widget.add_query_param("location", location.pk)
-
             self.fields["parent_interface"].choices = ()
             self.fields["parent_interface"].widget.attrs["disabled"] = True
             self.fields["bridge"].choices = ()

nautobot/dcim/graphql/types.py

@@ -3,6 +3,21 @@ import graphene
 from nautobot.circuits.graphql.types import CircuitTerminationType
 from nautobot.core.graphql.types import OptimizedNautobotObjectType
 from nautobot.core.graphql.utils import construct_resolver
+from nautobot.dcim.filters import (
+    CableFilterSet,
+    ConsolePortFilterSet,
+    ConsoleServerPortFilterSet,
+    DeviceFilterSet,
+    FrontPortFilterSet,
+    InterfaceFilterSet,
+    LocationFilterSet,
+    PlatformFilterSet,
+    PowerFeedFilterSet,
+    PowerOutletFilterSet,
+    PowerPortFilterSet,
+    RackFilterSet,
+    RearPortFilterSet,
+)
 from nautobot.dcim.graphql.mixins import CableTerminationMixin, PathEndpointMixin
 from nautobot.dcim.models import (
     Cable,
@@ -11,8 +26,8 @@ from nautobot.dcim.models import (
     ConsoleServerPort,
     Device,
     FrontPort,
-    Location,
     Interface,
+    Location,
     Platform,
     PowerFeed,
     PowerOutlet,
@@ -20,22 +35,6 @@ from nautobot.dcim.models import (
     Rack,
     RearPort,
 )
-from nautobot.dcim.filters import (
-    CableFilterSet,
-    ConsoleServerPortFilterSet,
-    ConsolePortFilterSet,
-    DeviceFilterSet,
-    FrontPortFilterSet,
-    InterfaceFilterSet,
-    PlatformFilterSet,
-    PowerFeedFilterSet,
-    PowerOutletFilterSet,
-    PowerPortFilterSet,
-    RackFilterSet,
-    RearPortFilterSet,
-    LocationFilterSet,
-)
-from nautobot.extras.graphql.types import TagType  # noqa: F401
 from nautobot.extras.models import DynamicGroup
 
 

nautobot/dcim/migrations/0001_initial_part_1.py

@@ -1,16 +1,18 @@
 # Generated by Django 3.1.7 on 2021-04-01 06:35
 
+import uuid
+
 import django.core.serializers.json
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
+import timezone_field.fields
+
 import nautobot.core.models.fields
 import nautobot.core.models.ordering
 import nautobot.core.models.query_functions
 import nautobot.core.models.validators
 import nautobot.dcim.fields
-import timezone_field.fields
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/dcim/migrations/0002_initial_part_2.py

@@ -2,9 +2,10 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import nautobot.extras.models.statuses
 import taggit.managers
 
+import nautobot.extras.models.statuses
+
 
 class Migration(migrations.Migration):
     initial = True

nautobot/dcim/migrations/0003_initial_part_3.py

@@ -3,9 +3,10 @@
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import nautobot.extras.models.statuses
 import taggit.managers
 
+import nautobot.extras.models.statuses
+
 
 class Migration(migrations.Migration):
     initial = True

nautobot/dcim/migrations/0004_initial_part_4.py

@@ -2,9 +2,10 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+import taggit.managers
+
 import nautobot.extras.models.statuses
 import nautobot.extras.utils
-import taggit.managers
 
 
 class Migration(migrations.Migration):

nautobot/dcim/migrations/0006_auto_slug.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.13 on 2021-08-05 19:24
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/dcim/migrations/0009_add_natural_indexing.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.12 on 2022-04-14 20:45
 
 from django.db import migrations, models
+
 import nautobot.core.models.fields
 import nautobot.core.models.ordering
 

nautobot/dcim/migrations/0010_interface_status.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations
 import django.db.models.deletion
+
 import nautobot.extras.models.statuses
 
 

nautobot/dcim/migrations/0011_interface_status_data_migration.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.14 on 2022-03-19 23:21
 
 from django.db import migrations
+
 from nautobot.dcim.choices import InterfaceStatusChoices
 from nautobot.extras.management import clear_status_choices, populate_status_choices
 

nautobot/dcim/migrations/0013_location_location_type.py

@@ -1,15 +1,17 @@
 # Generated by Django 3.2.13 on 2022-06-15 14:00
 
+import uuid
+
 import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
+import taggit.managers
+
 import nautobot.core.models.fields
 import nautobot.core.models.ordering
 import nautobot.extras.models.mixins
 import nautobot.extras.models.statuses
 import nautobot.extras.utils
-import taggit.managers
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/dcim/migrations/0014_location_status_data_migration.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.14 on 2022-03-19 23:21
 
 from django.db import migrations
+
 from nautobot.extras.management import clear_status_choices, populate_status_choices
 
 

nautobot/dcim/migrations/0016_device_components__timestamp_data_migration.py

@@ -2,7 +2,6 @@
 
 from django.db import migrations
 
-
 # Models that need to share their parent's timestamps.
 COMPONENT_MODELS = [
     "dcim.consoleport",

nautobot/dcim/migrations/0018_device_redundancy_group.py

@@ -1,14 +1,16 @@
 # Generated by Django 3.2.16 on 2022-10-28 17:25
 
+import uuid
+
 import django.core.serializers.json
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
+import taggit.managers
+
 import nautobot.core.models.fields
 import nautobot.extras.models.mixins
 import nautobot.extras.models.statuses
-import taggit.managers
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/dcim/migrations/0019_device_redundancy_group_data_migration.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.14 on 2022-03-19 23:21
 
 from django.db import migrations
+
 from nautobot.extras.management import clear_status_choices, populate_status_choices
 
 

nautobot/dcim/migrations/0022_interface_redundancy_group.py

@@ -1,12 +1,14 @@
 # Generated by Django 3.2.20 on 2023-08-01 17:19
 
+import uuid
+
 import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.core.models.fields
 import nautobot.extras.models.mixins
 import nautobot.extras.models.statuses
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/dcim/migrations/0023_interface_redundancy_group_data_migration.py

@@ -1,4 +1,5 @@
 from django.db import migrations
+
 from nautobot.extras.management import clear_status_choices, populate_status_choices
 
 

nautobot/dcim/migrations/0024_move_site_fields_to_location_model.py

@@ -1,9 +1,10 @@
 # Generated by Django 3.2.16 on 2022-12-09 03:24
 
 from django.db import migrations, models
-import nautobot.dcim.fields
 import timezone_field.fields
 
+import nautobot.dcim.fields
+
 
 class Migration(migrations.Migration):
     dependencies = [

nautobot/dcim/migrations/0027_alter_interface_mac_address.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.16 on 2022-12-22 19:10
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/dcim/migrations/0028_alter_device_and_rack_role_add_new_role.py

@@ -2,6 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import nautobot.extras.models.roles
 
 

nautobot/dcim/migrations/0029_device_and_rack_roles_data_migrations.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.16 on 2022-11-25 11:45
 
 from django.db import migrations
+
 from nautobot.core.utils.migrations import update_object_change_ct_for_replaced_models
 from nautobot.extras.utils import migrate_role_data