Fixed unit tests and linting

Author: wtripp180901

coral_credits/api/db_utils.py

@@ -70,10 +70,9 @@ def get_all_active_reservations(resource_provider_account):
 
 
 def get_credit_allocation(id):
-    now = timezone.now()
 
     credit_allocation = models.CreditAllocation.objects.filter(id=id).first()
-    if credit_allocation == None:
+    if credit_allocation is None:
         raise db_exceptions.NoCreditAllocation("Invalid allocation_id")
 
     return credit_allocation
@@ -342,14 +341,21 @@ def create_credit_resource_allocations(credit_allocation, resource_allocations):
         car, created = models.CreditAllocationResource.objects.get_or_create(
             allocation=credit_allocation,
             resource_class=resource_class,
-            defaults={"resource_hours": resource_hours, "allocated_resource_hours": resource_hours},
+            defaults={
+                "resource_hours": resource_hours,
+                "allocated_resource_hours": resource_hours,
+            },
         )
         # If exists, update:
         if not created:
             newly_allocated_resource_hours = resource_hours
-            car.resource_hours += newly_allocated_resource_hours - car.allocated_resource_hours
+            car.resource_hours += (
+                newly_allocated_resource_hours - car.allocated_resource_hours
+            )
             if car.resource_hours < 0:
-                raise db_exceptions.InsufficientCredits("Cannot set credits to fewer than currently consumed")
+                raise db_exceptions.InsufficientCredits(
+                    "Cannot set credits to fewer than currently consumed"
+                )
             car.allocated_resource_hours = newly_allocated_resource_hours
             car.save()
 

coral_credits/api/serializers.py

@@ -46,7 +46,7 @@ class CreditAllocationResourceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = models.CreditAllocationResource
-        fields = ["id", "resource_class", "resource_hours","allocated_resource_hours"]
+        fields = ["id", "resource_class", "resource_hours", "allocated_resource_hours"]
 
     def to_representation(self, instance):
         """Pass the context to the ResourceClassSerializer"""

coral_credits/api/tests/allocation_tests.py

@@ -31,8 +31,8 @@ def test_credit_allocation_resource_create_success(
     response = api_client.post(url, request_data, format="json", secure=True)
 
     # Check that the request was successful
-    assert response.status_code == status.HTTP_200_OK, (
-        f"Expected {status.HTTP_200_OK}. "
+    assert response.status_code == status.HTTP_201_CREATED, (
+        f"Expected {status.HTTP_201_CREATED}. "
         f"Actual status {response.status_code}. "
         f"Response text {response.content}"
     )

coral_credits/api/tests/conftest.py

@@ -98,16 +98,19 @@ def _create_credit_allocation_resources(
             allocation=credit_allocation,
             resource_class=vcpu,
             resource_hours=allocation_hours["VCPU"],
+            allocated_resource_hours=allocation_hours["VCPU"],
         )
         memory_allocation = models.CreditAllocationResource.objects.create(
             allocation=credit_allocation,
             resource_class=memory,
             resource_hours=allocation_hours["MEMORY_MB"],
+            allocated_resource_hours=allocation_hours["VCPU"],
         )
         disk_allocation = models.CreditAllocationResource.objects.create(
             allocation=credit_allocation,
             resource_class=disk,
             resource_hours=allocation_hours["DISK_GB"],
+            allocated_resource_hours=allocation_hours["VCPU"],
         )
         return (vcpu_allocation, memory_allocation, disk_allocation)
 

coral_credits/api/views.py

@@ -79,8 +79,8 @@ def _create_update_credit_allocations(self, request, allocation_pk):
         serializer = serializers.CreditAllocationResourceSerializer(
             updated_allocations, many=True, context={"request": request}
         )
-        # To allow for the allocation resource endpoint to operate as a single REST object
-        # with GET,POST,PATCH etc after creation of single item
+        # To allow for the allocation resource endpoint to operate as a single
+        # REST object with GET,POST,PATCH etc after creation of single item
         # When creating with multiple resources a list of multiple entries is returned,
         # each with their own unique ID
         if len(serializer.data) == 1:
@@ -161,7 +161,8 @@ def retrieve(self, request, pk=None):
 
         # TODO(johngarbutt) look for any during the above allocations
 
-        # ISSUE (stuartc) this creates errors if objects are actually found when the account entry
+        # ISSUE (stuartc) this creates errors if objects
+        # are actually found when the account entry
         # is retrieved. Unable to serialise the list.
         all_allocations_query = models.CreditAllocation.objects.filter(account__pk=pk)
         allocations = serializers.CreditAllocationSerializer(
@@ -223,12 +224,14 @@ class ConsumerViewSet(viewsets.ModelViewSet):
     permission_classes = [permissions.IsAuthenticated]
     serializer_class = serializers.ConsumerRequestSerializer
 
-    # TODO: need to split the Consumer and ConsumerRequest logic really
+    # TODO(wtripp180901): need to split the Consumer and ConsumerRequest logic really
     def retrieve(self, request, pk=None):
         consumer = get_object_or_404(self.queryset, pk=pk)
         serializer = serializers.Consumer(consumer, context={"request": request})
         return Response(serializer.data)
 
+    # TODO(wtripp180901): this doesn't seem consistent with what's
+    # actually in the database
     def list(self, request):
         serializer = serializers.Consumer(
             self.queryset, many=True, context={"request": request}

tofu/tests/tofu_test_data.py

@@ -1,74 +1,80 @@
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
-import uuid
-import json
 import copy
+import json
+import uuid
 
-def get_standard_test_vars(q1_start,q1_end,q2_start,q2_end,q1_0_resources):
+
+def get_standard_test_vars(q1_start, q1_end, q2_start, q2_end, q1_0_resources):
     return {
         "resource_provider_name": "Test Provider",
         "resource_provider_email": "[email protected]",
         "resource_provider_info_url": "https://www.google.com",
-        "accounts": json.dumps([
-        {
-            "name": "TestAccount1",
-            "email": "[email protected]",
-            "openstack_project_id": "c2eced313b324cdb8e670e6e30bf387d"
-        },
-        {
-            "name": "TestAccount2",
-            "email": "[email protected]",
-            "openstack_project_id": "2fbf511968aa443e883a82283b0f0160"
-        }
-        ]),
-        "allocations": json.dumps({
-            "Q1": {
-                "start_date": str(q1_start),
-                "end_date": str(q1_end),
-                "projects": [
+        "accounts": json.dumps(
+            [
                 {
-                    "account_email": "[email protected]",
-                    "resources": q1_0_resources
+                    "name": "TestAccount1",
+                    "email": "[email protected]",
+                    "openstack_project_id": "c2eced313b324cdb8e670e6e30bf387d",
                 },
                 {
-                    "account_email": "[email protected]",
-                    "resources": {
-                    "VCPU": "20000",
-                    "MEMORY_MB": "2000000",
-                    "DISK_GB": "200000"
-                    }
-                }
-                ]
-            },
-            "Q2": {
-                "start_date": str(q2_start),
-                "end_date": str(q2_end),
-                "projects": [
-                {
-                    "account_email": "[email protected]",
-                    "resources": {
-                    "VCPU": "80000",
-                    "MEMORY_MB": "8000000",
-                    "DISK_GB": "300000"
-                    }
-                }
-                ]
+                    "name": "TestAccount2",
+                    "email": "[email protected]",
+                    "openstack_project_id": "2fbf511968aa443e883a82283b0f0160",
+                },
+            ]
+        ),
+        "allocations": json.dumps(
+            {
+                "Q1": {
+                    "start_date": str(q1_start),
+                    "end_date": str(q1_end),
+                    "projects": [
+                        {
+                            "account_email": "[email protected]",
+                            "resources": q1_0_resources,
+                        },
+                        {
+                            "account_email": "[email protected]",
+                            "resources": {
+                                "VCPU": "20000",
+                                "MEMORY_MB": "2000000",
+                                "DISK_GB": "200000",
+                            },
+                        },
+                    ],
+                },
+                "Q2": {
+                    "start_date": str(q2_start),
+                    "end_date": str(q2_end),
+                    "projects": [
+                        {
+                            "account_email": "[email protected]",
+                            "resources": {
+                                "VCPU": "80000",
+                                "MEMORY_MB": "8000000",
+                                "DISK_GB": "300000",
+                            },
+                        }
+                    ],
+                },
             }
-        })
+        ),
     }
 
+
 def get_empty_test_data_copy(data):
     tmp = copy.deepcopy(data)
     tmp["allocations"] = "{}"
     tmp["accounts"] = "[]"
     return tmp
 
+
 def get_no_q1_copy(data):
     tmp = copy.deepcopy(data)
     tmp["allocations"] = json.dumps({"Q2": json.loads(tmp["allocations"])["Q2"]})
     return tmp
 
-def get_lease_request_json(start,end):
+
+def get_lease_request_json(start, end):
     start_time = start
     end_time = end
     return {