Add "usage" information to host allocation tied to instance res

If a host allocation is tied to an instance reservation, we need to
include "usage" information to indicate how much of the host is
allocated. Otherwise, we have no idea what proportion of the host is
reserved.

Author: Mark-Powers

blazar/db/api.py

@@ -305,6 +305,10 @@ def instance_reservation_get(instance_reservation_id):
     return IMPL.instance_reservation_get(instance_reservation_id)
 
 
+def instance_reservation_get_by_reservation_id(reservation_id, session=None):
+    return IMPL.instance_reservation_get_by_reservation_id(reservation_id, session=session)
+
+
 def instance_reservation_update(instance_reservation_id,
                                 instance_reservation_values):
     """Update instance reservation."""

blazar/db/sqlalchemy/api.py

@@ -595,6 +595,13 @@ def instance_reservation_get(instance_reservation_id, session=None):
     return query.filter_by(id=instance_reservation_id).first()
 
 
+def instance_reservation_get_by_reservation_id(reservation_id, session=None):
+    if not session:
+        session = get_session()
+    query = model_query(models.InstanceReservations, session)
+    return query.filter_by(reservation_id=reservation_id).first()
+
+
 def instance_reservation_update(instance_reservation_id, values):
     session = get_session()
 

blazar/plugins/oshosts/host_plugin.py

@@ -601,6 +601,20 @@ def list_allocations(self, query, detail=False):
         hosts_allocations = self.query_host_allocations(hosts_id_list,
                                                         **options)
         self.add_extra_allocation_info(hosts_allocations)
+        inst_res_map = {}
+        for allocation_list in hosts_allocations.values():
+            for allocation in allocation_list:
+                # This is allocation id :()
+                if not inst_res_map.get(allocation["id"]):
+                    inst_res_map[allocation["id"]] = db_api.instance_reservation_get_by_reservation_id(allocation["id"])
+                inst_res = inst_res_map[allocation["id"]]
+                # inst_res will be None if the allocation is not from a flavor/instance reservation
+                if inst_res:
+                    data = {}
+                    data["vcpus"] = inst_res.vcpus
+                    data["memory_mb"] = inst_res.memory_mb
+                    data["disk_gb"] = inst_res.disk_gb
+                    allocation["usage"] = data
         return [{"resource_id": host, "reservations": allocs}
                 for host, allocs in hosts_allocations.items()]