Undo addition of agents section in config

simonsobs · Dec 11, 2023 · 3fb7275 · 3fb7275
1 parent a5da246
commit 3fb7275
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -25,13 +25,13 @@ A full configuration file example with comments is shown here:
     # agents
     # sorunlib automatically detects unique agents on the OCS network, so only
     # non-unique agents need to be specified here.
-    agents:
-      # ocs registry agent
-      registry: 'registry'
 
-      # wiregrid agents
-      wiregrid:
-        labjack: 'wg-labjack'
+    # ocs registry agent
+    registry: 'registry'
+
+    # wiregrid agents
+    wiregrid:
+      labjack: 'wg-labjack'
 
 Configuration Selection
 -----------------------

diff --git a/src/sorunlib/util.py b/src/sorunlib/util.py
@@ -79,7 +79,7 @@ def _find_active_instances(agent_class):
     """
     cfg = load_config()
 
-    reg_client = _try_client(cfg['agents']['registry'])
+    reg_client = _try_client(cfg['registry'])
     _, _, session = reg_client.main.status()
 
     instances = []
@@ -138,7 +138,7 @@ def _create_wiregrid_clients(config=None, sorunlib_config=None):
     kikusui = _find_active_instances('WiregridKikusuiAgent')
 
     cfg = load_config(filename=sorunlib_config)
-    labjack = cfg['agents']['wiregrid']['labjack']
+    labjack = cfg['wiregrid']['labjack']
 
     clients = {'actuator': _try_client(actuator),
                'encoder': _try_client(encoder),

diff --git a/tests/data/example_config.yaml b/tests/data/example_config.yaml
@@ -1,6 +1,5 @@
 ---
 smurf_failure_threshold: 2
-agents:
-  registry: 'registry'
-  wiregrid:
-    labjack: 'wg-labjack'
+registry: 'registry'
+wiregrid:
+  labjack: 'wg-labjack'
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -5,8 +5,8 @@
 from sorunlib.config import load_config
 
 CONFIG = {'smurf_failure_threshold': 2,
-          'agents': {'registry': 'registry',
-                     'wiregrid': {'labjack': 'wg-labjack'}}}
+          'registry': 'registry',
+          'wiregrid': {'labjack': 'wg-labjack'}}
 
 
 def test_load_config():