Merge pull request #312 from NASA-AMMOS/issue-306

Issue #306 - Support lists in config directory expansion
NASA-AMMOS · Dec 16, 2020 · 2554ee2 · 2554ee2
2 parents 71b22db + 07e0510
commit 2554ee2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/ait/core/cfg.py b/ait/core/cfg.py
@@ -63,10 +63,16 @@ def expandConfigPaths (config, prefix=None, datetime=None, pathvars=None, parame
 
             config[name] = cleaned[0] if len(cleaned) == 1 else cleaned
 
-        elif type(value) is dict:
+        elif isinstance(value, dict):
             param_key = name if parameter_key == '' else parameter_key + '.' + name
             expandConfigPaths(value, prefix, datetime, pathvars, param_key, *keys)
 
+        elif isinstance(value, list):
+            for item in value:
+                if isinstance(item, dict):
+                    param_key = name if parameter_key == '' else parameter_key + '.' + name
+                    expandConfigPaths(item, prefix, datetime, pathvars, param_key, *keys)
+
 
 def replaceVariables(path, datetime=None, pathvars=None):
     """Return absolute path with path variables replaced as applicable"""

diff --git a/ait/core/test/test_cfg.py b/ait/core/test/test_cfg.py
@@ -75,7 +75,17 @@ def test_expandConfigPaths ():
             'desc'    : 'Test expansion of nested dictionaries too',
             'file'    : os.path.join('bin', 'ait-cmd-send'),
             'filename': os.path.join('bin', 'ait-cmd-send'),
-        }
+        },
+        'a list': [
+            {
+                'file'    : os.path.join('bin', 'ait-orbits-in-a-list'),
+                'filename': os.path.join('bin', 'ait-orbits-in-a-list'),
+            },
+            {
+                'file'    : os.path.join('bin', 'ait-cmd-send-in-a-list'),
+                'filename': os.path.join('bin', 'ait-cmd-send-in-a-list'),
+            }
+        ]
     }
     expected = {
         'desc'    : 'Test cfg.expandConfigPaths()',
@@ -85,7 +95,17 @@ def test_expandConfigPaths ():
             'desc'    : 'Test expansion of nested dictionaries too',
             'file'    : os.path.join(prefix, 'bin', 'ait-cmd-send'),
             'filename': os.path.join(prefix, 'bin', 'ait-cmd-send'),
-        }
+        },
+        'a list': [
+            {
+                'file'    : os.path.join(prefix, 'bin', 'ait-orbits-in-a-list'),
+                'filename': os.path.join(prefix, 'bin', 'ait-orbits-in-a-list'),
+            },
+            {
+                'file'    : os.path.join(prefix, 'bin', 'ait-cmd-send-in-a-list'),
+                'filename': os.path.join(prefix, 'bin', 'ait-cmd-send-in-a-list'),
+            }
+        ]
     }
 
     cfg.expandConfigPaths(actual, prefix, None, None, '', 'file', 'filename')