From a6ffe2e7be96f01e2213ec5c373ca6bb18a1f51e Mon Sep 17 00:00:00 2001 From: Peter Sprygada Date: Tue, 30 Aug 2016 17:14:33 -0400 Subject: [PATCH] removes output keyword from command in ios_command IOS devices only support a single command output which is structured text. This removes the ability to specify the command output format when providing complex arguments to the commands --- network/ios/ios_command.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/network/ios/ios_command.py b/network/ios/ios_command.py index 31ae8da9631..b169c5e14c4 100644 --- a/network/ios/ios_command.py +++ b/network/ios/ios_command.py @@ -144,7 +144,7 @@ from ansible.module_utils.netcli import CommandRunner from ansible.module_utils.netcli import AddCommandError, FailedConditionsError from ansible.module_utils.ios import NetworkModule, NetworkError -VALID_KEYS = ['command', 'output', 'prompt', 'response'] +VALID_KEYS = ['command', 'prompt', 'response'] def to_lines(stdout): for item in stdout: @@ -158,15 +158,13 @@ def parse_commands(module): cmd = dict(command=cmd, output=None) elif 'command' not in cmd: module.fail_json(msg='command keyword argument is required') - elif cmd.get('output') not in [None, 'text', 'json']: - module.fail_json(msg='invalid output specified for command') elif not set(cmd.keys()).issubset(VALID_KEYS): module.fail_json(msg='unknown keyword specified') yield cmd def main(): spec = dict( - # { command: , output: , prompt: , response: } + # { command: , prompt: , response: } commands=dict(type='list', required=True), wait_for=dict(type='list', aliases=['waitfor']),