fixes ios and eos command modules

lib/ansible/module_utils/ios.py

@@ -47,6 +47,7 @@ def get_config(module, flags=[]):
 def run_commands(module, commands, check_rc=True):
     responses = list()
     for cmd in to_list(commands):
+        cmd = module.jsonify(cmd)
         rc, out, err = module.exec_command(cmd)
         if check_rc and rc != 0:
             module.fail_json(msg=err, rc=rc)

lib/ansible/modules/network/eos/eos_command.py

@@ -165,21 +165,22 @@ def to_lines(stdout):
     return lines
 
 def parse_commands(module, warnings):
-    cast = ComplexList(dict(
+    transform = ComplexList(dict(
         command=dict(key=True),
         output=dict(),
         prompt=dict(),
         response=dict()
     ))
 
-    commands = cast(module.params['commands'])
+    commands = transform(module.params['commands'])
 
     for index, item in enumerate(commands):
         if module.check_mode and not item['command'].startswith('show'):
             warnings.append(
                 'Only show commands are supported when using check_mode, not '
                 'executing %s' % item['command']
             )
+
     return commands
 
 def to_cli(obj):
@@ -223,8 +224,6 @@ def main():
     interval = module.params['interval']
     match = module.params['match']
 
-    commands = [to_cli(c) for c in commands]
-
     while retries > 0:
         responses = run_commands(module, commands)
 

lib/ansible/modules/network/ios/ios_command.py

@@ -188,7 +188,6 @@ def parse_commands(module, warnings):
         response=dict()
     ))
     commands = command(module.params['commands'])
-
     for index, item in enumerate(commands):
         if module.check_mode and not item['command'].startswith('show'):
             warnings.append(
@@ -200,7 +199,6 @@ def parse_commands(module, warnings):
                 msg='ios_command does not support running config mode '
                     'commands.  Please use ios_config instead'
             )
-        commands[index] = module.jsonify(item)
     return commands
 
 def main():

test/units/modules/network/eos/test_eos_command.py

@@ -72,10 +72,10 @@ def load_from_file(*args, **kwargs):
 
             for item in commands:
                 try:
-                    obj = json.loads(item)
+                    obj = json.loads(item['command'])
                     command = obj['command']
                 except ValueError:
-                    command = item
+                    command = item['command']
                 filename = str(command).replace(' ', '_')
                 filename = 'eos_command_%s.txt' % filename
                 output.append(load_fixture(filename))

test/units/modules/network/ios/test_ios_command.py

@@ -72,10 +72,10 @@ def load_from_file(*args, **kwargs):
 
             for item in commands:
                 try:
-                    obj = json.loads(item)
+                    obj = json.loads(item['command'])
                     command = obj['command']
                 except ValueError:
-                    command = item
+                    command = item['command']
                 filename = str(command).replace(' ', '_')
                 output.append(load_fixture(filename))
             return output