aboutsummaryrefslogtreecommitdiffstats
path: root/src/dashboard
diff options
context:
space:
mode:
authorParker Berberian <pberberian@iol.unh.edu>2020-03-16 10:10:30 -0400
committerParker Berberian <pberberian@iol.unh.edu>2020-03-17 08:48:26 -0400
commite90f13e0413594d95e50256b1206ffd64217f2da (patch)
tree40895a885bb18fd44aeb342041f4be0a068fe69a /src/dashboard
parentb360e0e417f787e0266268596d630b87e88283d1 (diff)
Quick Deploy Fixes.
Change-Id: I46d410af62e4962d235346ba56472aaacb9d3ff2 Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
Diffstat (limited to 'src/dashboard')
-rw-r--r--src/dashboard/tasks.py40
-rw-r--r--src/dashboard/utils.py2
2 files changed, 8 insertions, 34 deletions
diff --git a/src/dashboard/tasks.py b/src/dashboard/tasks.py
index ac4d36f..b980799 100644
--- a/src/dashboard/tasks.py
+++ b/src/dashboard/tasks.py
@@ -15,43 +15,15 @@ from booking.models import Booking
from notifier.manager import NotificationHandler
from api.models import Job, JobStatus, SoftwareRelation, HostHardwareRelation, HostNetworkRelation, AccessRelation
from resource_inventory.resource_manager import ResourceManager
+from resource_inventory.models import ConfigState
@shared_task
def booking_poll():
- def cleanup_hardware(qs):
+ def cleanup_resource_task(qs):
for hostrelation in qs:
- config = hostrelation.config
- config.clear_delta()
- config.power = "off"
- config.save()
- hostrelation.status = JobStatus.NEW
- hostrelation.save()
-
- def cleanup_network(qs):
- for hostrelation in qs:
- network = hostrelation.config
- network.interfaces.clear()
- host = hostrelation.host
- network.clear_delta()
- vlans = []
- for interface in host.interfaces.all():
- for vlan in interface.config.all():
- if vlan.public:
- try:
- host.lab.vlan_manager.release_public_vlan(vlan.vlan_id)
- except Exception: # will fail if we already released in this loop
- pass
- else:
- vlans.append(vlan.vlan_id)
-
- # release all vlans
- if len(vlans) > 0:
- host.lab.vlan_manager.release_vlans(vlans)
-
- interface.config.clear()
- network.add_interface(interface)
- network.save()
+ hostrelation.config.state = ConfigState.CLEAN
+ hostrelation.config.save()
hostrelation.status = JobStatus.NEW
hostrelation.save()
@@ -78,8 +50,8 @@ def booking_poll():
if not booking.job.complete:
job = booking.job
cleanup_software(SoftwareRelation.objects.filter(job=job))
- cleanup_hardware(HostHardwareRelation.objects.filter(job=job))
- cleanup_network(HostNetworkRelation.objects.filter(job=job))
+ cleanup_resource_task(HostHardwareRelation.objects.filter(job=job))
+ cleanup_resource_task(HostNetworkRelation.objects.filter(job=job))
cleanup_access(AccessRelation.objects.filter(job=job))
job.complete = True
job.save()
diff --git a/src/dashboard/utils.py b/src/dashboard/utils.py
index 3d63366..d6b697a 100644
--- a/src/dashboard/utils.py
+++ b/src/dashboard/utils.py
@@ -34,6 +34,8 @@ class AbstractModelQuery():
for model in cls.model_list:
result += list(model.objects.filter(*args, **kwargs))
+ return result
+
@classmethod
def get(cls, *args, **kwargs):
try: