Commit cdb5c29ab726e7a515dbc9980d8b30e4783bf9a3
Exists in
dev
Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev
Showing
3 changed files
with
49 additions
and
0 deletions
Show diff stats
CHANGELOG
1 | +08-09-2022 (AKo): v0.5.4.0 | |
2 | + - Add AgentTriton | |
3 | + - Add dependencies section in tnc obs config | |
4 | + - Add dependencies section in obs schema | |
5 | + | |
1 | 6 | 30-08-2022 (AKo): v0.5.3.2 |
2 | 7 | - Pyros container has fix hostname (hostname of local machine) |
3 | 8 | - Adding switch of database if we're not in docker and not on the computer that host the database | ... | ... |
config/schemas/schema_observatory-2.0.yml
... | ... | @@ -205,6 +205,45 @@ schema;schema_COMPUTERS: |
205 | 205 | COMPUTER: |
206 | 206 | include: schema_COMPUTER |
207 | 207 | |
208 | +schema;schema_link: | |
209 | + type: map | |
210 | + required: True | |
211 | + mapping: | |
212 | + type: | |
213 | + type: str | |
214 | + required: True | |
215 | + name: | |
216 | + type: str | |
217 | + required: True | |
218 | + url: | |
219 | + type: str | |
220 | + required: True | |
221 | + | |
222 | +schema;schema_DEPENDENCY: | |
223 | + type: map | |
224 | + required: True | |
225 | + mapping: | |
226 | + computers: | |
227 | + type: seq | |
228 | + sequence: | |
229 | + - type: str | |
230 | + links: | |
231 | + type: seq | |
232 | + sequence: | |
233 | + - type: map | |
234 | + mapping : | |
235 | + link: | |
236 | + include: schema_link | |
237 | + | |
238 | +schema;schema_DEPENDENCIES: | |
239 | + type: seq | |
240 | + required: False | |
241 | + sequence: | |
242 | + - type: map | |
243 | + mapping: | |
244 | + DEPENDENCY: | |
245 | + include: schema_DEPENDENCY | |
246 | + | |
208 | 247 | schema;schema_UNIT: |
209 | 248 | type: map |
210 | 249 | required: True |
... | ... | @@ -235,6 +274,8 @@ schema;schema_UNIT: |
235 | 274 | include: schema_AGENTS |
236 | 275 | TOPOLOGY: |
237 | 276 | include: schema_TOPOLOGY |
277 | + DEPENDENCIES: | |
278 | + include: schema_DEPENDENCIES | |
238 | 279 | |
239 | 280 | |
240 | 281 | schema;schema_UNITS: | ... | ... |
pyros.py
... | ... | @@ -80,6 +80,7 @@ AGENTS = { |
80 | 80 | "alert_manager": "alert_manager", |
81 | 81 | "agentImagesProcessor_tnc_up1": "../../../privatedev/plugin/agent", |
82 | 82 | "agentBasic": "agent", |
83 | + "agentTriton": "agent", | |
83 | 84 | } |
84 | 85 | # AGENTS = ["agentX", "webserver", "monitoring", "majordome", "scheduler", "alert_manager"] |
85 | 86 | # AGENTS = ["all", "webserver", "monitoring", "majordome", "scheduler", "alert"] |
... | ... | @@ -469,6 +470,8 @@ def pyros_launcher(debug, sim, test, verbose): |
469 | 470 | @pyros_launcher.command(help="Run a pyros shell (django included)") |
470 | 471 | # @global_test_options |
471 | 472 | def shell(): |
473 | + os.environ["PATH_TO_OBSCONF_FILE"] = os.path.join(os.path.abspath( | |
474 | + PYROS_DJANGO_BASE_DIR), "obsconfig/fixtures/observatory_configuration_ok_simple.yml") | |
472 | 475 | print("Execution commande shell") |
473 | 476 | print("NAME IS", __name__) |
474 | 477 | print() | ... | ... |