Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

LOFAR
- Activity
- Members
- Labels
- Issues
- Wiki
- Jira issues
- Open Jira
- Environments
- Terraform modules

Snippets Groups Projects

e5466b95

Commit e5466b95 authored 3 years ago by Jorrit Schaap

Downloads
- Plain Diff

Merge branch 'TMSS-703' into 'master'

TMSS-703: Cancel running obs on triggered obs

Closes TMSS-703

See merge request !454

parents 0340079c a5e5f01f

No related branches found

No related tags found

1 merge request!454TMSS-703: Cancel running obs on triggered obs

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

SAS/TMSS/backend/services/scheduling/lib/constraints/template_constraints_v1.py 13 additions, 8 deletions

...ces/scheduling/lib/constraints/template_constraints_v1.py
SAS/TMSS/backend/services/scheduling/lib/dynamic_scheduling.py 67 additions, 11 deletions

...MSS/backend/services/scheduling/lib/dynamic_scheduling.py
SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py 466 additions, 3 deletions

.../backend/services/scheduling/test/t_dynamic_scheduling.py
SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py 5 additions, 4 deletions

SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py
SAS/TMSS/backend/src/tmss/tmssapp/models/common.py 26 additions, 1 deletion

SAS/TMSS/backend/src/tmss/tmssapp/models/common.py
SAS/TMSS/backend/src/tmss/tmssapp/models/scheduling.py 3 additions, 2 deletions

SAS/TMSS/backend/src/tmss/tmssapp/models/scheduling.py
SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py 19 additions, 34 deletions

SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
SAS/TMSS/backend/test/t_permissions_system_roles.py 1 addition, 1 deletion

SAS/TMSS/backend/test/t_permissions_system_roles.py
SAS/TMSS/backend/test/t_tmssapp_specification_django_API.py 258 additions, 234 deletions

SAS/TMSS/backend/test/t_tmssapp_specification_django_API.py
SAS/TMSS/backend/test/tmss_test_data_django_models.py 6 additions, 4 deletions

SAS/TMSS/backend/test/tmss_test_data_django_models.py
SAS/TMSS/backend/test/tmss_test_environment_unittest_setup.py 1 addition, 1 deletion

...TMSS/backend/test/tmss_test_environment_unittest_setup.py

with 865 additions and 303 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment