updating config, schema and python script to check config

Alexis Koralewski
1 parent 7753168f
Showing 3 changed files with 51 additions and 39 deletions Show diff stats
config/config.yml
config/schema.yaml
config/test_yaml.py
-OBSERVATORY_1: 
+OBSERVATORY: 
     _name: TNC
     UNITS: 
-        UNIT_1: 
+        - UNIT: 
             _name: TNC-Telescope
             # _Site: (home, ligne d'horizon)
@@ -13,25 +13,25 @@ OBSERVATORY_1:
             CHANNELS:
-                CHANNEL_1:
+                - CHANNEL:
                     _name: TNC-NW
                     _components: 
                         - Camera_FLIKepler4040_sn123.yml
                         - Focuser_Optec_sn341.yml
                         - Optic_TakahashiED180_sn445.yml
-                CHANNEL_2:
+                - CHANNEL:
                     _name: TNC-NE
-                CHANNEL_3:
+                - CHANNEL:
                     _name: TNC-SW
-                CHANNEL_4:
+                - CHANNEL:
                     _name: TNC-SE
             COMPUTERS:
-                COMPUTER_1:
+                - COMPUTER:
                     _name: PyROS_bdd
                     _file: Computer_DELL_PowerEdge7000_sn599.yml
                     _hostname: TNC_PC_DB
@@ -39,7 +39,7 @@ OBSERVATORY_1:
                         name: MySQL
                         port: 3306
-                COMPUTER_2: 
+                - COMPUTER:
                     _name: PyROS_principal
                     _file: Computer_DELL_E6430_sn000.yml
                     _hostname: TNC_PC1
@@ -48,7 +48,7 @@ OBSERVATORY_1:
                         - Majordome: /home/pyros/private/majordome_perso
                         - Monitoring: ~
-                COMPUTER_3: 
+                - COMPUTER:
                     _name: PyROS_spare
                     _file: Computer_DELL_E6430_sn001.yml
                     _hostname: TNC_PC2
@@ -58,7 +58,7 @@ OBSERVATORY_1:
                         - Majordome: ~
                         - Monitoring: ~
-                COMPUTER_4: 
+                - COMPUTER:
                     _name: PyROS_channel
                     _file: Computer_DELL_MiniPC_s772.yml
                     _hostname: TNC_MINIPC_SW
@@ -68,43 +68,37 @@ schema;schema_COMPUTER:
 schema;schema_COMPUTERS:
 # TODO: can be improved if we switch to sequence -> we can have any number of computers
-  type: map
-  mapping:
-    COMPUTER_1:
-      include: schema_COMPUTER
-    COMPUTER_2:
-      include: schema_COMPUTER
-    COMPUTER_3:
-      include: schema_COMPUTER
-    COMPUTER_4:
-      include: schema_COMPUTER
-
+  type: seq
+  sequence:
+    - type: map
+      mapping:
+        COMPUTER:
+          include: schema_COMPUTER
+    
 schema;schema_UNITS:
-  type: map
+  type: seq
   required: True
-  mapping:
-    UNIT_1:
-      include: schema_UNIT
+  sequence:
+    - type: map
+      mapping : 
+        UNIT:
+          include: schema_UNIT
 schema;schema_CHANNELS:
-  type: map
+  type: seq
   required: True
-  mapping:
-    CHANNEL_1:
-      include: schema_CHANNEL
-    CHANNEL_2:
-      include: schema_CHANNEL
-    CHANNEL_3:
-      include: schema_CHANNEL
-    CHANNEL_4:
-      include: schema_CHANNEL
-    
+  sequence:
+    - type : map
+      mapping:
+        CHANNEL:
+          include: schema_CHANNEL
+
 type: map
 mapping:
-    OBSERVATORY_1:
+    OBSERVATORY:
         type:    map
         required: True
         mapping:
 # -*- coding: utf-8 -*-
 from pykwalify.core import Core
+from pykwalify.errors import SchemaError
 """ 
 Read yaml file : 
@@ -17,6 +18,17 @@ with open(&#39;C:/srv/develop/pyros/config/config2.yml&#39;, &#39;w&#39;, encoding=&#39;utf8&#39;) as ou
     yaml.dump(a, outfile, default_flow_style=False, allow_unicode=True)
 """
+"""
+import yaml
+with open("config.yml", 'r') as stream:
+    try:
+        a = yaml.safe_load(stream)
+        print(a)
+    except yaml.YAMLError as exc:
+        print(exc)
+
+ """
+
 def check_and_return_config(yaml_file:str,schema_file:str)->dict:
     """
     Check if yaml_file is valid for the schema_file
@@ -28,7 +40,13 @@ def check_and_return_config(yaml_file:str,schema_file:str)-&gt;dict:
     Returns:
         dict: Dictionnary of the config file (with values)
     """
-    c = Core(source_file=yaml_file, schema_files=[schema_file])
-    return c.validate(raise_exception=True)
+    try:
+
+        c = Core(source_file=yaml_file, schema_files=[schema_file])
+        return c.validate(raise_exception=True)
+    except SchemaError as error:
+        #TODO : find a way to retrieve message with path to error
+        print(error.path)
+        
 print(check_and_return_config("config.yml","schema.yaml"))
 \ No newline at end of file