cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup iosxr_command module to be consistent with other network modules

Browse source 
this cleans up some of the function calls and output keys to be consistent
with other command modules
This commit is contained in:
Peter Sprygada 2016-04-04 16:12:10 -04:00
parent 25baca1eb8
commit 86f9c672f0
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
network/iosxr/iosxr_command.py
View file

@ -20,14 +20,14 @@ DOCUMENTATION = """
--- ---
module: iosxr_command module: iosxr_command
version_added: "2.1" version_added: "2.1"
author: "Peter sprygada (@privateip)" author: "Peter Sprygada (@privateip)"
short_description: Run arbitrary commands on ios devices. short_description: Run arbitrary commands on ios devices.
description: description:
- Sends arbitrary commands to an IOSXR node and returns the results - Sends arbitrary commands to an IOSXR node and returns the results
read from the device. The M(iosxr_command) module includes an read from the device. The M(iosxr_command) module includes an
argument that will cause the module to wait for a specific condition argument that will cause the module to wait for a specific condition
before returning or timing out if the condition is not met. before returning or timing out if the condition is not met.
extends_documentation_fragment: ios extends_documentation_fragment: iosxr
options: options:
commands: commands:
description: description:
@ -62,7 +62,6 @@ options:
trying the command again. trying the command again.
required: false required: false
default: 1 default: 1
""" """
EXAMPLES = """ EXAMPLES = """
@ -83,7 +82,7 @@ EXAMPLES = """
- show version - show version
- show interfaces - show interfaces
waitfor: waitfor:
- "result[2] contains MgmtEth0/0/CPU0/0" - "result[1] contains MgmtEth0/0/CPU0/0"
- "result[0] contains 6.0.0" - "result[0] contains 6.0.0"
""" """
@ -111,11 +110,10 @@ failed_conditions:
import time import time
import shlex import shlex
import re import re
import json
INDEX_RE = re.compile(r'(\[\d+\])') INDEX_RE = re.compile(r'(\[\d+\])')
def to_lines(stdout): def iterlines(stdout):
for item in stdout: for item in stdout:
if isinstance(item, basestring): if isinstance(item, basestring):
item = str(item).split('\n') item = str(item).split('\n')
@ -165,7 +163,7 @@ def main():
failed_conditions = [item.raw for item in queue] failed_conditions = [item.raw for item in queue]
module.fail_json(msg='timeout waiting for value', failed_conditions=failed_conditions) module.fail_json(msg='timeout waiting for value', failed_conditions=failed_conditions)
result['stdout_lines'] = list(to_lines(result['stdout'])) result['stdout_lines'] = list(iterlines(result['stdout']))
return module.exit_json(**result) return module.exit_json(**result)