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

nautobot/cloud/tests/test_views.py

@@ -0,0 +1,153 @@
+from django.contrib.contenttypes.models import ContentType
+
+from nautobot.cloud.models import CloudAccount, CloudNetwork, CloudResourceType, CloudService
+from nautobot.core.testing import ViewTestCases
+from nautobot.dcim.models import Manufacturer
+from nautobot.extras.models import SecretsGroup, Tag
+
+
+class CloudAccountTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+    model = CloudAccount
+
+    @classmethod
+    def setUpTestData(cls):
+        providers = Manufacturer.objects.all()
+        secrets_groups = (
+            SecretsGroup.objects.create(name="Secrets Group 1"),
+            SecretsGroup.objects.create(name="Secrets Group 2"),
+            SecretsGroup.objects.create(name="Secrets Group 3"),
+        )
+        CloudAccount.objects.create(name="Deletable Cloud Account 1", account_number="123456", provider=providers[0])
+        CloudAccount.objects.create(name="Deletable Cloud Account 2", account_number="234567", provider=providers[0])
+        CloudAccount.objects.create(name="Deletable Cloud Account 3", account_number="345678", provider=providers[0])
+        cls.form_data = {
+            "name": "New Cloud Account",
+            "account_number": "8928371982310",
+            "provider": providers[1].pk,
+            "secrets_group": secrets_groups[1].pk,
+            "description": "A new cloud account",
+            "tags": [t.pk for t in Tag.objects.get_for_model(CloudAccount)],
+        }
+
+        cls.bulk_edit_data = {
+            "provider": providers[1].pk,
+            "secrets_group": secrets_groups[1].pk,
+            "description": "New description",
+            "comments": "New comments",
+        }
+
+
+class CloudNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+    model = CloudNetwork
+
+    @classmethod
+    def setUpTestData(cls):
+        cloud_services = CloudService.objects.all()[:2]
+        cloud_network_ct = ContentType.objects.get_for_model(CloudNetwork)
+
+        cloud_resource_types = CloudResourceType.objects.get_for_model(CloudNetwork)
+        cloud_accounts = CloudAccount.objects.all()
+        cloud_resource_type_1 = cloud_resource_types[0]
+        cloud_resource_type_2 = cloud_resource_types[1]
+
+        cloud_resource_type_1.content_types.add(cloud_network_ct)
+        cloud_resource_type_2.content_types.add(cloud_network_ct)
+
+        cn = CloudNetwork.objects.create(
+            name="Deletable Cloud Network 1", cloud_resource_type=cloud_resource_type_1, cloud_account=cloud_accounts[0]
+        )
+        CloudNetwork.objects.create(
+            name="Deletable Cloud Network 2", cloud_resource_type=cloud_resource_type_1, cloud_account=cloud_accounts[0]
+        )
+        CloudNetwork.objects.create(
+            name="Deletable Cloud Network 3",
+            cloud_resource_type=cloud_resource_type_1,
+            cloud_account=cloud_accounts[0],
+            parent=cn,
+        )
+
+        cls.form_data = {
+            "name": "New Cloud Network",
+            "description": "A new cloud network",
+            "cloud_resource_type": cloud_resource_type_2.pk,
+            "cloud_account": cloud_accounts[1].pk,
+            "cloud_services": [cloud_services[0].pk, cloud_services[1].pk],
+            "parent": cn.pk,
+            "tags": [t.pk for t in Tag.objects.get_for_model(CloudNetwork)],
+        }
+
+        cls.bulk_edit_data = {
+            "description": "New description",
+            "cloud_resource_type": cloud_resource_types[1].pk,
+            "cloud_account": cloud_accounts[1].pk,
+            "add_cloud_services": [cloud_services[1].pk],
+            "remove_cloud_services": [cloud_services[0].pk],
+        }
+
+
+class CloudResourceTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+    model = CloudResourceType
+
+    @classmethod
+    def setUpTestData(cls):
+        providers = Manufacturer.objects.all()
+        CloudResourceType.objects.create(name="Deletable Cloud Resource Type 1", provider=providers[0])
+        CloudResourceType.objects.create(name="Deletable Cloud Resource Type 2", provider=providers[0])
+        CloudResourceType.objects.create(name="Deletable Cloud Resource Type 3", provider=providers[0])
+
+        cts = [
+            ContentType.objects.get_for_model(CloudNetwork),
+        ]
+
+        cls.form_data = {
+            "name": "New Cloud Resource Type",
+            "provider": providers[1].pk,
+            "description": "A new cloud resource type",
+            "content_types": [cts[0].id],
+            "tags": [t.pk for t in Tag.objects.get_for_model(CloudResourceType)],
+        }
+
+        cls.bulk_edit_data = {
+            "provider": providers[1].pk,
+            "content_types": [cts[0].id],
+            "description": "New description",
+        }
+
+
+class CloudServiceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+    model = CloudService
+
+    @classmethod
+    def setUpTestData(cls):
+        cloud_resource_types = CloudResourceType.objects.get_for_model(CloudService)
+        cloud_networks = CloudNetwork.objects.all()
+        cloud_accounts = CloudAccount.objects.all()
+        cloud_services = (
+            CloudService.objects.create(name="Deletable Cloud Service 1", cloud_resource_type=cloud_resource_types[0]),
+            CloudService.objects.create(name="Deletable Cloud Service 2", cloud_resource_type=cloud_resource_types[1]),
+            CloudService.objects.create(
+                name="Deletable Cloud Service 3",
+                cloud_resource_type=cloud_resource_types[2],
+                cloud_account=cloud_accounts[0],
+            ),
+        )
+        cloud_services[0].cloud_networks.set([cloud_networks[0]])
+        cloud_services[1].cloud_networks.set([cloud_networks[1]])
+        cloud_services[2].cloud_networks.set([cloud_networks[2]])
+
+        cls.form_data = {
+            "name": "New Cloud Service",
+            "description": "It is a new one",
+            "cloud_networks": [cloud_networks[1].pk],
+            "cloud_resource_type": cloud_resource_types[1].pk,
+            "cloud_account": cloud_accounts[1].pk,
+            "extra_config": '{"role": 1, "status": "greetings"}',
+            "tags": [t.pk for t in Tag.objects.get_for_model(CloudService)],
+        }
+
+        cls.bulk_edit_data = {
+            "cloud_account": cloud_accounts[2].pk,
+            "description": "testing",
+            "add_cloud_networks": [cloud_networks[2].pk],
+            "remove_cloud_networks": [cloud_networks[0].pk],
+        }

nautobot/cloud/urls.py

@@ -0,0 +1,14 @@
+from nautobot.core.views.routers import NautobotUIViewSetRouter
+
+from . import views
+
+app_name = "cloud"
+router = NautobotUIViewSetRouter()
+
+router.register("cloud-accounts", views.CloudAccountUIViewSet)
+router.register("cloud-networks", views.CloudNetworkUIViewSet)
+router.register("cloud-resource-types", views.CloudResourceTypeUIViewSet)
+router.register("cloud-services", views.CloudServiceUIViewSet)
+
+urlpatterns = []
+urlpatterns += router.urls

nautobot/cloud/views.py

@@ -0,0 +1,181 @@
+from django.db.models import Q
+from django_tables2 import RequestConfig
+
+from nautobot.circuits.models import Circuit
+from nautobot.circuits.tables import CircuitTable
+from nautobot.cloud.api.serializers import (
+    CloudAccountSerializer,
+    CloudNetworkSerializer,
+    CloudResourceTypeSerializer,
+    CloudServiceSerializer,
+)
+from nautobot.cloud.filters import (
+    CloudAccountFilterSet,
+    CloudNetworkFilterSet,
+    CloudResourceTypeFilterSet,
+    CloudServiceFilterSet,
+)
+from nautobot.cloud.forms import (
+    CloudAccountBulkEditForm,
+    CloudAccountFilterForm,
+    CloudAccountForm,
+    CloudNetworkBulkEditForm,
+    CloudNetworkFilterForm,
+    CloudNetworkForm,
+    CloudResourceTypeBulkEditForm,
+    CloudResourceTypeFilterForm,
+    CloudResourceTypeForm,
+    CloudServiceBulkEditForm,
+    CloudServiceFilterForm,
+    CloudServiceForm,
+)
+from nautobot.cloud.models import CloudAccount, CloudNetwork, CloudResourceType, CloudService
+from nautobot.cloud.tables import CloudAccountTable, CloudNetworkTable, CloudResourceTypeTable, CloudServiceTable
+from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
+from nautobot.core.views.viewsets import NautobotUIViewSet
+from nautobot.ipam.tables import PrefixTable
+
+
+class CloudAccountUIViewSet(NautobotUIViewSet):
+    bulk_update_form_class = CloudAccountBulkEditForm
+    queryset = CloudAccount.objects.all()
+    filterset_class = CloudAccountFilterSet
+    filterset_form_class = CloudAccountFilterForm
+    serializer_class = CloudAccountSerializer
+    table_class = CloudAccountTable
+    form_class = CloudAccountForm
+
+
+class CloudNetworkUIViewSet(NautobotUIViewSet):
+    queryset = CloudNetwork.objects.all()
+    filterset_class = CloudNetworkFilterSet
+    filterset_form_class = CloudNetworkFilterForm
+    serializer_class = CloudNetworkSerializer
+    table_class = CloudNetworkTable
+    form_class = CloudNetworkForm
+    bulk_update_form_class = CloudNetworkBulkEditForm
+
+    def get_extra_context(self, request, instance=None):
+        context = super().get_extra_context(request, instance)
+        if self.action == "retrieve":
+            prefixes = instance.prefixes.restrict(request.user, "view")
+            prefixes_table = PrefixTable(prefixes.select_related("namespace"))
+            prefixes_table.columns.hide("location_count")
+            prefixes_table.columns.hide("vlan")
+
+            children = instance.children.restrict(request.user, "view")
+            children_table = CloudNetworkTable(children)
+            children_table.columns.hide("parent")
+
+            circuits = Circuit.objects.restrict(request.user, "view").filter(
+                Q(circuit_termination_a__cloud_network=instance.pk)
+                | Q(circuit_termination_z__cloud_network=instance.pk)
+            )
+            circuits_table = CircuitTable(circuits)
+            circuits_table.columns.hide("circuit_termination_a")
+            circuits_table.columns.hide("circuit_termination_z")
+
+            cloud_services = instance.cloud_services.restrict(request.user, "view")
+            cloud_services_table = CloudServiceTable(cloud_services)
+            cloud_services_table.columns.hide("cloud_network_count")
+
+            paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
+            RequestConfig(request, paginate).configure(children_table)
+            RequestConfig(request, paginate).configure(circuits_table)
+            RequestConfig(request, paginate).configure(prefixes_table)
+            RequestConfig(request, paginate).configure(cloud_services_table)
+
+            context.update(
+                {
+                    "prefix_count": prefixes.count(),
+                    "prefixes_table": prefixes_table,
+                    "children_count": children.count(),
+                    "children_table": children_table,
+                    "circuit_count": circuits.count(),
+                    "circuits_table": circuits_table,
+                    "cloud_service_count": cloud_services.count(),
+                    "cloud_services_table": cloud_services_table,
+                }
+            )
+
+        return context
+
+    def extra_post_save_action(self, obj, form):
+        if form.cleaned_data.get("add_prefixes", None):
+            obj.prefixes.add(*form.cleaned_data["add_prefixes"])
+        if form.cleaned_data.get("remove_prefixes", None):
+            obj.prefixes.remove(*form.cleaned_data["remove_prefixes"])
+        if form.cleaned_data.get("add_cloud_services", None):
+            obj.cloud_services.add(*form.cleaned_data["add_cloud_services"])
+        if form.cleaned_data.get("remove_cloud_services", None):
+            obj.cloud_services.remove(*form.cleaned_data["remove_cloud_services"])
+
+
+class CloudResourceTypeUIViewSet(NautobotUIViewSet):
+    queryset = CloudResourceType.objects.all()
+    filterset_class = CloudResourceTypeFilterSet
+    filterset_form_class = CloudResourceTypeFilterForm
+    serializer_class = CloudResourceTypeSerializer
+    table_class = CloudResourceTypeTable
+    form_class = CloudResourceTypeForm
+    bulk_update_form_class = CloudResourceTypeBulkEditForm
+
+    def get_extra_context(self, request, instance=None):
+        context = super().get_extra_context(request, instance)
+        if self.action == "retrieve":
+            paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
+
+            networks = instance.cloud_networks.restrict(request.user, "view")
+            networks_table = CloudNetworkTable(networks)
+            networks_table.columns.hide("cloud_resource_type")
+            RequestConfig(request, paginate).configure(networks_table)
+
+            services = instance.cloud_services.restrict(request.user, "view")
+            services_table = CloudServiceTable(services)
+            services_table.columns.hide("cloud_resource_type")
+            RequestConfig(request, paginate).configure(services_table)
+
+            context.update(
+                {
+                    "networks_count": networks.count(),
+                    "networks_table": networks_table,
+                    "services_count": services.count(),
+                    "services_table": services_table,
+                }
+            )
+
+        return context
+
+
+class CloudServiceUIViewSet(NautobotUIViewSet):
+    queryset = CloudService.objects.all()
+    filterset_class = CloudServiceFilterSet
+    filterset_form_class = CloudServiceFilterForm
+    serializer_class = CloudServiceSerializer
+    table_class = CloudServiceTable
+    form_class = CloudServiceForm
+    bulk_update_form_class = CloudServiceBulkEditForm
+
+    def get_extra_context(self, request, instance=None):
+        context = super().get_extra_context(request, instance)
+        if self.action == "retrieve":
+            paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
+
+            networks = instance.cloud_networks.restrict(request.user, "view")
+            networks_table = CloudNetworkTable(networks)
+            RequestConfig(request, paginate).configure(networks_table)
+
+            context.update(
+                {
+                    "networks_count": networks.count(),
+                    "networks_table": networks_table,
+                }
+            )
+
+        return context
+
+    def extra_post_save_action(self, obj, form):
+        if form.cleaned_data.get("add_cloud_networks", None):
+            obj.cloud_networks.add(*form.cleaned_data["add_cloud_networks"])
+        if form.cleaned_data.get("remove_cloud_networks", None):
+            obj.cloud_networks.remove(*form.cleaned_data["remove_cloud_networks"])

nautobot/core/__init__.py

@@ -4,7 +4,4 @@ from nautobot.core import checks
 # Django starts so that shared_task will use this app.
 from nautobot.core.celery import app as celery_app
 
-default_app_config = "nautobot.core.apps.CoreConfig"
-
-
 __all__ = ("celery_app", "checks")

nautobot/core/api/metadata.py

@@ -152,6 +152,7 @@ class NautobotUiSchemaProcessor(NautobotProcessingMixin, schema.UiSchemaProcesso
         """
         data_index = self._generate_data_index(name)
         result = {}
+        is_int = False
         is_list = False
         if self._is_field_serializer(field):
             return NautobotUiSchemaProcessor(field, self.renderer_context, prefix=data_index).get_ui_schema()

nautobot/core/api/parsers.py

@@ -190,7 +190,13 @@ class NautobotCSVParser(BaseParser):
             elif isinstance(serializer_field, (serializers.DictField, serializers.JSONField)):
                 # We currently only store lists or dicts in JSONFields, never bare ints/strings.
                 # On the CSV write side, we only render dicts to JSON
-                if value is not None:
+                from nautobot.extras.api.serializers import ObjectMetadataValueJSONField
+
+                if isinstance(serializer_field, ObjectMetadataValueJSONField):
+                    # Do not split value into a list or dicts when it comes to the value of ObjectMetadata
+                    # we want to store it as bare ints/strings
+                    pass
+                elif value is not None:
                     if value.startswith(("{", "[")):
                         value = json.loads(value)
                     else:

nautobot/core/api/urls.py

@@ -45,6 +45,7 @@ urlpatterns = [
     # Base views
     path("", APIRootView.as_view(), name="api-root"),
     path("circuits/", include("nautobot.circuits.api.urls")),
+    path("cloud/", include("nautobot.cloud.api.urls")),
     path("dcim/", include("nautobot.dcim.api.urls")),
     path("extras/", include("nautobot.extras.api.urls")),
     path("ipam/", include("nautobot.ipam.api.urls")),

nautobot/core/api/utils.py

@@ -147,6 +147,7 @@ def nested_serializers_for_models(models, prefix=""):
             class NautobotNestedSerializer(serializer_class):
                 class Meta(serializer_class.Meta):
                     fields = ["id", "object_type", "url"]
+                    exclude = None
 
                 def get_field_names(self, declared_fields, info):
                     """Don't auto-add any other fields to the field_names!"""

nautobot/core/api/views.py

@@ -380,6 +380,10 @@ class APIRootView(AuthenticatedAPIRootView):
                         "circuits",
                         reverse("circuits-api:api-root", request=request, format=format),
                     ),
+                    (
+                        "cloud",
+                        reverse("cloud-api:api-root", request=request, format=format),
+                    ),
                     (
                         "dcim",
                         reverse("dcim-api:api-root", request=request, format=format),

nautobot/core/apps/__init__.py

@@ -36,6 +36,7 @@ class NautobotConfig(AppConfig):
     and `homepage.py` files from installed Nautobot core applications and Apps.
     """
 
+    default = False  # abstract base class, all subclasses must set this to True
     homepage_layout = "homepage.layout"
     menu_tabs = "navigation.menu_items"
     # New UI Navigation
@@ -49,19 +50,20 @@ class NautobotConfig(AppConfig):
         try:
             homepage_layout = import_string(f"{self.name}.{self.homepage_layout}")
             register_homepage_panels(self.path, self.label, homepage_layout)
-        except ModuleNotFoundError:
+        except ImportError:
             pass
 
         try:
             menu_items = import_string(f"{self.name}.{self.menu_tabs}")
             register_menu_items(menu_items)
-        except ModuleNotFoundError:
+        except ImportError:
             pass
 
+        # TODO we should remove this because it is no longer relevant.
         try:
             navigation = import_string(f"{self.name}.{self.navigation}")
             register_new_ui_menu_items(navigation)
-        except ModuleNotFoundError:
+        except ImportError:
             pass
 
         try:
@@ -872,6 +874,7 @@ class CoreConfig(NautobotConfig):
     AppConfig for the core of Nautobot.
     """
 
+    default = True
     name = "nautobot.core"
     verbose_name = "Nautobot Core"
 

nautobot/core/constants.py

@@ -155,8 +155,13 @@ GLOBAL_SEARCH_EXCLUDE_LIST = [
     "jobresult",
     "locationtype",
     "manufacturer",
+    "metadatachoice",
+    "metadatatype",
+    "modulebay",
+    "modulebaytemplate",
     "note",
     "objectchange",
+    "objectmetadata",
     "platform",
     "poweroutlet",
     "poweroutlettemplate",
@@ -172,6 +177,7 @@ GLOBAL_SEARCH_EXCLUDE_LIST = [
     "rir",
     "role",
     "routetarget",
+    "savedview",
     "scheduledjob",
     "scheduledjobs",
     "secret",
@@ -179,10 +185,12 @@ GLOBAL_SEARCH_EXCLUDE_LIST = [
     "secretsgroupassociation",
     "service",
     "softwareimagefile",
+    "staticgroupassociation",
     "status",
     "tag",
     "taggeditem",
     "tenantgroup",
+    "usersavedviewassociation",
     "vlangroup",
     "vlanlocationassignment",
     "vminterface",

nautobot/core/factory.py

@@ -1,9 +1,11 @@
 from ipaddress import IPv6Address, IPV6LENGTH, IPv6Network
 import itertools
 
+from django.core.exceptions import ValidationError
 from django.db.models import Model
 import factory
 from factory.django import DjangoModelFactory
+from factory.errors import FactoryError
 import factory.random
 from faker.providers import BaseProvider
 
@@ -31,9 +33,38 @@ class BaseModelFactory(DjangoModelFactory):
     @classmethod
     def _create(cls, model_class, *args, **kwargs):
         """Override default DjangoModelFactory behavior to call validated_save() instead of just save()."""
+        if cls._meta.django_get_or_create:
+            return cls._get_or_create(model_class, *args, **kwargs)
+
         using = kwargs.pop("using", cls._meta.database)
         obj = model_class(*args, **kwargs)
-        obj.validated_save(using=using)
+        try:
+            obj.validated_save(using=using)
+        except ValidationError as err:
+            print(f"Got a ValidationError for {obj}: {err}")
+            raise
+        return obj
+
+    @classmethod
+    def _get_or_create(cls, model_class, *args, **kwargs):
+        """Simplified form of DjangoModelFactory._get_or_create() that also calls validated_save() if needed."""
+        using = kwargs.pop("using", cls._meta.database)
+        key_fields = {}
+        for field in cls._meta.django_get_or_create:
+            if field not in kwargs:
+                raise FactoryError(f"no value provided for field {field}")
+            key_fields[field] = kwargs.pop(field)
+
+        try:
+            obj = model_class.objects.using(using).get(*args, **key_fields)
+        except model_class.DoesNotExist:
+            obj = model_class(*args, **key_fields, **kwargs)
+            try:
+                obj.validated_save(using=using)
+            except ValidationError as err:
+                print(f"Got a ValidationError for {obj}: {err}")
+                raise
+
         return obj