Merge "Add Quick-Booking Workflow"

1 files changed, 8 insertions, 3 deletions

diff --git a/dashboard/src/resource_inventory/resource_manager.py b/dashboard/src/resource_inventory/resource_manager.py
index 9282580..812fcd7 100644
--- a/dashboard/src/resource_inventory/resource_manager.py
+++ b/dashboard/src/resource_inventory/resource_manager.py
@@ -17,7 +17,7 @@ from dashboard.exceptions import (
     ResourceProvisioningException,
     ModelValidationException,
 )
-from resource_inventory.models import Host, HostConfiguration, ResourceBundle
+from resource_inventory.models import Host, HostConfiguration, ResourceBundle, HostProfile
 
 
 class ResourceManager:
@@ -33,6 +33,11 @@ class ResourceManager:
             ResourceManager.instance = ResourceManager()
         return ResourceManager.instance
 
+    def getAvailableHostTypes(self, lab):
+        hostset = Host.objects.filter(lab=lab).filter(booked=False).filter(working=True)
+        hostprofileset = HostProfile.objects.filter(host__in=hostset, labs=lab)
+        return set(hostprofileset)
+
     # public interface
     def deleteResourceBundle(self, resourceBundle):
         for host in Host.objects.filter(bundle=resourceBundle):
@@ -70,12 +75,12 @@ class ResourceManager:
                 physical_hosts.append(physical_host)
 
                 self.configureNetworking(physical_host)
-            except:
+            except Exception:
                 self.fail_acquire(physical_hosts)
                 raise ResourceProvisioningException("Network configuration failed.")
             try:
                 physical_host.save()
-            except:
+            except Exception:
                 self.fail_acquire(physical_hosts)
                 raise ModelValidationException("Saving hosts failed")