From 6732bf36f9dbce1ecf263872554dce29248d2f11 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 23 Mar 2021 09:11:05 +0100
Subject: [PATCH] TMSS-601: Replaced INPUT/OUTPUT roles by ANY role, as input
or outputness is already encoded in output field
---
SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py | 3 +--
SAS/TMSS/backend/src/tmss/tmssapp/populate.py | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
index d78364bdcbd..47c2ef0bd9c 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
@@ -52,8 +52,7 @@ class Role(AbstractChoice):
INSPECTION_PLOTS = "inspection plots"
CALIBRATOR = "calibrator"
TARGET = "target"
- INPUT = "input"
- OUTPUT = "output"
+ ANY = "any"
class Datatype(AbstractChoice):
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/populate.py b/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
index 04f59d18f63..e4ae9bd9d75 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
@@ -365,23 +365,23 @@ def populate_connectors():
output=True)
# preprocessing pipeline
- TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.INPUT.value),
+ TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.ANY.value),
datatype=Datatype.objects.get(value=Datatype.Choices.VISIBILITIES.value),
task_template=TaskTemplate.objects.get(name='preprocessing pipeline'),
output=False)
- TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.OUTPUT.value),
+ TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.ANY.value),
datatype=Datatype.objects.get(value=Datatype.Choices.VISIBILITIES.value),
task_template=TaskTemplate.objects.get(name='preprocessing pipeline'),
output=True)
# ingest
- TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.INPUT.value),
+ TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.ANY.value),
datatype=Datatype.objects.get(value=Datatype.Choices.VISIBILITIES.value),
task_template=TaskTemplate.objects.get(name='ingest'),
output=False)
- TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.INPUT.value),
+ TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.ANY.value),
datatype=Datatype.objects.get(value=Datatype.Choices.TIME_SERIES.value),
task_template=TaskTemplate.objects.get(name='ingest'),
output=False)
--
GitLab