test

cray/modules/bos/cli.py

@@ -56,19 +56,15 @@ def strip_tenant_header_params(group=cli):
     Remove tenant header parameters from CLI commands, because those are
     handled differently by the CLI
     """
-    dbg(f"group={group}")    
+    dbg(f"group={group} type={type(group).__name__}")
     dbg("dir=" + str(dir(group)))
     if hasattr(group, 'params'):
         dbg(f"params={group.params}")
         group.params = [ p for p in group.params if p.payload_name != 'Cray-Tenant-Name' ]
     if hasattr(group, 'commands'):
         dbg(f"commands={group.commands}")
-        for c in group.commands:
+        for c in group.commands.values():
             strip_tenant_header_params(c)
-    if isinstance(group, dict):
-        dbg("is dict")
-        for subgroup in group.values():
-            strip_tenant_header_params(subgroup)
 
 
 # Add --file parameter for specifying session template data