diff --git a/src/api/src/backend/views/http/tapis_etl.py b/src/api/src/backend/views/http/tapis_etl.py index 95cc6a6b..e26b5852 100644 --- a/src/api/src/backend/views/http/tapis_etl.py +++ b/src/api/src/backend/views/http/tapis_etl.py @@ -22,6 +22,8 @@ def validate_system_ids(cls, values): ): raise ValueError("Must define one or both of the following properties: ['writable_system_id', 'data_transfer_system_id']") + return values + class TapisRemoteOutbox(TapisIOBox): manifest_generation_policy: EnumManifestGenerationPolicy = None manifest_priority: EnumManifestPriority = EnumManifestPriority.Oldest diff --git a/src/api/src/tests/fixtures/tapis-etl-pipeline.json b/src/api/src/tests/fixtures/tapis-etl-pipeline.json index 849d49cf..c1832c3a 100644 --- a/src/api/src/tests/fixtures/tapis-etl-pipeline.json +++ b/src/api/src/tests/fixtures/tapis-etl-pipeline.json @@ -1,25 +1,23 @@ { "id": "test-etl-ls6", "remote_outbox": { - "system_id": "test.etl.ls6.remote.outbox", - "data_path": "/ETL/REMOTE-BOX/DATA", + "data_transfer_system_id": "test.etl.ls6.remote.inbox", + "data_path": "/ETL/REMOTE-OUTBOX/DATA", "data_integrity_profile": { "type": "done_file", - "done_files_path": "/ETL/LOCAL-INBOX/DATA", + "done_files_path": "/ETL/REMOTE-OUTBOX/DATA", "include_pattern": "*.md5" }, + "manifest_geration_policy": "manual", + "manifest_priority": "oldest", "manifests_path": "/ETL/REMOTE-OUTBOX/MANIFESTS", "exclude_pattern": "*.md5" }, "local_inbox": { "writable_system_id": "test.etl.ls6.local.inbox", - "data_transfer_system_id": "test.etl.ls6.local.inbox", + "data_transfer_system_id": "test.etl.ls6.local.inbox.ingress", "data_path": "/ETL/LOCAL-INBOX/DATA", - "data_integrity_profile": { - "type": "done_file", - "done_files_path": "/ETL/LOCAL-INBOX/DATA", - "include_pattern": "*.md5" - }, + "inbound_transfer_manifests_path": "ETL/LOCAL-INBOX/INBOUND-TRANSER-MANIFESTS", "manifests_path": "/ETL/LOCAL-INBOX/MANIFESTS", "exclude_pattern": "*.md5" }, @@ -30,9 +28,9 @@ "manifests_path": "/ETL/LOCAL-OUTBOX/MANIFESTS" }, "remote_inbox": { + "data_transfer_system_id": "test.etl.ls6.remote.inbox", "data_path": "/ETL/REMOTE-INBOX/DATA", - "manifests_path": "/ETL/REMOTE-INBOX/MANIFESTS", - "system_id": "test.etl.ls6.remote.inbox" + "manifests_path": "/ETL/REMOTE-INBOX/MANIFESTS" }, "jobs": [ {