Merge pull request #3939 from allegro/add-missing-prefetches

Add missing prefetches

Author: hipek8

src/ralph/api/tests/test_rendering.py

@@ -84,7 +84,7 @@ class APIBrowsableClient(APIClient):
     "racks": "/api/racks/",
     "regions": "/api/regions/",
     "server-rooms": "/api/server-rooms/",
-    "services": ("/api/services/", 25),
+    "services": "/api/services/",
     "services-environments": "/api/services-environments/",
     "sim-card": "/api/sim-card/",
     "sim-card-cellular-carrier": "/api/sim-card-cellular-carrier/",

src/ralph/assets/api/views.py

@@ -53,6 +53,7 @@ class Meta:
             model = models.Service
             fields = ["active"]
 
+    renderer_classes = renderer_classes_without_form(RalphAPIViewSet.renderer_classes)
     queryset = models.Service.objects.all()
     serializer_class = serializers.ServiceSerializer
     save_serializer_class = serializers.SaveServiceSerializer
@@ -255,14 +256,15 @@ class ConfigurationModuleViewSet(RalphAPIViewSet):
     # don't allow for ConfigurationModule updating or deleting as it might
     # dissrupt configuration of many hosts!
     http_method_names = ["get", "post", "options", "head"]
+    prefetch_related = ["custom_fields", "children_modules"]
 
 
 class ConfigurationClassViewSet(RalphAPIViewSet):
     queryset = models.ConfigurationClass.objects.all()
     serializer_class = serializers.ConfigurationClassSerializer
     filterset_fields = ("module", "module__name", "class_name", "path")
     select_related = ["module"]
-    prefetch_related = ["tags"]
+    prefetch_related = ["tags", "custom_fields", "content_type"]
     # don't allow for ConfigurationClass updating or deleting as it might
     # dissrupt configuration of many hosts!
     http_method_names = ["get", "post", "options", "head"]

src/ralph/assets/tests/factories.py

@@ -263,7 +263,7 @@ def post_environments(self, create, extracted, **kwargs):
     def post_business_owners(self, create, extracted, **kwargs):
         if not create:
             return
-        if extracted:
+        if extracted is not None:
             for business_owner in extracted:
                 self.business_owners.add(business_owner)
         else:
@@ -274,7 +274,7 @@ def post_business_owners(self, create, extracted, **kwargs):
     def post_technical_owners(self, create, extracted, **kwargs):
         if not create:
             return
-        if extracted:
+        if extracted is not None:
             for technical_owner in extracted:
                 self.technical_owners.add(technical_owner)
         else:
@@ -307,8 +307,19 @@ class EthernetWithIPAddressFactory(EthernetFactory):
     )
 
 
+class ParentConfigurationModuleFactory(DjangoModelFactory):
+    name = factory.Sequence(lambda n: "Parent Configuration Module {}".format(n))
+    support_team = factory.SubFactory(TeamFactory)
+
+    class Meta:
+        model = ConfigurationModule
+        django_get_or_create = ["name"]
+
+
 class ConfigurationModuleFactory(DjangoModelFactory):
     name = factory.Iterator(["ralph", "allegro", "auth", "order"])
+    parent = factory.SubFactory(ParentConfigurationModuleFactory)
+    support_team = factory.SubFactory(TeamFactory)
 
     class Meta:
         model = ConfigurationModule

src/ralph/assets/tests/test_api.py

@@ -1074,8 +1074,7 @@ def test_get_configuration_modules_list(self):
         url = reverse("configurationmodule-list")
         response = self.client.get(url, format="json")
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data["count"], 2)
-        self.assertEqual(response.data["results"][0]["name"], self.conf_module_1.name)
+        self.assertEqual(response.data["count"], ConfigurationModule.objects.count())
 
     def test_get_configuration_module_details(self):
         url = reverse("configurationmodule-detail", args=(self.conf_module_1.id,))
@@ -1099,14 +1098,15 @@ def test_get_configuration_module_details_with_parent(self):
         )
 
     def test_create_configuration_module(self):
+        modules_before = ConfigurationModule.objects.count()
         url = reverse("configurationmodule-list")
         data = {
             "name": "test_1",
             "parent": self.conf_module_2.pk,
         }
         response = self.client.post(url, data, format="json")
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-        self.assertEqual(ConfigurationModule.objects.count(), 3)
+        self.assertEqual(ConfigurationModule.objects.count(), modules_before + 1)
         conf_module = ConfigurationModule.objects.get(pk=response.data["id"])
         self.assertEqual(conf_module.name, "test_1")
         self.assertEqual(conf_module.parent, self.conf_module_2)

src/ralph/data_center/api/views.py

@@ -40,6 +40,7 @@
     RackAccessory,
     ServerRoom,
 )
+from ralph.lib.api.utils import renderer_classes_without_form
 from ralph.lib.visibility_scope.filters import visibility_scope_filter
 from ralph.virtual.models import CloudHost, VirtualServer
 
@@ -50,6 +51,7 @@ class Meta(NetworkableObjectFilters.Meta):
 
 
 class DataCenterAssetViewSet(BaseObjectViewSetMixin, RalphAPIViewSet):
+    renderer_classes = renderer_classes_without_form(RalphAPIViewSet.renderer_classes)
     queryset = DataCenterAsset.objects.all()
     serializer_class = DataCenterAssetSerializer
     save_serializer_class = DataCenterAssetSaveSerializer

src/ralph/data_center/tests/factories.py

@@ -78,10 +78,21 @@ class Meta:
     def post_tags(self, create, extracted, **kwargs):
         self.tags.add("abc, cde", "xyz")
 
+    @factory.post_generation
+    def post_base_objects(self, create, extracted, **kwargs):
+        if not create:
+            return
+        if extracted is not None:
+            for base_object in extracted:
+                BaseObjectClusterFactory(cluster=self, base_object=base_object)
+        else:
+            BaseObjectClusterFactory.create_batch(3, cluster=self)
+
 
 class BaseObjectClusterFactory(DjangoModelFactory):
     cluster = factory.SubFactory(ClusterFactory)
     base_object = factory.SubFactory(BaseObjectFactory)
+    is_master = False
 
     class Meta:
         model = BaseObjectCluster

src/ralph/data_center/tests/test_api.py

@@ -14,7 +14,6 @@
     ServiceEnvironmentFactory,
 )
 from ralph.data_center.models import (
-    BaseObjectCluster,
     Cluster,
     DataCenterAsset,
     Orientation,
@@ -32,6 +31,7 @@
     RackAccessoryFactory,
     RackFactory,
     ServerRoomFactory,
+    BaseObjectClusterFactory,
 )
 from ralph.lib.custom_fields.models import CustomField
 from ralph.networks.tests.factories import IPAddressFactory
@@ -599,15 +599,15 @@ def setUp(self):
         super().setUp()
         self.cluster_type = ClusterTypeFactory()
         self.service_env = ServiceEnvironmentFactory()
-        self.cluster_1 = ClusterFactory()
-        self.boc_1 = BaseObjectCluster.objects.create(
+        self.cluster_1 = ClusterFactory(post_base_objects=[])
+        self.boc_1 = BaseObjectClusterFactory(
             cluster=self.cluster_1, base_object=DataCenterAssetFactory()
         )
         self.master = DataCenterAssetFactory()
-        self.boc_2 = BaseObjectCluster.objects.create(
+        self.boc_2 = BaseObjectClusterFactory(
             cluster=self.cluster_1, base_object=self.master, is_master=True
         )
-        self.cluster_2 = ClusterFactory()
+        self.cluster_2 = ClusterFactory(post_base_objects=[])
         self.cluster_1.service_env.service.business_owners.set([self.user1])
         self.cluster_1.service_env.service.technical_owners.set([self.user2])
         self.cluster_1.management_ip = "10.20.30.40"
@@ -655,7 +655,7 @@ def test_create_cluster_without_hostname_or_name(self):
     def test_list_cluster(self):
         ClusterFactory.create_batch(20)
         url = reverse("cluster-list") + "?limit=100"
-        with self.assertNumQueries(12):
+        with self.assertQueriesMoreOrLess(11, plus_minus=1):
             response = self.client.get(url, format="json")
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(len(response.data["results"]), 22)
@@ -665,7 +665,7 @@ def test_list_cluster(self):
 
     def test_get_cluster_details(self):
         url = reverse("cluster-detail", args=(self.cluster_1.id,))
-        with self.assertNumQueries(11):
+        with self.assertQueriesMoreOrLess(10, plus_minus=1):
             response = self.client.get(url, format="json")
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data["name"], self.cluster_1.name)

src/ralph/data_center/tests/test_view.py

@@ -49,7 +49,7 @@ def test_changelist_view(self):
         VirtualServerFullFactory.create_batch(5)
         CloudHostFullFactory.create_batch(4)
         ClusterFactory.create_batch(4)
-        with self.assertQueriesMoreOrLess(18, plus_minus=3):
+        with self.assertQueriesMoreOrLess(20, plus_minus=3):
             result = self.client.get(
                 reverse("admin:data_center_dchost_changelist"),
             )

src/ralph/virtual/api.py

@@ -194,7 +194,13 @@ class CloudFlavorViewSet(RalphAPIViewSet):
     queryset = CloudFlavor.objects.all()
     serializer_class = CloudFlavorSerializer
     save_serializer_class = SaveCloudFlavorSerializer
-    prefetch_related = ["tags", "virtualcomponent_set__model"]
+    prefetch_related = [
+        "tags",
+        "virtualcomponent_set__model",
+        "custom_fields",
+        "licences",
+        "content_type",
+    ]
     filterset_fields = ["flavor_id"]
 
     def destroy(self, request, *args, **kwargs):
@@ -296,6 +302,8 @@ class CloudProjectViewSet(RalphAPIViewSet):
         "tags",
         "licences",
         "cloudprovider",
+        "custom_fields",
+        "content_type",
     ]