diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
index f0fce5f689b83743d5198a1b5aedea79c0571578..621c1f82ff7faf396782bd636b1d2f578e181701 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
@@ -1691,7 +1691,29 @@ class Reservation(NamedCommon, TemplateSchemaMixin):
else:
return None
+ def _prevent_reserving_stations_that_are_used_in_active_units(self):
+ # Determine active scheduling units that overlap in time with the reservation
+ # Note: we cannot filter for status and on sky times in SQL because these are properties
+ # todo: find a way to reduce the initial queryset reasonably
+ subs = SchedulingUnitBlueprint.objects.all()
+ active_subs = [x for x in subs if (x.status in [SchedulingUnitBlueprint.Status.OBSERVING.value, SchedulingUnitBlueprint.Status.SCHEDULED.value]
+ and x.scheduled_on_sky_stop_time >= self.start_time)]
+ if self.stop_time:
+ active_subs = [x for x in active_subs if x.scheduled_on_sky_start_time <= self.stop_time]
+
+ # Raise an exception if any of these scheduling units uses a station that shall be reserved
+ if "resources" in self.specifications_doc and "stations" in self.specifications_doc["resources"]:
+ stations_to_reserve = self.specifications_doc['resources']['stations']
+ for sub in active_subs:
+ # todo: not all the specified stations may actually be in use. Consider only those who were assigned in the end?
+ conflicting_stations = list(set(sub.flat_station_list).intersection(stations_to_reserve))
+ if len(conflicting_stations) != 0:
+ msg = "Station(s) %s cannot be reserved because they are currently in use by scheduling unit %s" % (conflicting_stations, sub)
+ logger.info(msg)
+ raise ValueError(msg)
+
def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
+ self._prevent_reserving_stations_that_are_used_in_active_units()
self.annotate_validate_add_defaults_to_doc_using_template('specifications_doc', 'specifications_template')
super().save(force_insert, force_update, using, update_fields)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/reservations.py b/SAS/TMSS/backend/src/tmss/tmssapp/reservations.py
index 18b76eb7592c88e6fbbeab02512c56bbc5ff6a03..ee157adae7312b32f28590b27585a56c83762033 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/reservations.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/reservations.py
@@ -12,9 +12,11 @@ def get_active_station_reservations_in_timewindow(lower_bound, upper_bound):
queryset = models.Reservation.objects.all()
for res in queryset.filter(stop_time=None).values('specifications_doc'):
- lst_active_station_reservations += res["specifications_doc"]["resources"]["stations"]
+ if "stations" in res["specifications_doc"]["resources"]:
+ lst_active_station_reservations += res["specifications_doc"]["resources"]["stations"]
if lower_bound is not None:
for res in queryset.filter(stop_time__gt=lower_bound).values('specifications_doc'):
- lst_active_station_reservations += res["specifications_doc"]["resources"]["stations"]
+ if "stations" in res["specifications_doc"]["resources"]:
+ lst_active_station_reservations += res["specifications_doc"]["resources"]["stations"]
return list(set(lst_active_station_reservations))
diff --git a/SAS/TMSS/backend/test/t_reservations.py b/SAS/TMSS/backend/test/t_reservations.py
index 888b4d4b98239c9c3a811b029a906fd92fc4651b..e44e64aa9055df3642983a8520286fe6ea887459 100755
--- a/SAS/TMSS/backend/test/t_reservations.py
+++ b/SAS/TMSS/backend/test/t_reservations.py
@@ -46,8 +46,11 @@ rest_data_creator = TMSSRESTTestDataCreator(BASE_URL, AUTH)
from lofar.sas.tmss.tmss.tmssapp import models
-
from lofar.sas.tmss.tmss.tmssapp.reservations import get_active_station_reservations_in_timewindow
+from lofar.sas.tmss.test.test_utils import set_subtask_state_following_allowed_transitions
+
+from lofar.sas.tmss.tmss.exceptions import SchemaValidationException
+from django.core.exceptions import ValidationError
class TestStationReservations(unittest.TestCase):
@@ -65,7 +68,7 @@ class TestStationReservations(unittest.TestCase):
"""
Create a station reservation with given list of stations, start_time and stop_time
"""
- reservation_template = models.ReservationTemplate.objects.get(name="resource reservation")
+ reservation_template = models.ReservationTemplate.objects.get(name="reservation")
reservation_template_spec = get_default_json_object_for_schema(reservation_template.schema)
reservation_template_spec["resources"] = {"stations": lst_stations }
res = models.Reservation.objects.create(name="Station Reservation %s" % additional_name,
@@ -80,7 +83,7 @@ class TestStationReservations(unittest.TestCase):
Check that creating 'default' reservation with no additional station reservation added, we still can
call 'get_active_station_reservations_in_timewindow' and it will return an empty list
"""
- reservation_template = models.ReservationTemplate.objects.get(name="resource reservation")
+ reservation_template = models.ReservationTemplate.objects.get(name="reservation")
reservation_template_spec = get_default_json_object_for_schema(reservation_template.schema)
res = models.Reservation.objects.create(name="AnyReservation",
description="Reservation of something else",
@@ -240,8 +243,62 @@ class TestStationReservations(unittest.TestCase):
get_active_station_reservations_in_timewindow(reservation_start_time, reservation_stop_time-timedelta(days=5)))
self.assertCountEqual(["CS001"],
get_active_station_reservations_in_timewindow(reservation_start_time, reservation_stop_time-timedelta(days=6)))
-from lofar.sas.tmss.tmss.exceptions import SchemaValidationException
-from django.core.exceptions import ValidationError
+
+ def test_reservation_is_blocked_by_active_observation_using_same_station(self):
+
+ # create observation subtask in started state
+ subtask_template = models.SubtaskTemplate.objects.get(name='observation control')
+ spec = get_default_json_object_for_schema(subtask_template.schema)
+ spec['stations']['station_list'] = ['CS001', 'RS205']
+ task_template = models.TaskTemplate.objects.get(name='target observation')
+ task_spec = get_default_json_object_for_schema(task_template.schema)
+ task_spec['station_groups'] = [{'stations': ['CS001', 'RS205'], 'max_nr_missing': 0}]
+ scheduling_unit_blueprint = models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprint_test_data(specifications_template=models.SchedulingUnitTemplate.objects.get(name='scheduling unit')))
+ task_blueprint = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(specifications_template=task_template, scheduling_unit_blueprint=scheduling_unit_blueprint, specifications_doc=task_spec))
+ subtask = models.Subtask.objects.create(**Subtask_test_data(subtask_template=subtask_template, specifications_doc=spec, task_blueprint=task_blueprint,
+ scheduled_on_sky_start_time=datetime(2020, 1, 1, 10, 0, 0), scheduled_on_sky_stop_time=datetime(2020, 1, 1, 14, 0, 0)))
+ set_subtask_state_following_allowed_transitions(subtask, "started")
+
+ # try to create a reservation that overlaps with the subtask and assert failure
+ #
+ # full overlap
+ with self.assertRaises(ValueError) as context:
+ self.create_station_reservation("my-reservation-long", ["CS002", "RS205", "DE609"], datetime(2020, 1, 1, 0, 0, 0), datetime(2020, 1, 2, 0, 0, 0))
+ self.assertIn("Station(s) ['RS205'] cannot be reserved", str(context.exception))
+ self.assertIn(scheduling_unit_blueprint.name, str(context.exception))
+
+ with self.assertRaises(ValueError) as context:
+ self.create_station_reservation("my-reservation-short", ["CS002", "RS205", "DE609"], datetime(2020, 1, 1, 11, 0, 0), datetime(2020, 1, 1, 13, 0, 0))
+ self.assertIn("Station(s) ['RS205'] cannot be reserved", str(context.exception))
+ self.assertIn(scheduling_unit_blueprint.name, str(context.exception))
+
+ # partial overlap
+ with self.assertRaises(ValueError) as context:
+ self.create_station_reservation("my-reservation-early", ["CS002", "RS205", "DE609"], datetime(2020, 1, 1, 0, 0, 0), datetime(2020, 1, 1, 12, 0, 0))
+ self.assertIn("Station(s) ['RS205'] cannot be reserved", str(context.exception))
+ self.assertIn(scheduling_unit_blueprint.name, str(context.exception))
+
+ with self.assertRaises(ValueError) as context:
+ self.create_station_reservation("my-reservation-late", ["CS002", "RS205", "DE609"], datetime(2020, 1, 1, 12, 0, 0), datetime(2020, 1, 2, 0, 0, 0))
+ self.assertIn("Station(s) ['RS205'] cannot be reserved", str(context.exception))
+ self.assertIn(scheduling_unit_blueprint.name, str(context.exception))
+
+ # open end
+ with self.assertRaises(ValueError) as context:
+ self.create_station_reservation("my-reservation-open-end", ["CS002", "RS205", "DE609"], datetime(2020, 1, 1, 0, 0, 0))
+ self.assertIn("Station(s) ['RS205'] cannot be reserved", str(context.exception))
+ self.assertIn(scheduling_unit_blueprint.name, str(context.exception))
+
+ # assert that it works before or after the subtask
+ #
+ # before
+ self.create_station_reservation("my-reservation-before", ["CS002", "RS205", "DE609"], datetime(2020, 1, 1, 0, 0, 0), datetime(2020, 1, 1, 9, 0, 0))
+
+ # after
+ self.create_station_reservation("my-reservation-after", ["CS002", "RS205", "DE609"], datetime(2020, 1, 1, 15, 0, 0), datetime(2020, 1, 2, 0, 0, 0))
+
+ # after, open end
+ self.create_station_reservation("my-reservation-open-end", ["CS002", "RS205", "DE609"], datetime(2020, 1, 1, 15, 0, 0))
class CreationFromReservationStrategyTemplate(unittest.TestCase):
@@ -271,7 +328,7 @@ class CreationFromReservationStrategyTemplate(unittest.TestCase):
# Check that action call 'create_reservation' (no parameters) of strategy template creates a
# new reservation (with http result code 201)
- response = GET_and_assert_equal_expected_code(self, BASE_URL + '/reservation_strategy_template/%d/create_reservation' % strategy_template.pk, 201)
+ response = POST_and_assert_expected_response(self, BASE_URL + '/reservation_strategy_template/%d/create_reservation' % strategy_template.pk, {}, 201, {})
self.assertNotEqual(response['id'], reservation.pk) # should be different id then previous one created
self.assertLess(response['start_time'], datetime.utcnow().isoformat()) # start_time created with now so that was some micro seconds ago
self.assertEqual(response['stop_time'], None)
@@ -316,3 +373,8 @@ class ReservationTest(unittest.TestCase):
stop_time=None)
self.assertIn('is not one of', str(context.exception))
+
+if __name__ == "__main__":
+ os.environ['TZ'] = 'UTC'
+ unittest.main()
+