nautobot 2.3.4__py3-none-any.whl → 2.3.6__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- nautobot/core/api/utils.py +12 -2
- nautobot/core/forms/fields.py +5 -2
- nautobot/core/forms/utils.py +31 -6
- nautobot/core/models/fields.py +56 -0
- nautobot/core/tests/runner.py +13 -6
- nautobot/core/tests/test_utils.py +83 -0
- nautobot/core/tests/test_views.py +40 -1
- nautobot/core/views/generic.py +15 -15
- nautobot/core/views/mixins.py +12 -1
- nautobot/core/views/renderers.py +3 -1
- nautobot/core/views/utils.py +1 -1
- nautobot/dcim/api/serializers.py +1 -0
- nautobot/dcim/api/views.py +2 -0
- nautobot/dcim/forms.py +1 -1
- nautobot/dcim/templates/dcim/devicefamily_retrieve.html +1 -1
- nautobot/dcim/tests/test_api.py +61 -4
- nautobot/dcim/tests/test_models.py +0 -2
- nautobot/dcim/views.py +5 -2
- nautobot/extras/api/views.py +9 -0
- nautobot/extras/factory.py +2 -1
- nautobot/extras/models/jobs.py +9 -1
- nautobot/extras/models/models.py +2 -0
- nautobot/extras/querysets.py +10 -1
- nautobot/extras/tables.py +3 -0
- nautobot/extras/tests/test_api.py +39 -3
- nautobot/extras/tests/test_forms.py +2 -0
- nautobot/extras/tests/test_views.py +78 -3
- nautobot/extras/views.py +10 -7
- nautobot/ipam/api/serializers.py +30 -1
- nautobot/ipam/api/views.py +165 -3
- nautobot/ipam/filters.py +1 -1
- nautobot/ipam/forms.py +8 -1
- nautobot/ipam/migrations/0050_vlangroup_range.py +24 -0
- nautobot/ipam/models.py +56 -19
- nautobot/ipam/navigation.py +8 -1
- nautobot/ipam/tables.py +4 -4
- nautobot/ipam/templates/ipam/prefix.html +1 -1
- nautobot/ipam/templates/ipam/vlangroup.html +4 -0
- nautobot/ipam/tests/test_api.py +174 -0
- nautobot/ipam/tests/test_filters.py +1 -1
- nautobot/ipam/tests/test_models.py +35 -1
- nautobot/ipam/tests/test_utils.py +61 -0
- nautobot/ipam/tests/test_views.py +43 -41
- nautobot/ipam/utils/__init__.py +10 -17
- nautobot/ipam/views.py +2 -2
- nautobot/project-static/docs/404.html +2 -2
- nautobot/project-static/docs/apps/index.html +2 -2
- nautobot/project-static/docs/apps/nautobot-apps.html +2 -2
- nautobot/project-static/docs/assets/javascripts/workers/{search.07f07601.min.js → search.6ce7567c.min.js} +3 -3
- nautobot/project-static/docs/assets/javascripts/workers/{search.07f07601.min.js.map → search.6ce7567c.min.js.map} +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/__init__.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/admin.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/api.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/change_logging.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/choices.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/config.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/constants.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/datasources.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/exceptions.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/factory.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/filters.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/forms.html +4 -4
- nautobot/project-static/docs/code-reference/nautobot/apps/graphql.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/jobs.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/models.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/querysets.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/secrets.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/tables.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/testing.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/ui.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/urls.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/utils.html +2 -2
- nautobot/project-static/docs/code-reference/nautobot/apps/views.html +2 -2
- nautobot/project-static/docs/development/apps/api/configuration-view.html +2 -2
- nautobot/project-static/docs/development/apps/api/database-backend-config.html +2 -2
- nautobot/project-static/docs/development/apps/api/models/django-admin.html +2 -2
- nautobot/project-static/docs/development/apps/api/models/global-search.html +2 -2
- nautobot/project-static/docs/development/apps/api/models/graphql.html +2 -2
- nautobot/project-static/docs/development/apps/api/models/index.html +4 -4
- nautobot/project-static/docs/development/apps/api/nautobot-app-config.html +2 -2
- nautobot/project-static/docs/development/apps/api/platform-features/custom-validators.html +2 -2
- nautobot/project-static/docs/development/apps/api/platform-features/filter-extensions.html +2 -2
- nautobot/project-static/docs/development/apps/api/platform-features/git-repository-content.html +2 -2
- nautobot/project-static/docs/development/apps/api/platform-features/index.html +2 -2
- nautobot/project-static/docs/development/apps/api/platform-features/jinja2-filters.html +2 -2
- nautobot/project-static/docs/development/apps/api/platform-features/jobs.html +2 -2
- nautobot/project-static/docs/development/apps/api/platform-features/populating-extensibility-features.html +2 -2
- nautobot/project-static/docs/development/apps/api/platform-features/secrets-providers.html +2 -2
- nautobot/project-static/docs/development/apps/api/platform-features/uniquely-identify-objects.html +2 -2
- nautobot/project-static/docs/development/apps/api/prometheus.html +2 -2
- nautobot/project-static/docs/development/apps/api/setup.html +2 -2
- nautobot/project-static/docs/development/apps/api/testing.html +2 -2
- nautobot/project-static/docs/development/apps/api/ui-extensions/banners.html +2 -2
- nautobot/project-static/docs/development/apps/api/ui-extensions/home-page.html +2 -2
- nautobot/project-static/docs/development/apps/api/ui-extensions/index.html +2 -2
- nautobot/project-static/docs/development/apps/api/ui-extensions/navigation.html +2 -2
- nautobot/project-static/docs/development/apps/api/ui-extensions/object-views.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/base-template.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/core-view-overrides.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/django-generic-views.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/help-documentation.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/index.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/nautobot-generic-views.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/nautobotuiviewset.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/nautobotuiviewsetrouter.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/notes.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/rest-api.html +2 -2
- nautobot/project-static/docs/development/apps/api/views/urls.html +2 -2
- nautobot/project-static/docs/development/apps/index.html +2 -2
- nautobot/project-static/docs/development/apps/migration/code-updates.html +2 -2
- nautobot/project-static/docs/development/apps/migration/dependency-updates.html +2 -2
- nautobot/project-static/docs/development/apps/migration/from-v1.html +2 -2
- nautobot/project-static/docs/development/apps/migration/model-updates/dcim.html +2 -2
- nautobot/project-static/docs/development/apps/migration/model-updates/extras.html +2 -2
- nautobot/project-static/docs/development/apps/migration/model-updates/global.html +2 -2
- nautobot/project-static/docs/development/apps/migration/model-updates/ipam.html +2 -2
- nautobot/project-static/docs/development/apps/porting-from-netbox.html +2 -2
- nautobot/project-static/docs/development/core/application-registry.html +2 -2
- nautobot/project-static/docs/development/core/best-practices.html +2 -2
- nautobot/project-static/docs/development/core/bootstrap-ui.html +2 -2
- nautobot/project-static/docs/development/core/caching.html +2 -2
- nautobot/project-static/docs/development/core/controllers.html +2 -2
- nautobot/project-static/docs/development/core/docker-compose-advanced-use-cases.html +2 -2
- nautobot/project-static/docs/development/core/generic-views.html +2 -2
- nautobot/project-static/docs/development/core/getting-started.html +7 -6
- nautobot/project-static/docs/development/core/homepage.html +2 -2
- nautobot/project-static/docs/development/core/index.html +2 -2
- nautobot/project-static/docs/development/core/model-checklist.html +2 -2
- nautobot/project-static/docs/development/core/model-features.html +2 -2
- nautobot/project-static/docs/development/core/natural-keys.html +2 -2
- nautobot/project-static/docs/development/core/navigation-menu.html +2 -2
- nautobot/project-static/docs/development/core/release-checklist.html +2 -2
- nautobot/project-static/docs/development/core/role-internals.html +2 -2
- nautobot/project-static/docs/development/core/settings.html +2 -2
- nautobot/project-static/docs/development/core/style-guide.html +2 -2
- nautobot/project-static/docs/development/core/templates.html +2 -2
- nautobot/project-static/docs/development/core/testing.html +12 -4
- nautobot/project-static/docs/development/core/user-preferences.html +2 -2
- nautobot/project-static/docs/development/index.html +2 -2
- nautobot/project-static/docs/development/jobs/index.html +2 -2
- nautobot/project-static/docs/development/jobs/migration/from-v1.html +2 -2
- nautobot/project-static/docs/index.html +2 -2
- nautobot/project-static/docs/objects.inv +0 -0
- nautobot/project-static/docs/overview/application_stack.html +2 -2
- nautobot/project-static/docs/overview/design_philosophy.html +2 -2
- nautobot/project-static/docs/release-notes/index.html +2 -2
- nautobot/project-static/docs/release-notes/version-1.0.html +2 -2
- nautobot/project-static/docs/release-notes/version-1.1.html +2 -2
- nautobot/project-static/docs/release-notes/version-1.2.html +2 -2
- nautobot/project-static/docs/release-notes/version-1.3.html +2 -2
- nautobot/project-static/docs/release-notes/version-1.4.html +2 -2
- nautobot/project-static/docs/release-notes/version-1.5.html +2 -2
- nautobot/project-static/docs/release-notes/version-1.6.html +2 -2
- nautobot/project-static/docs/release-notes/version-2.0.html +2 -2
- nautobot/project-static/docs/release-notes/version-2.1.html +2 -2
- nautobot/project-static/docs/release-notes/version-2.2.html +2 -2
- nautobot/project-static/docs/release-notes/version-2.3.html +402 -80
- nautobot/project-static/docs/search/search_index.json +1 -1
- nautobot/project-static/docs/sitemap.xml +269 -269
- nautobot/project-static/docs/sitemap.xml.gz +0 -0
- nautobot/project-static/docs/user-guide/administration/configuration/authentication/ldap.html +2 -2
- nautobot/project-static/docs/user-guide/administration/configuration/authentication/remote.html +2 -2
- nautobot/project-static/docs/user-guide/administration/configuration/authentication/sso.html +2 -2
- nautobot/project-static/docs/user-guide/administration/configuration/index.html +2 -2
- nautobot/project-static/docs/user-guide/administration/configuration/redis.html +2 -2
- nautobot/project-static/docs/user-guide/administration/configuration/settings.html +2 -2
- nautobot/project-static/docs/user-guide/administration/configuration/time-zones.html +2 -2
- nautobot/project-static/docs/user-guide/administration/guides/celery-queues.html +2 -2
- nautobot/project-static/docs/user-guide/administration/guides/docker.html +2 -2
- nautobot/project-static/docs/user-guide/administration/guides/health-checks.html +2 -2
- nautobot/project-static/docs/user-guide/administration/guides/permissions.html +2 -2
- nautobot/project-static/docs/user-guide/administration/guides/prometheus-metrics.html +2 -2
- nautobot/project-static/docs/user-guide/administration/guides/replicating-nautobot.html +2 -2
- nautobot/project-static/docs/user-guide/administration/guides/request-profiling.html +2 -2
- nautobot/project-static/docs/user-guide/administration/guides/s3-django-storage.html +2 -2
- nautobot/project-static/docs/user-guide/administration/guides/selinux-troubleshooting.html +2 -2
- nautobot/project-static/docs/user-guide/administration/installation/app-install.html +2 -2
- nautobot/project-static/docs/user-guide/administration/installation/external-authentication.html +2 -2
- nautobot/project-static/docs/user-guide/administration/installation/http-server.html +2 -2
- nautobot/project-static/docs/user-guide/administration/installation/index.html +2 -2
- nautobot/project-static/docs/user-guide/administration/installation/install_system.html +2 -2
- nautobot/project-static/docs/user-guide/administration/installation/nautobot.html +2 -2
- nautobot/project-static/docs/user-guide/administration/installation/services.html +2 -2
- nautobot/project-static/docs/user-guide/administration/migration/migrating-from-netbox.html +2 -2
- nautobot/project-static/docs/user-guide/administration/migration/migrating-from-postgresql.html +2 -2
- nautobot/project-static/docs/user-guide/administration/tools/nautobot-server.html +2 -2
- nautobot/project-static/docs/user-guide/administration/tools/nautobot-shell.html +2 -2
- nautobot/project-static/docs/user-guide/administration/upgrading/database-backup.html +2 -2
- nautobot/project-static/docs/user-guide/administration/upgrading/from-v1/ipam/after-you-upgrade.html +2 -2
- nautobot/project-static/docs/user-guide/administration/upgrading/from-v1/ipam/before-you-upgrade.html +2 -2
- nautobot/project-static/docs/user-guide/administration/upgrading/from-v1/ipam/for-developers.html +2 -2
- nautobot/project-static/docs/user-guide/administration/upgrading/from-v1/ipam/index.html +2 -2
- nautobot/project-static/docs/user-guide/administration/upgrading/from-v1/ipam/whats-changed.html +2 -2
- nautobot/project-static/docs/user-guide/administration/upgrading/from-v1/region-and-site-data-migration-guide.html +2 -2
- nautobot/project-static/docs/user-guide/administration/upgrading/from-v1/upgrading-from-nautobot-v1.html +2 -2
- nautobot/project-static/docs/user-guide/administration/upgrading/upgrading.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/circuits/circuit.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/circuits/circuittermination.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/circuits/circuittype.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/circuits/provider.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/circuits/providernetwork.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/cloud/cloud.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/cloud/cloudaccount.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/cloud/cloudnetwork.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/cloud/cloudnetworkprefixassignment.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/cloud/cloudresourcetype.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/cloud/cloudservice.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/cloud/cloudservicenetworkassignment.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/cable.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/consoleport.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/consoleporttemplate.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/consoleserverport.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/consoleserverporttemplate.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/controller.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/controllermanageddevicegroup.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/device.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/devicebay.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/devicebaytemplate.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/devicefamily.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/deviceredundancygroup.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/devicetype.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/frontport.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/frontporttemplate.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/interface.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/interfaceredundancygroup.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/interfacetemplate.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/inventoryitem.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/location.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/locationtype.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/manufacturer.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/module.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/modulebay.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/modulebaytemplate.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/moduletype.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/platform.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/powerfeed.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/poweroutlet.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/poweroutlettemplate.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/powerpanel.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/powerport.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/powerporttemplate.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/rack.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/rackgroup.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/rackreservation.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/rearport.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/rearporttemplate.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/softwareimagefile.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/softwareversion.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/dcim/virtualchassis.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/extras/configcontext.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/extras/configcontextschema.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/extras/contact.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/extras/team.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/ipam/ipaddress.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/ipam/namespace.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/ipam/prefix.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/ipam/rir.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/ipam/routetarget.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/ipam/service.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/ipam/vlan.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/ipam/vlangroup.html +307 -2
- nautobot/project-static/docs/user-guide/core-data-model/ipam/vrf.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/overview/introduction.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/tenancy/tenant.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/tenancy/tenantgroup.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/virtualization/cluster.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/virtualization/clustergroup.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/virtualization/clustertype.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/virtualization/virtualmachine.html +2 -2
- nautobot/project-static/docs/user-guide/core-data-model/virtualization/vminterface.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/contacts-and-teams.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/custom-fields.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/getting-started/creating-devices.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/getting-started/creating-location-types-and-locations.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/getting-started/index.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/getting-started/interfaces.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/getting-started/ipam.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/getting-started/platforms.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/getting-started/search-bar.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/getting-started/tenants.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/getting-started/vlans-and-vlan-groups.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/git-data-source.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/graphql.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/ip-address-merge-tool.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/relationships.html +2 -2
- nautobot/project-static/docs/user-guide/feature-guides/software-image-files-and-versions.html +2 -2
- nautobot/project-static/docs/user-guide/index.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/change-logging.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/computedfield.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/customfield.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/customlink.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/dynamicgroup.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/exporttemplate.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/externalintegration.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/gitrepository.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/graphql.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/graphqlquery.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/imageattachment.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/jobs/index.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/jobs/job-scheduling-and-approvals.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/jobs/jobbutton.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/jobs/jobhook.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/jobs/models.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/napalm.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/note.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/objectmetadata.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/relationship.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/rest-api/authentication.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/rest-api/filtering.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/rest-api/overview.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/rest-api/ui-related-endpoints.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/role.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/savedview.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/secret.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/staticgroupassociation.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/status.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/tag.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/template-filters.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/users/objectpermission.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/users/token.html +2 -2
- nautobot/project-static/docs/user-guide/platform-functionality/webhook.html +2 -2
- {nautobot-2.3.4.dist-info → nautobot-2.3.6.dist-info}/METADATA +2 -2
- {nautobot-2.3.4.dist-info → nautobot-2.3.6.dist-info}/RECORD +327 -325
- {nautobot-2.3.4.dist-info → nautobot-2.3.6.dist-info}/LICENSE.txt +0 -0
- {nautobot-2.3.4.dist-info → nautobot-2.3.6.dist-info}/NOTICE +0 -0
- {nautobot-2.3.4.dist-info → nautobot-2.3.6.dist-info}/WHEEL +0 -0
- {nautobot-2.3.4.dist-info → nautobot-2.3.6.dist-info}/entry_points.txt +0 -0
nautobot/core/api/utils.py
CHANGED
|
@@ -116,7 +116,7 @@ def get_serializer_for_model(model, prefix=""):
|
|
|
116
116
|
return dynamic_import(serializer_name)
|
|
117
117
|
except AttributeError as exc:
|
|
118
118
|
raise exceptions.SerializerNotFound(
|
|
119
|
-
f"
|
|
119
|
+
f"Serializer for {app_label}.{model_name} not found, expected it at {serializer_name}"
|
|
120
120
|
) from exc
|
|
121
121
|
|
|
122
122
|
|
|
@@ -129,16 +129,26 @@ def nested_serializers_for_models(models, prefix=""):
|
|
|
129
129
|
|
|
130
130
|
Used exclusively in OpenAPI schema generation.
|
|
131
131
|
"""
|
|
132
|
+
from nautobot.core.api.serializers import BaseModelSerializer # avoid circular import
|
|
133
|
+
|
|
132
134
|
serializer_classes = []
|
|
133
135
|
for model in models:
|
|
134
136
|
try:
|
|
135
137
|
serializer_classes.append(get_serializer_for_model(model, prefix=prefix))
|
|
136
138
|
except exceptions.SerializerNotFound as exc:
|
|
137
|
-
logger.
|
|
139
|
+
logger.warning("%s", exc)
|
|
138
140
|
continue
|
|
139
141
|
|
|
140
142
|
nested_serializer_classes = []
|
|
141
143
|
for serializer_class in serializer_classes:
|
|
144
|
+
if not issubclass(serializer_class, BaseModelSerializer):
|
|
145
|
+
logger.warning(
|
|
146
|
+
"Serializer class %s.%s does not inherit from nautobot.apps.api.BaseModelSerializer. "
|
|
147
|
+
"This should probably be corrected.",
|
|
148
|
+
serializer_class.__module__,
|
|
149
|
+
serializer_class.__name__,
|
|
150
|
+
)
|
|
151
|
+
continue
|
|
142
152
|
nested_serializer_name = f"Nested{serializer_class.__name__}"
|
|
143
153
|
if nested_serializer_name in NESTED_SERIALIZER_CACHE:
|
|
144
154
|
nested_serializer_classes.append(NESTED_SERIALIZER_CACHE[nested_serializer_name])
|
nautobot/core/forms/fields.py
CHANGED
|
@@ -719,8 +719,11 @@ class NumericArrayField(SimpleArrayField):
|
|
|
719
719
|
|
|
720
720
|
def to_python(self, value):
|
|
721
721
|
try:
|
|
722
|
-
|
|
723
|
-
|
|
722
|
+
if not value:
|
|
723
|
+
value = ""
|
|
724
|
+
else:
|
|
725
|
+
value = ",".join([str(n) for n in forms.parse_numeric_range(value)])
|
|
726
|
+
except (TypeError, ValueError) as error:
|
|
724
727
|
raise ValidationError(error)
|
|
725
728
|
return super().to_python(value)
|
|
726
729
|
|
nautobot/core/forms/utils.py
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
from itertools import groupby
|
|
1
2
|
import re
|
|
2
3
|
|
|
3
4
|
from django import forms as django_forms
|
|
@@ -18,24 +19,31 @@ __all__ = (
|
|
|
18
19
|
)
|
|
19
20
|
|
|
20
21
|
|
|
21
|
-
def parse_numeric_range(
|
|
22
|
+
def parse_numeric_range(input_string, base=10):
|
|
22
23
|
"""
|
|
23
|
-
Expand a numeric range (continuous or not) into a decimal or
|
|
24
|
+
Expand a numeric range (continuous or not) into a sorted decimal or
|
|
24
25
|
hexadecimal list, as specified by the base parameter
|
|
25
26
|
'0-3,5' => [0, 1, 2, 3, 5]
|
|
26
27
|
'2,8-b,d,f' => [2, 8, 9, a, b, d, f]
|
|
27
28
|
"""
|
|
29
|
+
if base not in [10, 16]:
|
|
30
|
+
raise TypeError("Invalid base value.")
|
|
31
|
+
|
|
32
|
+
if not isinstance(input_string, str) or not input_string:
|
|
33
|
+
raise TypeError("Input value must be a string using a range format.")
|
|
34
|
+
|
|
28
35
|
values = []
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
for dash_range in string.split(","):
|
|
36
|
+
|
|
37
|
+
for dash_range in input_string.split(","):
|
|
32
38
|
try:
|
|
33
39
|
begin, end = dash_range.split("-")
|
|
40
|
+
if begin == "" or end == "":
|
|
41
|
+
raise TypeError("Input value must be a string using a range format.")
|
|
34
42
|
except ValueError:
|
|
35
43
|
begin, end = dash_range, dash_range
|
|
36
44
|
begin, end = int(begin.strip(), base=base), int(end.strip(), base=base) + 1
|
|
37
45
|
values.extend(range(begin, end))
|
|
38
|
-
return list(set(values))
|
|
46
|
+
return sorted(list(set(values)))
|
|
39
47
|
|
|
40
48
|
|
|
41
49
|
def parse_alphanumeric_range(string):
|
|
@@ -150,3 +158,20 @@ def add_field_to_filter_form_class(form_class, field_name, field_obj):
|
|
|
150
158
|
f"There was a conflict with filter form field `{field_name}`, the custom filter form field was ignored."
|
|
151
159
|
)
|
|
152
160
|
form_class.base_fields[field_name] = field_obj
|
|
161
|
+
|
|
162
|
+
|
|
163
|
+
def compress_range(iterable):
|
|
164
|
+
"""
|
|
165
|
+
Generates compressed range from an un-sorted expanded range.
|
|
166
|
+
For example:
|
|
167
|
+
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 100, 101, 102, 103, 104, 105, 1000, 1100, 1101, 1102, 1103, 1104, 1105, 1106]
|
|
168
|
+
=>
|
|
169
|
+
iter1: (1, 10)
|
|
170
|
+
iter2: (100, 105)
|
|
171
|
+
iter3: (1000, 1000)
|
|
172
|
+
iter4: (1100, 1106)
|
|
173
|
+
"""
|
|
174
|
+
iterable = sorted(set(iterable))
|
|
175
|
+
for _, grp in groupby(enumerate(iterable), lambda t: t[1] - t[0]):
|
|
176
|
+
grp = list(grp)
|
|
177
|
+
yield grp[0][1], grp[-1][1]
|
nautobot/core/models/fields.py
CHANGED
|
@@ -4,6 +4,7 @@ import re
|
|
|
4
4
|
from django.core import exceptions
|
|
5
5
|
from django.core.validators import MaxLengthValidator, RegexValidator
|
|
6
6
|
from django.db import models
|
|
7
|
+
from django.forms import TextInput
|
|
7
8
|
from django.utils.text import slugify
|
|
8
9
|
from django_extensions.db.fields import AutoSlugField as _AutoSlugField
|
|
9
10
|
from netaddr import AddrFormatError, EUI, mac_unix_expanded
|
|
@@ -11,6 +12,7 @@ from taggit.managers import TaggableManager
|
|
|
11
12
|
|
|
12
13
|
from nautobot.core.constants import CHARFIELD_MAX_LENGTH
|
|
13
14
|
from nautobot.core.forms import fields, widgets
|
|
15
|
+
from nautobot.core.forms.utils import compress_range, parse_numeric_range
|
|
14
16
|
from nautobot.core.models import ordering
|
|
15
17
|
from nautobot.core.models.managers import TagsManager
|
|
16
18
|
from nautobot.core.models.validators import EnhancedURLValidator
|
|
@@ -415,3 +417,57 @@ class TagsField(TaggableManager):
|
|
|
415
417
|
kwargs.setdefault("required", False)
|
|
416
418
|
kwargs.setdefault("query_params", {"content_types": self.model._meta.label_lower})
|
|
417
419
|
return super().formfield(form_class=form_class, **kwargs)
|
|
420
|
+
|
|
421
|
+
|
|
422
|
+
class PositiveRangeNumberTextField(models.TextField):
|
|
423
|
+
default_error_messages = {
|
|
424
|
+
"invalid": "Invalid value. Specify a value using non-negative integers in a range format (i.e. '10-20').",
|
|
425
|
+
}
|
|
426
|
+
|
|
427
|
+
description = "A text based representation of positive number range."
|
|
428
|
+
|
|
429
|
+
def __init__(self, min_boundary=0, max_boundary=None, *args, **kwargs):
|
|
430
|
+
super().__init__(*args, **kwargs)
|
|
431
|
+
self.min_boundary = min_boundary
|
|
432
|
+
self.max_boundary = max_boundary
|
|
433
|
+
|
|
434
|
+
def to_python(self, value):
|
|
435
|
+
if value is None:
|
|
436
|
+
return None
|
|
437
|
+
|
|
438
|
+
try:
|
|
439
|
+
self.expanded = sorted(parse_numeric_range(value))
|
|
440
|
+
except (ValueError, AttributeError):
|
|
441
|
+
raise exceptions.ValidationError(
|
|
442
|
+
self.error_messages["invalid"],
|
|
443
|
+
code="invalid",
|
|
444
|
+
params={"value": value},
|
|
445
|
+
)
|
|
446
|
+
|
|
447
|
+
converted_ranges = compress_range(self.expanded)
|
|
448
|
+
normalized_range = ",".join([f"{x[0]}" if x[0] == x[1] else f"{x[0]}-{x[1]}" for x in converted_ranges])
|
|
449
|
+
|
|
450
|
+
return normalized_range
|
|
451
|
+
|
|
452
|
+
def validate(self, value, model_instance):
|
|
453
|
+
"""
|
|
454
|
+
Validate `value` and raise ValidationError if necessary.
|
|
455
|
+
"""
|
|
456
|
+
super().validate(value, model_instance)
|
|
457
|
+
|
|
458
|
+
if (self.min_boundary is not None and self.expanded[0] < self.min_boundary) or (
|
|
459
|
+
self.max_boundary is not None and self.expanded[-1] > self.max_boundary
|
|
460
|
+
):
|
|
461
|
+
raise exceptions.ValidationError(
|
|
462
|
+
message=f"Invalid value. Specify a range value between {self.min_boundary}-{self.max_boundary or 'unlimited'}",
|
|
463
|
+
code="outofrange",
|
|
464
|
+
params={"value": value},
|
|
465
|
+
)
|
|
466
|
+
|
|
467
|
+
def formfield(self, **kwargs):
|
|
468
|
+
return super().formfield(
|
|
469
|
+
**{
|
|
470
|
+
"widget": TextInput,
|
|
471
|
+
**kwargs,
|
|
472
|
+
}
|
|
473
|
+
)
|
nautobot/core/tests/runner.py
CHANGED
|
@@ -64,9 +64,16 @@ class NautobotTestRunner(DiscoverRunner):
|
|
|
64
64
|
action="store_true",
|
|
65
65
|
help="Save test database to a json fixture file to re-use on subsequent tests.",
|
|
66
66
|
)
|
|
67
|
+
parser.add_argument(
|
|
68
|
+
"--no-reusedb",
|
|
69
|
+
action="store_false",
|
|
70
|
+
dest="reusedb",
|
|
71
|
+
help="Supplement to --keepdb; if --no-reusedb is set an existing database will NOT be reused.",
|
|
72
|
+
)
|
|
67
73
|
|
|
68
|
-
def __init__(self, cache_test_fixtures=False, **kwargs):
|
|
74
|
+
def __init__(self, cache_test_fixtures=False, reusedb=True, **kwargs):
|
|
69
75
|
self.cache_test_fixtures = cache_test_fixtures
|
|
76
|
+
self.reusedb = reusedb
|
|
70
77
|
|
|
71
78
|
# Assert "integration" hasn't been provided w/ --tag
|
|
72
79
|
incoming_tags = kwargs.get("tags") or []
|
|
@@ -118,7 +125,9 @@ class NautobotTestRunner(DiscoverRunner):
|
|
|
118
125
|
connection.creation.create_test_db(
|
|
119
126
|
verbosity=self.verbosity,
|
|
120
127
|
autoclobber=not self.interactive,
|
|
121
|
-
keepdb=self.keepdb
|
|
128
|
+
keepdb=self.keepdb
|
|
129
|
+
# Extra check added for Nautobot:
|
|
130
|
+
and self.reusedb,
|
|
122
131
|
serialize=connection.settings_dict["TEST"].get("SERIALIZE", True),
|
|
123
132
|
)
|
|
124
133
|
|
|
@@ -149,7 +158,7 @@ class NautobotTestRunner(DiscoverRunner):
|
|
|
149
158
|
verbosity=self.verbosity,
|
|
150
159
|
keepdb=self.keepdb
|
|
151
160
|
# Extra check added for Nautobot:
|
|
152
|
-
and
|
|
161
|
+
and self.reusedb,
|
|
153
162
|
)
|
|
154
163
|
|
|
155
164
|
# Configure all other connections as mirrors of the first one
|
|
@@ -179,9 +188,7 @@ class NautobotTestRunner(DiscoverRunner):
|
|
|
179
188
|
connection.creation.destroy_test_db(
|
|
180
189
|
suffix=str(index + 1),
|
|
181
190
|
verbosity=self.verbosity,
|
|
182
|
-
keepdb=self.keepdb
|
|
183
|
-
# Extra check added for Nautobot
|
|
184
|
-
and not settings.TEST_USE_FACTORIES,
|
|
191
|
+
keepdb=self.keepdb,
|
|
185
192
|
)
|
|
186
193
|
|
|
187
194
|
# Extra block added for Nautobot
|
|
@@ -11,6 +11,7 @@ from django.http import QueryDict
|
|
|
11
11
|
from nautobot.circuits import models as circuits_models
|
|
12
12
|
from nautobot.core import exceptions, forms, settings_funcs
|
|
13
13
|
from nautobot.core.api import utils as api_utils
|
|
14
|
+
from nautobot.core.forms.utils import compress_range
|
|
14
15
|
from nautobot.core.models import fields as core_fields, utils as models_utils, validators
|
|
15
16
|
from nautobot.core.testing import TestCase
|
|
16
17
|
from nautobot.core.utils import data as data_utils, filtering, lookup, requests
|
|
@@ -365,6 +366,88 @@ class PrettyPrintQueryTest(TestCase):
|
|
|
365
366
|
self.assertEqual(models_utils.pretty_print_query(query), expected)
|
|
366
367
|
|
|
367
368
|
|
|
369
|
+
class CompressRangeTest(TestCase):
|
|
370
|
+
"""Tests for compress_range()."""
|
|
371
|
+
|
|
372
|
+
def test_compress_range_sparse(self):
|
|
373
|
+
values = [1500, 200, 10, 2222, 3000, 4096]
|
|
374
|
+
self.assertEqual(
|
|
375
|
+
list(compress_range(values)),
|
|
376
|
+
[
|
|
377
|
+
(10, 10),
|
|
378
|
+
(200, 200),
|
|
379
|
+
(1500, 1500),
|
|
380
|
+
(2222, 2222),
|
|
381
|
+
(3000, 3000),
|
|
382
|
+
(4096, 4096),
|
|
383
|
+
],
|
|
384
|
+
)
|
|
385
|
+
|
|
386
|
+
def test_compress_range_dense(self):
|
|
387
|
+
values = [
|
|
388
|
+
1,
|
|
389
|
+
2,
|
|
390
|
+
3,
|
|
391
|
+
4,
|
|
392
|
+
5,
|
|
393
|
+
6,
|
|
394
|
+
7,
|
|
395
|
+
8,
|
|
396
|
+
9,
|
|
397
|
+
10,
|
|
398
|
+
100,
|
|
399
|
+
101,
|
|
400
|
+
102,
|
|
401
|
+
103,
|
|
402
|
+
104,
|
|
403
|
+
105,
|
|
404
|
+
1100,
|
|
405
|
+
1101,
|
|
406
|
+
1102,
|
|
407
|
+
1103,
|
|
408
|
+
1104,
|
|
409
|
+
1105,
|
|
410
|
+
1106,
|
|
411
|
+
]
|
|
412
|
+
self.assertEqual(
|
|
413
|
+
list(compress_range(values)),
|
|
414
|
+
[(1, 10), (100, 105), (1100, 1106)],
|
|
415
|
+
)
|
|
416
|
+
|
|
417
|
+
def test_compress_range_complex(self):
|
|
418
|
+
values = [
|
|
419
|
+
10,
|
|
420
|
+
11,
|
|
421
|
+
12,
|
|
422
|
+
13,
|
|
423
|
+
14,
|
|
424
|
+
15,
|
|
425
|
+
100,
|
|
426
|
+
200,
|
|
427
|
+
210,
|
|
428
|
+
211,
|
|
429
|
+
212,
|
|
430
|
+
222,
|
|
431
|
+
500,
|
|
432
|
+
501,
|
|
433
|
+
502,
|
|
434
|
+
503,
|
|
435
|
+
600,
|
|
436
|
+
]
|
|
437
|
+
self.assertEqual(
|
|
438
|
+
list(compress_range(values)),
|
|
439
|
+
[
|
|
440
|
+
(10, 15),
|
|
441
|
+
(100, 100),
|
|
442
|
+
(200, 200),
|
|
443
|
+
(210, 212),
|
|
444
|
+
(222, 222),
|
|
445
|
+
(500, 503),
|
|
446
|
+
(600, 600),
|
|
447
|
+
],
|
|
448
|
+
)
|
|
449
|
+
|
|
450
|
+
|
|
368
451
|
class SlugifyFunctionsTest(TestCase):
|
|
369
452
|
"""Test custom slugify functions."""
|
|
370
453
|
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import re
|
|
2
|
-
from unittest import mock
|
|
2
|
+
from unittest import mock, skipIf
|
|
3
3
|
import urllib.parse
|
|
4
4
|
|
|
5
5
|
from django.apps import apps
|
|
6
|
+
from django.conf import settings
|
|
6
7
|
from django.contrib.contenttypes.models import ContentType
|
|
7
8
|
from django.core.files.uploadedfile import SimpleUploadedFile
|
|
8
9
|
from django.test import override_settings, RequestFactory
|
|
@@ -572,3 +573,41 @@ class SilkUIAccessTestCase(TestCase):
|
|
|
572
573
|
|
|
573
574
|
# Check for success status code (e.g., 200)
|
|
574
575
|
self.assertEqual(response.status_code, 200)
|
|
576
|
+
|
|
577
|
+
|
|
578
|
+
class ExampleViewWithCustomPermissionsTest(TestCase):
|
|
579
|
+
@skipIf(
|
|
580
|
+
"example_app" not in settings.PLUGINS,
|
|
581
|
+
"example_app not in settings.PLUGINS",
|
|
582
|
+
)
|
|
583
|
+
@override_settings(EXEMPT_VIEW_PERMISSIONS=[])
|
|
584
|
+
def test_permission_classes_attribute_is_enforced(self):
|
|
585
|
+
"""
|
|
586
|
+
If example app is installed, check if the ViewWithCustomPermissions
|
|
587
|
+
is enforcing the permissions specified in its `permission_classes` attribute.
|
|
588
|
+
"""
|
|
589
|
+
# Test IsAuthenticated permission
|
|
590
|
+
self.add_permissions("example_app.view_examplemodel")
|
|
591
|
+
self.client.logout()
|
|
592
|
+
url = reverse("plugins:example_app:view_with_custom_permissions")
|
|
593
|
+
response = self.client.get(url, follow=True)
|
|
594
|
+
self.assertHttpStatus(response, 200)
|
|
595
|
+
response_body = response.content.decode(response.charset)
|
|
596
|
+
# check if the user is redirected to the login page
|
|
597
|
+
self.assertIn(f'<input type="hidden" name="next" value="{url}" />', response_body)
|
|
598
|
+
|
|
599
|
+
# Test IsAdmin permission
|
|
600
|
+
self.client.force_login(self.user)
|
|
601
|
+
response = self.client.get(url, follow=True)
|
|
602
|
+
self.assertHttpStatus(response, 403)
|
|
603
|
+
response_body = response.content.decode(response.charset)
|
|
604
|
+
# check if the users have to have the permission to access the page
|
|
605
|
+
self.assertIn("You do not have permission to access this page.", response_body)
|
|
606
|
+
|
|
607
|
+
# View should be successfully accessed
|
|
608
|
+
self.user.is_staff = True
|
|
609
|
+
self.user.save()
|
|
610
|
+
response = self.client.get(url)
|
|
611
|
+
self.assertHttpStatus(response, 200)
|
|
612
|
+
response_body = response.content.decode(response.charset)
|
|
613
|
+
self.assertIn("You are viewing a table of example models", response_body)
|
nautobot/core/views/generic.py
CHANGED
|
@@ -17,7 +17,7 @@ from django.db.models import ManyToManyField, ProtectedError, Q
|
|
|
17
17
|
from django.forms import Form, ModelMultipleChoiceField, MultipleHiddenInput
|
|
18
18
|
from django.http import HttpResponse
|
|
19
19
|
from django.shortcuts import get_object_or_404, redirect, render
|
|
20
|
-
from django.urls import reverse
|
|
20
|
+
from django.urls import resolve, reverse
|
|
21
21
|
from django.utils.encoding import iri_to_uri
|
|
22
22
|
from django.utils.html import format_html
|
|
23
23
|
from django.utils.http import url_has_allowed_host_and_scheme
|
|
@@ -205,17 +205,16 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
|
|
|
205
205
|
filter_form = None
|
|
206
206
|
hide_hierarchy_ui = False
|
|
207
207
|
clear_view = request.GET.get("clear_view", False)
|
|
208
|
+
resolved_path = resolve(request.path)
|
|
209
|
+
list_url = f"{resolved_path.app_name}:{resolved_path.url_name}"
|
|
208
210
|
|
|
209
211
|
# If the user clicks on the clear view button, we do not check for global or user defaults
|
|
210
212
|
if not clear_view and not request.GET.get("saved_view"):
|
|
211
213
|
# Check if there is a default for this view for this specific user
|
|
212
|
-
app_label, model_name = model._meta.label.split(".")
|
|
213
|
-
view_name = f"{app_label}:{model_name.lower()}_list"
|
|
214
|
-
|
|
215
214
|
if not isinstance(user, AnonymousUser):
|
|
216
215
|
try:
|
|
217
216
|
user_default_saved_view_pk = UserSavedViewAssociation.objects.get(
|
|
218
|
-
user=user, view_name=
|
|
217
|
+
user=user, view_name=list_url
|
|
219
218
|
).saved_view.pk
|
|
220
219
|
# Saved view should either belong to the user or be public
|
|
221
220
|
SavedView.objects.get(
|
|
@@ -229,7 +228,7 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
|
|
|
229
228
|
|
|
230
229
|
# Check if there is a global default for this view
|
|
231
230
|
try:
|
|
232
|
-
global_saved_view = SavedView.objects.get(view=
|
|
231
|
+
global_saved_view = SavedView.objects.get(view=list_url, is_global_default=True)
|
|
233
232
|
return redirect(reverse("extras:savedview", kwargs={"pk": global_saved_view.pk}))
|
|
234
233
|
except ObjectDoesNotExist:
|
|
235
234
|
pass
|
|
@@ -302,7 +301,6 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
|
|
|
302
301
|
table_config_form = None
|
|
303
302
|
current_saved_view = None
|
|
304
303
|
current_saved_view_pk = self.request.GET.get("saved_view", None)
|
|
305
|
-
list_url = validated_viewname(model, "list")
|
|
306
304
|
# We are not using .restrict(request.user, "view") here
|
|
307
305
|
# User should be able to see any saved view that he has the list view access to.
|
|
308
306
|
if user.has_perms(["extras.view_savedview"]):
|
|
@@ -315,15 +313,17 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
|
|
|
315
313
|
SavedView.objects.filter(view=list_url, owner=user).order_by("name").only("pk", "name")
|
|
316
314
|
)
|
|
317
315
|
saved_views = shared_saved_views | user_owned_saved_views
|
|
316
|
+
|
|
317
|
+
if current_saved_view_pk:
|
|
318
|
+
try:
|
|
319
|
+
# We are not using .restrict(request.user, "view") here
|
|
320
|
+
# User should be able to see any saved view that he has the list view access to.
|
|
321
|
+
current_saved_view = SavedView.objects.get(view=list_url, pk=current_saved_view_pk)
|
|
322
|
+
except ObjectDoesNotExist:
|
|
323
|
+
messages.error(request, f"Saved view {current_saved_view_pk} not found")
|
|
324
|
+
|
|
325
|
+
# Construct the objects table
|
|
318
326
|
if self.table:
|
|
319
|
-
# Construct the objects table
|
|
320
|
-
if current_saved_view_pk:
|
|
321
|
-
try:
|
|
322
|
-
# We are not using .restrict(request.user, "view") here
|
|
323
|
-
# User should be able to see any saved view that he has the list view access to.
|
|
324
|
-
current_saved_view = SavedView.objects.get(view=list_url, pk=current_saved_view_pk)
|
|
325
|
-
except ObjectDoesNotExist:
|
|
326
|
-
messages.error(request, f"Saved view {current_saved_view_pk} not found")
|
|
327
327
|
if self.request.GET.getlist("sort") or (
|
|
328
328
|
current_saved_view is not None and current_saved_view.config.get("sort_order")
|
|
329
329
|
):
|
nautobot/core/views/mixins.py
CHANGED
|
@@ -234,6 +234,7 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
|
|
|
234
234
|
serializer_class = None
|
|
235
235
|
table_class = None
|
|
236
236
|
notes_form_class = NoteForm
|
|
237
|
+
permission_classes = []
|
|
237
238
|
|
|
238
239
|
def get_permissions_for_model(self, model, actions):
|
|
239
240
|
"""
|
|
@@ -267,7 +268,7 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
|
|
|
267
268
|
"""
|
|
268
269
|
user = self.request.user
|
|
269
270
|
permission_required = self.get_required_permission()
|
|
270
|
-
# Check that the user has been granted the required permission(s) one by one.
|
|
271
|
+
# Check that the user has been granted the required Nautobot-specific object permission(s) one by one.
|
|
271
272
|
# In case the permission has `message` or `code`` attribute, we want to include those information in the permission_denied error.
|
|
272
273
|
for permission in permission_required:
|
|
273
274
|
# If the user does not have the permission required, we raise DRF's `NotAuthenticated` or `PermissionDenied` exception
|
|
@@ -280,6 +281,16 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
|
|
|
280
281
|
code=getattr(permission, "code", None),
|
|
281
282
|
)
|
|
282
283
|
|
|
284
|
+
# Check for drf-specific permissions (IsAutheticated, etc) in permission_classes which is empty by default.
|
|
285
|
+
# self.get_permissions() iterates through permissions specified in the `permission_classes` attribute.
|
|
286
|
+
for permission in self.get_permissions():
|
|
287
|
+
# If the user does not have the permission required, we raise DRF's `NotAuthenticated` or `PermissionDenied` exception
|
|
288
|
+
# which will be handled by self.handle_no_permission() in the UI appropriately in the dispatch() method
|
|
289
|
+
if not permission.has_permission(request, self):
|
|
290
|
+
self.permission_denied(
|
|
291
|
+
request, message=getattr(permission, "message", None), code=getattr(permission, "code", None)
|
|
292
|
+
)
|
|
293
|
+
|
|
283
294
|
def dispatch(self, request, *args, **kwargs):
|
|
284
295
|
"""
|
|
285
296
|
Override the default dispatch() method to check permissions first.
|
nautobot/core/views/renderers.py
CHANGED
|
@@ -5,6 +5,7 @@ from django.contrib.contenttypes.models import ContentType
|
|
|
5
5
|
from django.core.exceptions import ObjectDoesNotExist
|
|
6
6
|
from django.db.models import Q
|
|
7
7
|
from django.template import engines, loader
|
|
8
|
+
from django.urls import resolve
|
|
8
9
|
from django_tables2 import RequestConfig
|
|
9
10
|
from rest_framework import renderers
|
|
10
11
|
|
|
@@ -295,7 +296,8 @@ class NautobotHTMLRenderer(renderers.BrowsableAPIRenderer):
|
|
|
295
296
|
# Construct valid actions for list view.
|
|
296
297
|
valid_actions = self.validate_action_buttons(view, request)
|
|
297
298
|
# Query SavedViews for dropdown button
|
|
298
|
-
|
|
299
|
+
resolved_path = resolve(request.path)
|
|
300
|
+
list_url = f"{resolved_path.app_name}:{resolved_path.url_name}"
|
|
299
301
|
saved_views = None
|
|
300
302
|
if model.is_saved_view_model:
|
|
301
303
|
# We are not using .restrict(request.user, "view") here
|
nautobot/core/views/utils.py
CHANGED
|
@@ -213,7 +213,7 @@ def handle_protectederror(obj_list, request, e):
|
|
|
213
213
|
protected_objects = list(e.protected_objects)
|
|
214
214
|
protected_count = len(protected_objects) if len(protected_objects) <= 50 else "More than 50"
|
|
215
215
|
err_message = format_html(
|
|
216
|
-
"Unable to delete <strong>{}</strong>. {} dependent objects were found: ",
|
|
216
|
+
str(e.args[0]) if e.args else "Unable to delete <strong>{}</strong>. {} dependent objects were found: ",
|
|
217
217
|
", ".join(str(obj) for obj in obj_list),
|
|
218
218
|
protected_count,
|
|
219
219
|
)
|
nautobot/dcim/api/serializers.py
CHANGED
|
@@ -389,6 +389,7 @@ class RackElevationDetailFilterSerializer(serializers.Serializer):
|
|
|
389
389
|
expand_devices = serializers.BooleanField(required=False, default=True)
|
|
390
390
|
include_images = serializers.BooleanField(required=False, default=True)
|
|
391
391
|
display_fullname = serializers.BooleanField(required=False, default=True)
|
|
392
|
+
is_occupied = serializers.BooleanField(required=False, allow_null=True, default=None)
|
|
392
393
|
|
|
393
394
|
def validate(self, attrs):
|
|
394
395
|
attrs.setdefault("unit_width", get_settings_or_config("RACK_ELEVATION_DEFAULT_UNIT_WIDTH"))
|
nautobot/dcim/api/views.py
CHANGED
|
@@ -231,6 +231,8 @@ class RackViewSet(NautobotModelViewSet):
|
|
|
231
231
|
exclude=data["exclude"],
|
|
232
232
|
expand_devices=data["expand_devices"],
|
|
233
233
|
)
|
|
234
|
+
if data["is_occupied"] is not None:
|
|
235
|
+
elevation = [u for u in elevation if u["occupied"] == data["is_occupied"]]
|
|
234
236
|
|
|
235
237
|
# Enable filtering rack units by ID
|
|
236
238
|
q = data["q"]
|
nautobot/dcim/forms.py
CHANGED
|
@@ -1900,7 +1900,7 @@ class DeviceForm(LocatableModelFormMixin, NautobotModelForm, TenancyForm, LocalC
|
|
|
1900
1900
|
widget=APISelect(
|
|
1901
1901
|
api_url="/api/dcim/racks/{{rack}}/elevation/",
|
|
1902
1902
|
attrs={
|
|
1903
|
-
"disabled-indicator": "
|
|
1903
|
+
"disabled-indicator": "occupied",
|
|
1904
1904
|
"data-query-param-face": '["$face"]',
|
|
1905
1905
|
},
|
|
1906
1906
|
),
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
</tr>
|
|
17
17
|
<tr>
|
|
18
18
|
<td>Device Types</td>
|
|
19
|
-
<td><a href="{% url 'dcim:devicetype_list' %}?device_family={{ object.name }}">{{
|
|
19
|
+
<td><a href="{% url 'dcim:devicetype_list' %}?device_family={{ object.name }}">{{ device_type_count }}</a></td>
|
|
20
20
|
</tr>
|
|
21
21
|
<tr>
|
|
22
22
|
<td>Total Devices</td>
|
nautobot/dcim/tests/test_api.py
CHANGED
|
@@ -139,7 +139,7 @@ class Mixins:
|
|
|
139
139
|
super().setUpTestData()
|
|
140
140
|
cls.device_type = DeviceType.objects.first()
|
|
141
141
|
cls.manufacturer = cls.device_type.manufacturer
|
|
142
|
-
cls.location = Location.objects.filter(
|
|
142
|
+
cls.location = Location.objects.filter(location_type__name="Campus").first()
|
|
143
143
|
cls.device_role = Role.objects.get_for_model(Device).first()
|
|
144
144
|
cls.device_status = Status.objects.get_for_model(Device).first()
|
|
145
145
|
cls.device = Device.objects.create(
|
|
@@ -539,6 +539,8 @@ class RackGroupTest(APIViewTestCases.APIViewTestCase, APIViewTestCases.TreeModel
|
|
|
539
539
|
def setUpTestData(cls):
|
|
540
540
|
cls.status = Status.objects.get_for_model(Location).first()
|
|
541
541
|
location_type = LocationType.objects.create(name="Location Type 1")
|
|
542
|
+
location_type.content_types.add(ContentType.objects.get_for_model(RackGroup))
|
|
543
|
+
|
|
542
544
|
cls.locations = (
|
|
543
545
|
Location.objects.create(name="Location 1", location_type=location_type, status=cls.status),
|
|
544
546
|
Location.objects.create(name="Location 2", location_type=location_type, status=cls.status),
|
|
@@ -548,8 +550,6 @@ class RackGroupTest(APIViewTestCases.APIViewTestCase, APIViewTestCases.TreeModel
|
|
|
548
550
|
RackGroup.objects.create(location=cls.locations[1], name="Parent Rack Group 2"),
|
|
549
551
|
)
|
|
550
552
|
|
|
551
|
-
location_type.content_types.add(ContentType.objects.get_for_model(RackGroup))
|
|
552
|
-
|
|
553
553
|
RackGroup.objects.create(
|
|
554
554
|
location=cls.locations[0],
|
|
555
555
|
name="Rack Group 1",
|
|
@@ -643,7 +643,10 @@ class RackTest(APIViewTestCases.APIViewTestCase):
|
|
|
643
643
|
|
|
644
644
|
@classmethod
|
|
645
645
|
def setUpTestData(cls):
|
|
646
|
-
locations = Location.objects.
|
|
646
|
+
locations = Location.objects.filter(devices__isnull=False)[:2]
|
|
647
|
+
for location in locations:
|
|
648
|
+
location.location_type.content_types.add(ContentType.objects.get_for_model(RackGroup))
|
|
649
|
+
location.location_type.content_types.add(ContentType.objects.get_for_model(Rack))
|
|
647
650
|
|
|
648
651
|
rack_groups = (
|
|
649
652
|
RackGroup.objects.create(location=locations[0], name="Rack Group 1"),
|
|
@@ -675,6 +678,22 @@ class RackTest(APIViewTestCases.APIViewTestCase):
|
|
|
675
678
|
status=statuses[0],
|
|
676
679
|
)
|
|
677
680
|
|
|
681
|
+
populated_rack = Rack.objects.create(
|
|
682
|
+
location=locations[0],
|
|
683
|
+
rack_group=rack_groups[0],
|
|
684
|
+
role=rack_roles[0],
|
|
685
|
+
name="Populated Rack",
|
|
686
|
+
status=statuses[0],
|
|
687
|
+
)
|
|
688
|
+
# Place a device in Rack 4
|
|
689
|
+
device = Device.objects.filter(
|
|
690
|
+
location=populated_rack.location, rack__isnull=True, device_type__u_height__gt=0
|
|
691
|
+
).first()
|
|
692
|
+
device.rack = populated_rack
|
|
693
|
+
device.face = "front"
|
|
694
|
+
device.position = 10
|
|
695
|
+
device.save()
|
|
696
|
+
|
|
678
697
|
cls.create_data = [
|
|
679
698
|
{
|
|
680
699
|
"name": "Test Rack 4",
|
|
@@ -742,6 +761,44 @@ class RackTest(APIViewTestCases.APIViewTestCase):
|
|
|
742
761
|
response = self.client.get(url, params, **self.header)
|
|
743
762
|
self.assertHttpStatus(response, 200)
|
|
744
763
|
|
|
764
|
+
def test_filter_rack_elevation_is_occupied(self):
|
|
765
|
+
"""
|
|
766
|
+
Test filtering the list of rack elevations by occupied status.
|
|
767
|
+
"""
|
|
768
|
+
rack = Rack.objects.get(name="Populated Rack")
|
|
769
|
+
self.add_permissions("dcim.view_rack")
|
|
770
|
+
url = reverse("dcim-api:rack-elevation", kwargs={"pk": rack.pk})
|
|
771
|
+
# Get all units first
|
|
772
|
+
params = {"face": "front"}
|
|
773
|
+
response = self.client.get(url, params, **self.header)
|
|
774
|
+
all_units = response.data["results"]
|
|
775
|
+
# Assert the count is equal to the number of units in the rack
|
|
776
|
+
self.assertEqual(len(all_units), rack.u_height)
|
|
777
|
+
|
|
778
|
+
# Next get only unoccupied units
|
|
779
|
+
params = {"face": "front", "is_occupied": False}
|
|
780
|
+
response = self.client.get(url, params, **self.header)
|
|
781
|
+
unoccupied_units = response.data["results"]
|
|
782
|
+
# Assert the count is more than 0
|
|
783
|
+
self.assertGreater(len(unoccupied_units), 0)
|
|
784
|
+
# Assert the unoccupied count is less than the total number of units
|
|
785
|
+
self.assertLess(len(unoccupied_units), len(all_units))
|
|
786
|
+
|
|
787
|
+
# Next get only occupied units
|
|
788
|
+
params = {"face": "front", "is_occupied": True}
|
|
789
|
+
response = self.client.get(url, params, **self.header)
|
|
790
|
+
occupied_units = response.data["results"]
|
|
791
|
+
# Assert the count is more than 0
|
|
792
|
+
self.assertGreater(len(occupied_units), 0)
|
|
793
|
+
# Assert the occupied count is less than the total number of units
|
|
794
|
+
self.assertLess(len(occupied_units), len(all_units))
|
|
795
|
+
|
|
796
|
+
# Assert that the sum of unoccupied and occupied units is equal to the total number of units
|
|
797
|
+
self.assertEqual(len(unoccupied_units) + len(occupied_units), len(all_units))
|
|
798
|
+
# Assert that the lists are mutually exclusive
|
|
799
|
+
self.assertEqual(len([unit for unit in unoccupied_units if unit in occupied_units]), 0)
|
|
800
|
+
self.assertEqual(len([unit for unit in occupied_units if unit in unoccupied_units]), 0)
|
|
801
|
+
|
|
745
802
|
def test_get_rack_elevation_svg(self):
|
|
746
803
|
"""
|
|
747
804
|
GET a single rack elevation in SVG format.
|