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

nautobot/project-static/docs/user-guide/platform-functionality/webhook.html

@@ -2663,6 +2663,20 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="externalintegration.html" class="md-nav__link">
+        External Integrations
+      </a>
+    </li>
+  
+
+            
+          
+            
+              
+  
+  
+  
     <li class="md-nav__item">
       <a href="gitrepository.html" class="md-nav__link">
         Git Repositories
@@ -2683,7 +2697,7 @@
       
       
       
-      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_4_8" >
+      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_4_9" >
       
       
       
@@ -2692,14 +2706,14 @@
         <div class="md-nav__link md-nav__link--index ">
           <a href="graphql.html">GraphQL</a>
           
-            <label for="__nav_2_4_8">
+            <label for="__nav_2_4_9">
               <span class="md-nav__icon md-icon"></span>
             </label>
           
         </div>
       
-      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_4_8_label" aria-expanded="false">
-        <label class="md-nav__title" for="__nav_2_4_8">
+      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_4_9_label" aria-expanded="false">
+        <label class="md-nav__title" for="__nav_2_4_9">
           <span class="md-nav__icon md-icon"></span>
           GraphQL
         </label>
@@ -2751,7 +2765,7 @@
       
       
       
-      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_4_10" >
+      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_4_11" >
       
       
       
@@ -2760,14 +2774,14 @@
         <div class="md-nav__link md-nav__link--index ">
           <a href="jobs/index.html">Jobs</a>
           
-            <label for="__nav_2_4_10">
+            <label for="__nav_2_4_11">
               <span class="md-nav__icon md-icon"></span>
             </label>
           
         </div>
       
-      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_4_10_label" aria-expanded="false">
-        <label class="md-nav__title" for="__nav_2_4_10">
+      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_4_11_label" aria-expanded="false">
+        <label class="md-nav__title" for="__nav_2_4_11">
           <span class="md-nav__icon md-icon"></span>
           Jobs
         </label>
@@ -2889,7 +2903,7 @@
       
       
       
-      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_4_14" >
+      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_4_15" >
       
       
       
@@ -2898,14 +2912,14 @@
         <div class="md-nav__link md-nav__link--index ">
           <a href="rest-api/overview.html">REST API</a>
           
-            <label for="__nav_2_4_14">
+            <label for="__nav_2_4_15">
               <span class="md-nav__icon md-icon"></span>
             </label>
           
         </div>
       
-      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_4_14_label" aria-expanded="false">
-        <label class="md-nav__title" for="__nav_2_4_14">
+      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_4_15_label" aria-expanded="false">
+        <label class="md-nav__title" for="__nav_2_4_15">
           <span class="md-nav__icon md-icon"></span>
           REST API
         </label>
@@ -3041,17 +3055,17 @@
       
       
       
-      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_4_20" >
+      <input class="md-nav__toggle md-toggle " type="checkbox" id="__nav_2_4_21" >
       
       
       
-        <label class="md-nav__link" for="__nav_2_4_20" id="__nav_2_4_20_label" tabindex="0">
+        <label class="md-nav__link" for="__nav_2_4_21" id="__nav_2_4_21_label" tabindex="0">
           Users
           <span class="md-nav__icon md-icon"></span>
         </label>
       
-      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_4_20_label" aria-expanded="false">
-        <label class="md-nav__title" for="__nav_2_4_20">
+      <nav class="md-nav" data-md-level="3" aria-labelledby="__nav_2_4_21_label" aria-expanded="false">
+        <label class="md-nav__title" for="__nav_2_4_21">
           <span class="md-nav__icon md-icon"></span>
           Users
         </label>
@@ -4866,6 +4880,20 @@
   
   
   
+    <li class="md-nav__item">
+      <a href="../../release-notes/version-2.1.html" class="md-nav__link">
+        Version 2.1
+      </a>
+    </li>
+  
+
+            
+          
+            
+              
+  
+  
+  
     <li class="md-nav__item">
       <a href="../../release-notes/version-2.0.html" class="md-nav__link">
         Version 2.0

nautobot/project-static/fonts/UFL.txt

@@ -0,0 +1,96 @@
+-------------------------------
+UBUNTU FONT LICENCE Version 1.0
+-------------------------------
+
+PREAMBLE
+This licence allows the licensed fonts to be used, studied, modified and
+redistributed freely. The fonts, including any derivative works, can be
+bundled, embedded, and redistributed provided the terms of this licence
+are met. The fonts and derivatives, however, cannot be released under
+any other licence. The requirement for fonts to remain under this
+licence does not require any document created using the fonts or their
+derivatives to be published under this licence, as long as the primary
+purpose of the document is not to be a vehicle for the distribution of
+the fonts.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this licence and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Original Version" refers to the collection of Font Software components
+as received under this licence.
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to
+a new environment.
+
+"Copyright Holder(s)" refers to all individuals and companies who have a
+copyright ownership of the Font Software.
+
+"Substantially Changed" refers to Modified Versions which can be easily
+identified as dissimilar to the Font Software by users of the Font
+Software comparing the Original Version with the Modified Version.
+
+To "Propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification and with or without charging
+a redistribution fee), making available to the public, and in some
+countries other activities as well.
+
+PERMISSION & CONDITIONS
+This licence does not grant any rights under trademark law and all such
+rights are reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to propagate the Font Software, subject to
+the below conditions:
+
+1) Each copy of the Font Software must contain the above copyright
+notice and this licence. These can be included either as stand-alone
+text files, human-readable headers or in the appropriate machine-
+readable metadata fields within text or binary files as long as those
+fields can be easily viewed by the user.
+
+2) The font name complies with the following:
+(a) The Original Version must retain its name, unmodified.
+(b) Modified Versions which are Substantially Changed must be renamed to
+avoid use of the name of the Original Version or similar names entirely.
+(c) Modified Versions which are not Substantially Changed must be
+renamed to both (i) retain the name of the Original Version and (ii) add
+additional naming elements to distinguish the Modified Version from the
+Original Version. The name of such Modified Versions must be the name of
+the Original Version, with "derivative X" where X represents the name of
+the new work, appended to that name.
+
+3) The name(s) of the Copyright Holder(s) and any contributor to the
+Font Software shall not be used to promote, endorse or advertise any
+Modified Version, except (i) as required by this licence, (ii) to
+acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
+their explicit written permission.
+
+4) The Font Software, modified or unmodified, in part or in whole, must
+be distributed entirely under this licence, and must not be distributed
+under any other licence. The requirement for fonts to remain under this
+licence does not affect any document created using the Font Software,
+except any version of the Font Software extracted from a document
+created using the Font Software may only be distributed under this
+licence.
+
+TERMINATION
+This licence becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.

nautobot/project-static/img/nautobot_chevron.svg

@@ -0,0 +1,5 @@
+<svg width="17" height="20" viewBox="0 0 17 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0.277304 13C0.181925 13 0.102443 12.9571 0.054754 12.8856C-0.0247279 12.7711 0.022961 12.6281 0.150132 12.5566L4.96673 9.99603L0.134236 7.4498C0.00706488 7.37828 -0.040624 7.23523 0.0388579 7.12079C0.11834 7.00636 0.277303 6.96344 0.404474 7.03497L6 9.99603L0.404474 12.9714C0.372681 13 0.324993 13 0.277304 13Z" fill="#FF8400"/>
+    <path d="M6.26141 13C6.16603 13 6.08655 12.9571 6.03886 12.8856C5.95938 12.7711 6.00706 12.6281 6.13424 12.5566L10.9508 9.99603L6.13424 7.4498C6.00706 7.37828 5.95938 7.23523 6.03886 7.12079C6.11834 7.00636 6.2773 6.96344 6.40447 7.03497L12 9.99603L6.40447 12.9714C6.35679 13 6.3091 13 6.26141 13Z" fill="#FF8400"/>
+    <path d="M12.2311 13C12.1516 13 12.0854 12.9571 12.0456 12.8856C11.9794 12.7711 12.0191 12.6281 12.1251 12.5566L16.1389 9.99603L12.1119 7.4498C12.0059 7.37828 11.9661 7.23523 12.0324 7.12079C12.0986 7.00636 12.2311 6.96344 12.3371 7.03497L17 9.99603L12.3371 12.9714C12.3106 13 12.2708 13 12.2311 13Z" fill="#FF8400"/>
+</svg>

nautobot/project-static/img/nautobot_chevron_header.svg

@@ -0,0 +1,5 @@
+<svg width="34" height="40" viewBox="0 0 17 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0.277304 13C0.181925 13 0.102443 12.9571 0.054754 12.8856C-0.0247279 12.7711 0.022961 12.6281 0.150132 12.5566L4.96673 9.99603L0.134236 7.4498C0.00706488 7.37828 -0.040624 7.23523 0.0388579 7.12079C0.11834 7.00636 0.277303 6.96344 0.404474 7.03497L6 9.99603L0.404474 12.9714C0.372681 13 0.324993 13 0.277304 13Z" fill="#FF8400"/>
+    <path d="M6.26141 13C6.16603 13 6.08655 12.9571 6.03886 12.8856C5.95938 12.7711 6.00706 12.6281 6.13424 12.5566L10.9508 9.99603L6.13424 7.4498C6.00706 7.37828 5.95938 7.23523 6.03886 7.12079C6.11834 7.00636 6.2773 6.96344 6.40447 7.03497L12 9.99603L6.40447 12.9714C6.35679 13 6.3091 13 6.26141 13Z" fill="#FF8400"/>
+    <path d="M12.2311 13C12.1516 13 12.0854 12.9571 12.0456 12.8856C11.9794 12.7711 12.0191 12.6281 12.1251 12.5566L16.1389 9.99603L12.1119 7.4498C12.0059 7.37828 11.9661 7.23523 12.0324 7.12079C12.0986 7.00636 12.2311 6.96344 12.3371 7.03497L17 9.99603L12.3371 12.9714C12.3106 13 12.2708 13 12.2311 13Z" fill="#FF8400"/>
+</svg>

nautobot/tenancy/navigation.py

@@ -5,7 +5,6 @@ from nautobot.core.apps import (
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
-    NavMenuImportButton,
     NavMenuTab,
 )
 
@@ -33,12 +32,6 @@ menu_items = (
                                     "tenancy.add_tag",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="tenancy:tenant_import",
-                                permissions=[
-                                    "tenancy.add_tenant",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -55,12 +48,6 @@ menu_items = (
                                     "tenancy.add_tenantgroup",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="tenancy:tenantgroup_import",
-                                permissions=[
-                                    "tenancy.add_tenantgroup",
-                                ],
-                            ),
                         ),
                     ),
                 ),

nautobot/ui/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "nautobot",
-    "version": "2.0.5",
+    "version": "2.1.0-b1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "nautobot",
-            "version": "2.0.5",
+            "version": "2.1.0-b1",
             "dependencies": {
                 "@chakra-ui/icons": "^2.0.0",
                 "@chakra-ui/react": "^2.5.1",

nautobot/ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nautobot",
-    "version": "2.0.5",
+    "version": "2.1.0-b1",
     "private": true,
     "dependencies": {
         "@chakra-ui/icons": "^2.0.0",

nautobot/users/admin.py

@@ -1,11 +1,14 @@
 from django import forms
 from django.contrib import admin
+from django.contrib.admin.models import DELETION, LogEntry
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin as UserAdmin_
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError, ValidationError
 from django.db import models
+from django.urls import reverse
+from django.utils.html import escape, format_html
 
 from nautobot.core.admin import NautobotModelAdmin
 from nautobot.extras.admin import order_content_types
@@ -70,6 +73,47 @@ class GroupAdmin(NautobotModelAdmin):
         return obj.user_set.count()
 
 
+@admin.register(LogEntry)
+class LogEntryAdmin(NautobotModelAdmin):
+    """ModelAdmin for Django admin log entries that is read-only."""
+
+    date_hierarchy = "action_time"
+    search_fields = ["change_message", "object_repr", "user__username"]
+    list_display = [
+        "action_time",
+        "user",
+        "content_type",
+        "object_link",
+        "action_flag",
+    ]
+
+    def has_add_permission(self, request):
+        """Disable add permission."""
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        """Disable change permission."""
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        """Disable delete permission."""
+        return False
+
+    def object_link(self, obj):
+        """Link to the related object, unless it was deleted."""
+        if obj.action_flag == DELETION:
+            link = escape(obj.object_repr)
+        else:
+            ct = obj.content_type
+            change_link = reverse(f"admin:{ct.app_label}_{ct.model}_change", args=[obj.object_id])
+            object_repr = obj.object_repr
+            link = format_html('<a href="{}">{}</a>', change_link, object_repr)
+        return link
+
+    object_link.admin_order_field = "object_repr"
+    object_link.short_description = "object"
+
+
 @admin.register(User)
 class UserAdmin(UserAdmin_):
     list_display = [

nautobot/users/migrations/0007_alter_objectpermission_object_types.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.2.21 on 2023-10-26 16:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("users", "0006_make_object_permission_name_globally_unique"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="objectpermission",
+            name="object_types",
+            field=models.ManyToManyField(
+                limit_choices_to=models.Q(
+                    models.Q(
+                        models.Q(
+                            ("app_label__in", ["admin", "auth", "contenttypes", "sessions", "taggit", "users"]),
+                            _negated=True,
+                        ),
+                        models.Q(("app_label", "admin"), ("model__in", ["logentry"])),
+                        models.Q(("app_label", "auth"), ("model__in", ["group"])),
+                        models.Q(("app_label", "users"), ("model__in", ["objectpermission", "token", "user"])),
+                        _connector="OR",
+                    )
+                ),
+                related_name="object_permissions",
+                to="contenttypes.ContentType",
+            ),
+        ),
+    ]

nautobot/users/models.py

@@ -245,8 +245,9 @@ class ObjectPermission(BaseModel):
                     "users",
                 ]
             )
-            | Q(app_label="auth", model__in=["group", "user"])
-            | Q(app_label="users", model__in=["objectpermission", "token"])
+            | Q(app_label="admin", model__in=["logentry"])
+            | Q(app_label="auth", model__in=["group"])
+            | Q(app_label="users", model__in=["objectpermission", "token", "user"])
         ),
         related_name="object_permissions",
     )

nautobot/virtualization/navigation.py

@@ -5,7 +5,6 @@ from nautobot.core.apps import (
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
-    NavMenuImportButton,
     NavMenuTab,
 )
 
@@ -33,12 +32,6 @@ menu_items = (
                                     "virtualization.add_virtualmachine",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="virtualization:virtualmachine_import",
-                                permissions=[
-                                    "virtualization.add_virtualmachine",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -48,14 +41,7 @@ menu_items = (
                         permissions=[
                             "virtualization.view_vminterface",
                         ],
-                        buttons=(
-                            NavMenuImportButton(
-                                link="virtualization:vminterface_import",
-                                permissions=[
-                                    "virtualization.add_vminterface",
-                                ],
-                            ),
-                        ),
+                        buttons=(),
                     ),
                 ),
             ),
@@ -77,12 +63,6 @@ menu_items = (
                                     "virtualization.add_cluster",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="virtualization:cluster_import",
-                                permissions=[
-                                    "virtualization.add_cluster",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -99,12 +79,6 @@ menu_items = (
                                     "virtualization.add_clustertype",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="virtualization:clustertype_import",
-                                permissions=[
-                                    "virtualization.add_clustertype",
-                                ],
-                            ),
                         ),
                     ),
                     NavMenuItem(
@@ -121,12 +95,6 @@ menu_items = (
                                     "virtualization.add_clustergroup",
                                 ],
                             ),
-                            NavMenuImportButton(
-                                link="virtualization:clustergroup_import",
-                                permissions=[
-                                    "virtualization.add_clustergroup",
-                                ],
-                            ),
                         ),
                     ),
                 ),

nautobot/virtualization/tests/test_api.py

@@ -289,7 +289,7 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
         )
 
         vlan_status = Status.objects.get_for_model(VLAN).first()
-        vlan_group = VLANGroup.objects.first()
+        vlan_group = VLANGroup.objects.create(name="Test VLANGroup 1")
         vlans = (
             VLAN.objects.create(name="VLAN 1", vid=1, status=vlan_status, vlan_group=vlan_group),
             VLAN.objects.create(name="VLAN 2", vid=2, status=vlan_status, vlan_group=vlan_group),

nautobot/virtualization/tests/test_filters.py

@@ -492,7 +492,7 @@ class VirtualMachineTestCase(FilterTestCases.FilterTestCase, FilterTestCases.Ten
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_status(self):
-        params = {"status": [self.statuses[0].name, self.statuses[1].name]}
+        params = {"status": [self.statuses[0].name, self.statuses[1].id]}
         self.assertQuerysetEqualAndNotEmpty(
             self.filterset(params, self.queryset).qs,
             self.queryset.filter(status__in=[self.statuses[0], self.statuses[1]]),

{nautobot-2.0.5.dist-info → nautobot-2.1.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nautobot
-Version: 2.0.5
+Version: 2.1.0b1
 Summary: Source of truth and network automation platform.
 Home-page: https://nautobot.com
 License: Apache-2.0