Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev

Alain Klotz
2 parents 9b8f5c2e 2e893446
Showing 3 changed files with 49 additions and 0 deletions Show diff stats
CHANGELOG
config/schemas/schema_observatory-2.0.yml
pyros.py
+08-09-2022 (AKo): v0.5.4.0
+	- Add AgentTriton
+	- Add dependencies section in tnc obs config
+	- Add dependencies section in obs schema 
+	 
 30-08-2022 (AKo): v0.5.3.2
 	- Pyros container has fix hostname (hostname of local machine)
 	- Adding switch of database if we're not in docker and not on the computer that host the database
@@ -205,6 +205,45 @@ schema;schema_COMPUTERS:
         COMPUTER:
           include: schema_COMPUTER
+schema;schema_link:
+  type: map
+  required: True
+  mapping: 
+    type: 
+      type: str
+      required: True
+    name: 
+      type: str
+      required: True
+    url: 
+      type: str
+      required: True
+
+schema;schema_DEPENDENCY:
+  type: map
+  required: True
+  mapping:
+    computers:
+      type: seq
+      sequence:
+        - type: str
+    links:
+      type: seq
+      sequence:
+        - type: map
+          mapping : 
+            link:
+              include: schema_link
+
+schema;schema_DEPENDENCIES:
+  type: seq
+  required: False
+  sequence: 
+    - type: map
+      mapping:
+        DEPENDENCY:
+          include: schema_DEPENDENCY
+
 schema;schema_UNIT:
   type: map
   required: True
@@ -235,6 +274,8 @@ schema;schema_UNIT:
       include: schema_AGENTS
     TOPOLOGY:
       include: schema_TOPOLOGY
+    DEPENDENCIES:
+      include: schema_DEPENDENCIES
 schema;schema_UNITS:
@@ -80,6 +80,7 @@ AGENTS = {
     "alert_manager": "alert_manager",
     "agentImagesProcessor_tnc_up1": "../../../privatedev/plugin/agent",
     "agentBasic": "agent",
+    "agentTriton": "agent",
 }
 # AGENTS = ["agentX", "webserver", "monitoring", "majordome", "scheduler", "alert_manager"]
 # AGENTS = ["all", "webserver", "monitoring", "majordome", "scheduler", "alert"]
@@ -469,6 +470,8 @@ def pyros_launcher(debug, sim, test, verbose):
 @pyros_launcher.command(help="Run a pyros shell (django included)")
 # @global_test_options
 def shell():
+    os.environ["PATH_TO_OBSCONF_FILE"] = os.path.join(os.path.abspath(
+            PYROS_DJANGO_BASE_DIR), "obsconfig/fixtures/observatory_configuration_ok_simple.yml")
     print("Execution commande shell")
     print("NAME IS", __name__)
     print()