diff --git a/SAS/TMSS/client/lib/tmss_http_rest_client.py b/SAS/TMSS/client/lib/tmss_http_rest_client.py index 03ae0b2a055e374101f80b4cfdd5051c8964a10d..a23acd265516b2782b1facc01ca1d1a1e919f288 100644 --- a/SAS/TMSS/client/lib/tmss_http_rest_client.py +++ b/SAS/TMSS/client/lib/tmss_http_rest_client.py @@ -228,7 +228,7 @@ class TMSSsession(object): def get_subtasks(self, state: str=None, subtask_type: str=None, cluster: str=None, - scheduled_on_sky_start_time_less_then: datetime=None, scheduled_on_sky_start_time_greater_then: datetime=None, + scheduled_start_time_less_then: datetime=None, scheduled_start_time_greater_then: datetime=None, scheduled_on_sky_stop_time_less_then: datetime = None, scheduled_on_sky_stop_time_greater_then: datetime = None) -> list: '''get subtasks (as list of dicts) filtered by the given parameters''' clauses = {} @@ -238,10 +238,10 @@ class TMSSsession(object): clauses["subtask_type"] = subtask_type if cluster is not None: clauses["cluster__name"] = cluster - if scheduled_on_sky_start_time_less_then is not None: - clauses["scheduled_on_sky_start_time__lt="] = formatDatetime(scheduled_on_sky_start_time_less_then) - if scheduled_on_sky_start_time_greater_then is not None: - clauses["scheduled_on_sky_start_time__gt"] = formatDatetime(scheduled_on_sky_start_time_greater_then) + if scheduled_start_time_less_then is not None: + clauses["scheduled_start_time__lt="] = formatDatetime(scheduled_start_time_less_then) + if scheduled_start_time_greater_then is not None: + clauses["scheduled_start_time__gt"] = formatDatetime(scheduled_start_time_greater_then) if scheduled_on_sky_stop_time_less_then is not None: clauses["scheduled_on_sky_stop_time__lt"] = formatDatetime(scheduled_on_sky_stop_time_less_then) if scheduled_on_sky_stop_time_greater_then is not None: @@ -419,13 +419,13 @@ class TMSSsession(object): return result.content.decode('utf-8') raise Exception("Could not specify observation for task %s.\nResponse: %s" % (task_id, result)) - def schedule_subtask(self, subtask_id: int, scheduled_on_sky_start_time: Union[str, datetime]=None, retry_count: int=0) -> {}: - """schedule the subtask for the given subtask_id at the given scheduled_on_sky_start_time. If scheduled_on_sky_start_time==None then already (pre)set scheduled_on_sky_start_time is used. + def schedule_subtask(self, subtask_id: int, scheduled_start_time: Union[str, datetime]=None, retry_count: int=0) -> {}: + """schedule the subtask for the given subtask_id at the given scheduled_start_time. If scheduled_start_time==None then already (pre)set scheduled_start_time is used. returns the scheduled subtask upon success, or raises.""" - if scheduled_on_sky_start_time is not None: - if isinstance(scheduled_on_sky_start_time, datetime): - scheduled_on_sky_start_time = scheduled_on_sky_start_time.isoformat() - self.session.patch(self.get_full_url_for_path('subtask/%s' % subtask_id), json={'scheduled_on_sky_start_time': scheduled_on_sky_start_time}) + if scheduled_start_time is not None: + if isinstance(scheduled_start_time, datetime): + scheduled_start_time = scheduled_start_time.isoformat() + self.session.patch(self.get_full_url_for_path('subtask/%s' % subtask_id), json={'scheduled_start_time': scheduled_start_time}) return self.post_to_path_and_get_result_as_json_object('subtask/%s/schedule' % (subtask_id), retry_count=retry_count) def unschedule_subtask(self, subtask_id: int, retry_count: int=0) -> {}: