Added initial tests + expose consumers in API

Author: wtripp180901

.tiltignore

@@ -0,0 +1 @@
+tofu/

coral_credits/api/serializers.py

@@ -79,6 +79,7 @@ class Consumer(serializers.ModelSerializer):
     class Meta:
         model = models.Consumer
         fields = [
+            "id",
             "consumer_ref",
             "resource_provider_account",
             "start",

coral_credits/api/views.py

@@ -178,6 +178,16 @@ class ConsumerViewSet(viewsets.ModelViewSet):
     permission_classes = [permissions.IsAuthenticated]
     serializer_class = serializers.ConsumerRequestSerializer
 
+    # TODO: 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)
+    
+    def list(self, request):
+        serializer = serializers.Consumer(self.queryset, many=True, context={'request': request})
+        return Response(serializer.data)
+
     @action(detail=False, methods=["post"], url_path="create")
     def create_consumer(self, request):
         LOG.info(f"About to process create commit:\n{request.data}")

tofu/tests/tofu_tests.py

@@ -2,21 +2,79 @@
 from tofupy import Tofu
 import requests
 import os
-import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 
 coral_uri = os.environ.get("TF_VAR_coral_uri")
 headers = {"Authorization": "Bearer "+os.environ.get("TF_VAR_auth_token")}
 
+def get_lease_request_json():
+    start_time = datetime.now().strftime("%Y-%m-%d-%H:%M:%S")
+    end_time = (datetime.now() + relativedelta(months=1)).strftime("%Y-%m-%d-%H:%M:%S")
+    return {
+            "context": {
+                "user_id": "caa8b54a-eb5e-4134-8ae2-a3946a428ec7",
+                "project_id": "c2eced313b324cdb8e670e6e30bf387d",
+                "auth_url": "http://api.example.com:5000/v3",
+                "region_name": "RegionOne"
+            },
+            "lease": {
+                "id": "e96b5a17-ada0-4034-a5ea-34db024b8e04",
+                "name": "my_new_lease",
+                "start_date": start_time,
+                "end_date": end_time,
+                "reservations": [
+                    {   "amount": 2,
+                        "flavor_id": "e26a4241-b83d-4516-8e0e-8ce2665d1966", 
+                        "resource_type": "flavor:instance",
+                        "affinity" : None,
+                        "allocations": []
+                    }
+                ],
+                "resource_requests": {
+                    "DISK_GB": 35,
+                    "MEMORY_MB": 1000,
+                    "VCPU": 4
+                }
+            }
+        }
+
+
+lease_request_json = get_lease_request_json()
+
 @pytest.fixture(scope="session")
 def terraform_rest_setup():
     working_dir = os.path.join(os.path.dirname(__file__), "..")
     var_file = os.path.join(working_dir, "example-config.tfvars")
+    
     tf = Tofu(cwd=working_dir)
     tf.init()
     tf.apply(extra_args=["--var-file="+var_file])
-    # add_consumers()
+
     yield
-    tf.apply(extra_args=["--var-file="+var_file],destroy=True)
+
+    destroy = tf.apply(extra_args=["--var-file="+var_file],destroy=True)
+    assert len(destroy.errors) == 0
+
+@pytest.fixture(scope="session")
+def add_consumer_request(terraform_rest_setup):
+    # Add consumer outside of tofu to simulate requests from Blazar
+
+    consumer = requests.post(coral_uri+"/consumer/create",headers={
+            "Authorization": "Bearer "+os.environ.get("TF_VAR_auth_token"),
+            "Content-Type": "application/json"
+        },
+        json=lease_request_json
+    )
+    yield consumer.status_code
+    requests.post(coral_uri+"/consumer/on-end",headers={
+            "Authorization": "Bearer "+os.environ.get("TF_VAR_auth_token"),
+            "Content-Type": "application/json"
+        },
+        json=lease_request_json
+    )
+
+# def test_allocation_resources_still_consumed_by_deleted_consumers
 
 def api_get_request(resource):
     return requests.get(coral_uri+"/"+resource,headers=headers).json()
@@ -97,3 +155,9 @@ def test_resource_allocations_created(terraform_rest_setup):
     assert allocation_resources["Q1-0"] == {"VCPU": 40000, "MEMORY_MB": 4423680, "DISK_GB": 108000}
     assert allocation_resources["Q1-1"] == {"VCPU": 20000, "MEMORY_MB": 2000000, "DISK_GB": 200000}
     assert allocation_resources["Q2-0"] == {"VCPU": 80000, "MEMORY_MB": 8000000, "DISK_GB": 300000}
+
+def test_consumer_added_or_exists(add_consumer_request):
+    assert add_consumer_request == 204
+
+def test_can_query_consumer(add_consumer_request):
+    assert len(api_get_request("consumer")) == 1