Merge branch 'develop' into 'master'

Merge develop into master

See merge request muni-kypo-crp/backend-python/kypo-sandbox-service!253

kypo/sandbox_common_lib/pagination.py

@@ -54,7 +54,7 @@ class PageNumberWithPageSizePagination(PageNumberPagination):
 
         if isinstance(queryset, QuerySet):
             sort_by_param = '-'+sort_by_param if order_param == "desc" else sort_by_param
-            queryset.order_by(sort_by_param)
+            queryset = queryset.order_by(sort_by_param)
         else:
             queryset = sorted(queryset, key=lambda item: item.get(sort_by_param, ''),
                               reverse=order_param == 'desc')

kypo/sandbox_instance_app/serializers.py

@@ -272,9 +272,9 @@ class SandboxResourceSerializer(serializers.Serializer):
 
 
 class HardwareUsageSerializer(serializers.Serializer):
-    vcpu = serializers.DecimalField(decimal_places=3, max_digits=2)
-    ram = serializers.DecimalField(decimal_places=3, max_digits=2)
-    instances = serializers.DecimalField(decimal_places=3, max_digits=2)
-    network = serializers.DecimalField(decimal_places=3, max_digits=2)
-    subnet = serializers.DecimalField(decimal_places=3, max_digits=2)
-    port = serializers.DecimalField(decimal_places=3, max_digits=2)
+    vcpu = serializers.DecimalField(decimal_places=3, max_digits=7)
+    ram = serializers.DecimalField(decimal_places=3, max_digits=7)
+    instances = serializers.DecimalField(decimal_places=3, max_digits=7)
+    network = serializers.DecimalField(decimal_places=3, max_digits=7)
+    subnet = serializers.DecimalField(decimal_places=3, max_digits=7)
+    port = serializers.DecimalField(decimal_places=3, max_digits=7)