Code Review
/
laas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add Quick-Booking Workflow
[laas.git]
/
src
/
resource_inventory
/
resource_manager.py
diff --git
a/src/resource_inventory/resource_manager.py
b/src/resource_inventory/resource_manager.py
index
9282580
..
812fcd7
100644
(file)
--- a/
src/resource_inventory/resource_manager.py
+++ b/
src/resource_inventory/resource_manager.py
@@
-17,7
+17,7
@@
from dashboard.exceptions import (
ResourceProvisioningException,
ModelValidationException,
)
ResourceProvisioningException,
ModelValidationException,
)
-from resource_inventory.models import Host, HostConfiguration, ResourceBundle
+from resource_inventory.models import Host, HostConfiguration, ResourceBundle
, HostProfile
class ResourceManager:
class ResourceManager:
@@
-33,6
+33,11
@@
class ResourceManager:
ResourceManager.instance = ResourceManager()
return ResourceManager.instance
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):
# 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)
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()
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")
self.fail_acquire(physical_hosts)
raise ModelValidationException("Saving hosts failed")