hyperlinked creditallocation

stackhpc · Jul 23, 2024 · 2a919d9 · 2a919d9
1 parent 04a85ca
commit 2a919d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/coral_credits/api/serializers.py b/coral_credits/api/serializers.py
@@ -54,7 +54,7 @@ def to_representation(self, instance):
         return representation
 
 
-class CreditAllocation(serializers.ModelSerializer):
+class CreditAllocationSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = models.CreditAllocation
         fields = ["name", "created", "account", "start", "end"]

diff --git a/coral_credits/api/views.py b/coral_credits/api/views.py
@@ -8,7 +8,7 @@
 
 class CreditAllocationViewSet(viewsets.ModelViewSet):
     queryset = models.CreditAllocation.objects.all()
-    serializer_class = serializers.CreditAllocation
+    serializer_class = serializers.CreditAllocationSerializer
     # permission_classes = [permissions.IsAuthenticated]
 
 
@@ -97,7 +97,7 @@ def retrieve(self, request, pk=None):
 
         # TODO(johngarbutt) look for any during the above allocations
         all_allocations_query = models.CreditAllocation.objects.filter(account__pk=pk)
-        allocations = serializers.CreditAllocation(all_allocations_query, many=True)
+        allocations = serializers.CreditAllocationSerializer(all_allocations_query, many=True)
 
         # TODO(johngarbutt) look for any during the above allocations
         consumers_query = models.Consumer.objects.filter(account__pk=pk)

diff --git a/tools/functional_test.sh b/tools/functional_test.sh
@@ -142,9 +142,9 @@ echo "Adding allocation to resources:"
 curl -s -X POST -H "$CONTENT_TYPE" -d \
     "{
         \"inventories\": {
-            \"$VCPU_ID\": 100,
-            \"$MEMORY_ID\": 24000,
-            \"$DISK_GB\": 5000
+            \"VCPU\": 100,
+            \"MEMORY_MB\": 24000,
+            \"DISK_GB\": 5000
         }
     }" \
     http://$SITE:$PORT/allocations/$ALLOCATION_ID/resources/