From 65c8b8f836e5ea54613a9f8c97e5c51efde01831 Mon Sep 17 00:00:00 2001 From: Alexis Koralewski Date: Mon, 22 May 2023 16:46:54 +0200 Subject: [PATCH] Update schema for obsconfig & configpyros --- config/pyros/schema_pyros_config.yml | 28 ---------------------------- config/schemas/schema_observatory-2.0.yml | 2 +- src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ko.yml | 10 ++++++---- src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_complex.yml | 11 ++++++----- src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml | 12 ++++++------ 5 files changed, 19 insertions(+), 44 deletions(-) diff --git a/config/pyros/schema_pyros_config.yml b/config/pyros/schema_pyros_config.yml index 96f544b..20f9ee3 100644 --- a/config/pyros/schema_pyros_config.yml +++ b/config/pyros/schema_pyros_config.yml @@ -20,34 +20,6 @@ mapping: type: map required: True mapping: - pyros_img_L0: - type: map - required: True - mapping: - root_dir: - type: str - description: - type: str - extension: - type: str - naming: - type: str - pathnaming: - type: str - pyros_img_L1: - type: map - required: True - mapping: - root_dir: - type: str - description: - type: str - extension: - type: str - naming: - type: str - pathnaming: - type: str pyros_seq: type: map required: True diff --git a/config/schemas/schema_observatory-2.0.yml b/config/schemas/schema_observatory-2.0.yml index d847cb8..a8c10de 100644 --- a/config/schemas/schema_observatory-2.0.yml +++ b/config/schemas/schema_observatory-2.0.yml @@ -151,7 +151,7 @@ schema;schema_CHANNEL: - type: any fn_contexts: type: map - required: True + required: False mapping: img_L0: type: map diff --git a/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ko.yml b/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ko.yml index ea84b2f..744e7c7 100644 --- a/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ko.yml +++ b/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ko.yml @@ -135,14 +135,16 @@ OBSERVATORY: - CHANNEL: name: OpticalChannel - COMPONENT_AGENTS: - - OpticImager: optic - - DetectorSensor: camera - - DetectorShutter: camera + symbol: test + AGENTS: + - camera + COMPONENTS: + - SkyWatcher-ED80 ALBUMS: - ALBUM: name: test_album + symbol: test CHANNELS: - OpticalChannel diff --git a/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_complex.yml b/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_complex.yml index d4d3c12..3e07ef8 100644 --- a/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_complex.yml +++ b/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_complex.yml @@ -136,14 +136,15 @@ OBSERVATORY: - CHANNEL: name: OpticalChannel - COMPONENT_AGENTS: - - OpticImager: optic - - DetectorSensor: camera - - DetectorShutter: camera - - DetectorTimer: camera + symbol: test + AGENTS: + - camera + COMPONENTS: + - SkyWatcher ALBUMS: - ALBUM: name: test_album + symbol: test CHANNELS: - OpticalChannel diff --git a/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml b/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml index 861ed45..c8d5982 100644 --- a/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml +++ b/src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml @@ -27,7 +27,7 @@ OBSERVATORY: network_ip: 192.168.0.2 - DEVICE: - name: SkyWatcher + name: SkyWatcher-ED80 file: device_SkyWatcher_ED80_test.yml @@ -85,7 +85,7 @@ OBSERVATORY: - AGENT_DEVICE: computer: MainComputer name: optic - device: SkyWatcher + device: SkyWatcher-ED80 is_real: False - AGENT_DEVICE: @@ -135,10 +135,10 @@ OBSERVATORY: - CHANNEL: name: OpticalChannel symbol: test - COMPONENT_AGENTS: - - OpticImager: optic - - DetectorSensor: camera - - DetectorShutter: camera + AGENTS: + - camera + COMPONENTS: + - SkyWatcher-ED80 ALBUMS: - ALBUM: -- libgit2 0.21.2