PYROS-IRAP / pyros

Commit 65c8b8f836e5ea54613a9f8c97e5c51efde01831

Authored by Alexis Koralewski
1 parent 6d807cd7
Exists in dev

Update schema for obsconfig & configpyros

Showing 5 changed files with 19 additions and 44 deletions   Show diff stats
Inline Side-by-side
config/pyros/schema_pyros_config.yml
  Diff comments   View file @65c8b8f
... ... @@ -20,34 +20,6 @@ mapping:
20 20 type: map
21 21 required: True
22 22 mapping:
23   - pyros_img_L0:
24   - type: map
25   - required: True
26   - mapping:
27   - root_dir:
28   - type: str
29   - description:
30   - type: str
31   - extension:
32   - type: str
33   - naming:
34   - type: str
35   - pathnaming:
36   - type: str
37   - pyros_img_L1:
38   - type: map
39   - required: True
40   - mapping:
41   - root_dir:
42   - type: str
43   - description:
44   - type: str
45   - extension:
46   - type: str
47   - naming:
48   - type: str
49   - pathnaming:
50   - type: str
51 23 pyros_seq:
52 24 type: map
53 25 required: True
... ...
config/schemas/schema_observatory-2.0.yml
  Diff comments   View file @65c8b8f
... ... @@ -151,7 +151,7 @@ schema;schema_CHANNEL:
151 151 - type: any
152 152 fn_contexts:
153 153 type: map
154   - required: True
  154 + required: False
155 155 mapping:
156 156 img_L0:
157 157 type: map
... ...
src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ko.yml
  Diff comments   View file @65c8b8f
... ... @@ -135,14 +135,16 @@ OBSERVATORY:
135 135  
136 136 - CHANNEL:
137 137 name: OpticalChannel
138   - COMPONENT_AGENTS:
139   - - OpticImager: optic
140   - - DetectorSensor: camera
141   - - DetectorShutter: camera
  138 + symbol: test
  139 + AGENTS:
  140 + - camera
  141 + COMPONENTS:
  142 + - SkyWatcher-ED80
142 143  
143 144 ALBUMS:
144 145 - ALBUM:
145 146 name: test_album
  147 + symbol: test
146 148 CHANNELS:
147 149 - OpticalChannel
148 150  
... ...
src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_complex.yml
  Diff comments   View file @65c8b8f
... ... @@ -136,14 +136,15 @@ OBSERVATORY:
136 136  
137 137 - CHANNEL:
138 138 name: OpticalChannel
139   - COMPONENT_AGENTS:
140   - - OpticImager: optic
141   - - DetectorSensor: camera
142   - - DetectorShutter: camera
143   - - DetectorTimer: camera
  139 + symbol: test
  140 + AGENTS:
  141 + - camera
  142 + COMPONENTS:
  143 + - SkyWatcher
144 144 ALBUMS:
145 145 - ALBUM:
146 146 name: test_album
  147 + symbol: test
147 148 CHANNELS:
148 149 - OpticalChannel
149 150  
... ...
src/core/pyros_django/obsconfig/fixtures/observatory_configuration_ok_simple.yml
  Diff comments   View file @65c8b8f
... ... @@ -27,7 +27,7 @@ OBSERVATORY:
27 27 network_ip: 192.168.0.2
28 28  
29 29 - DEVICE:
30   - name: SkyWatcher
  30 + name: SkyWatcher-ED80
31 31 file: device_SkyWatcher_ED80_test.yml
32 32  
33 33  
... ... @@ -85,7 +85,7 @@ OBSERVATORY:
85 85 - AGENT_DEVICE:
86 86 computer: MainComputer
87 87 name: optic
88   - device: SkyWatcher
  88 + device: SkyWatcher-ED80
89 89 is_real: False
90 90  
91 91 - AGENT_DEVICE:
... ... @@ -135,10 +135,10 @@ OBSERVATORY:
135 135 - CHANNEL:
136 136 name: OpticalChannel
137 137 symbol: test
138   - COMPONENT_AGENTS:
139   - - OpticImager: optic
140   - - DetectorSensor: camera
141   - - DetectorShutter: camera
  138 + AGENTS:
  139 + - camera
  140 + COMPONENTS:
  141 + - SkyWatcher-ED80
142 142  
143 143 ALBUMS:
144 144 - ALBUM:
... ...