Removes bigip_command from the skip file (#32407)

Includes fixes and enhancements to make it unnecessary to include this
module in the skip file
This commit is contained in:
Tim Rupp 2017-10-31 13:50:28 -07:00 committed by GitHub
commit 8c5cd9c530
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 95 additions and 62 deletions

View file

@ -4,14 +4,18 @@
# Copyright (c) 2017 F5 Networks Inc.
# GNU General Public License v3.0 (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
from __future__ import absolute_import, division, print_function
__metaclass__ = type
ANSIBLE_METADATA = {'metadata_version': '1.1',
'status': ['preview'],
'supported_by': 'community'}
DOCUMENTATION = '''
DOCUMENTATION = r'''
---
module: bigip_command
short_description: Run arbitrary command on F5 devices.
short_description: Run arbitrary command on F5 devices
description:
- Sends an arbitrary command to an BIG-IP node and returns the results
read from the device. This module includes an argument that will cause
@ -85,24 +89,24 @@ author:
- Tim Rupp (@caphrim007)
'''
EXAMPLES = '''
EXAMPLES = r'''
- name: run show version on remote devices
bigip_command:
commands: show sys version
server: "lb.mydomain.com"
password: "secret"
user: "admin"
validate_certs: "no"
server: lb.mydomain.com
password: secret
user: admin
validate_certs: no
delegate_to: localhost
- name: run show version and check to see if output contains BIG-IP
bigip_command:
commands: show sys version
wait_for: result[0] contains BIG-IP
server: "lb.mydomain.com"
password: "secret"
user: "admin"
validate_certs: "no"
server: lb.mydomain.com
password: secret
user: admin
validate_certs: no
delegate_to: localhost
- name: run multiple commands on remote nodes
@ -110,10 +114,10 @@ EXAMPLES = '''
commands:
- show sys version
- list ltm virtual
server: "lb.mydomain.com"
password: "secret"
user: "admin"
validate_certs: "no"
server: lb.mydomain.com
password: secret
user: admin
validate_certs: no
delegate_to: localhost
- name: run multiple commands and evaluate the output
@ -124,10 +128,10 @@ EXAMPLES = '''
wait_for:
- result[0] contains BIG-IP
- result[1] contains my-vs
server: "lb.mydomain.com"
password: "secret"
user: "admin"
validate_certs: "no"
server: lb.mydomain.com
password: secret
user: admin
validate_certs: no
delegate_to: localhost
- name: tmsh prefixes will automatically be handled
@ -135,41 +139,45 @@ EXAMPLES = '''
commands:
- show sys version
- tmsh list ltm virtual
server: "lb.mydomain.com"
password: "secret"
user: "admin"
validate_certs: "no"
server: lb.mydomain.com
password: secret
user: admin
validate_certs: no
delegate_to: localhost
'''
RETURN = '''
RETURN = r'''
stdout:
description: The set of responses from the commands
returned: always
type: list
sample: ['...', '...']
description: The set of responses from the commands
returned: always
type: list
sample: ['...', '...']
stdout_lines:
description: The value of stdout split into a list
returned: always
type: list
sample: [['...', '...'], ['...'], ['...']]
description: The value of stdout split into a list
returned: always
type: list
sample: [['...', '...'], ['...'], ['...']]
failed_conditions:
description: The list of conditionals that have failed
returned: failed
type: list
sample: ['...', '...']
description: The list of conditionals that have failed
returned: failed
type: list
sample: ['...', '...']
'''
import re
import time
from ansible.module_utils.f5_utils import AnsibleF5Client
from ansible.module_utils.f5_utils import AnsibleF5Parameters
from ansible.module_utils.f5_utils import HAS_F5SDK
from ansible.module_utils.f5_utils import F5ModuleError
from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError
from ansible.module_utils.f5_utils import run_commands
try:
from ansible.module_utils.f5_utils import run_commands
HAS_CLI_TRANSPORT = True
except ImportError:
HAS_CLI_TRANSPORT = False
from ansible.module_utils.netcli import FailedConditionsError
from ansible.module_utils.six import string_types
from ansible.module_utils.netcli import Conditional
@ -177,6 +185,11 @@ from ansible.module_utils.network_common import ComplexList
from ansible.module_utils.network_common import to_list
from collections import deque
try:
from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError
except ImportError:
HAS_F5SDK = False
class Parameters(AnsibleF5Parameters):
returnables = ['stdout', 'stdout_lines', 'warnings']
@ -198,6 +211,10 @@ class Parameters(AnsibleF5Parameters):
commands = map(self._ensure_tmsh_prefix, list(commands))
return list(commands)
@property
def user_commands(self):
return map(self._ensure_tmsh_prefix, list(self._values['commands']))
def _ensure_tmsh_prefix(self, cmd):
cmd = cmd.strip()
if cmd[0:5] != 'tmsh ':
@ -234,16 +251,17 @@ class ModuleManager(object):
result = dict()
try:
self.execute()
changed = self.execute()
except iControlUnexpectedHTTPError as e:
raise F5ModuleError(str(e))
result.update(**self.changes.to_return())
result.update(dict(changed=True))
result.update(dict(changed=changed))
return result
def execute(self):
warnings = list()
changed = ('tmsh modify', 'tmsh create', 'tmsh delete')
commands = self.parse_commands(warnings)
@ -256,7 +274,7 @@ class ModuleManager(object):
return
while retries > 0:
if self.client.module.params['transport'] == 'cli':
if self.client.module.params['transport'] == 'cli' and HAS_CLI_TRANSPORT:
responses = run_commands(self.client.module, self.want.commands)
else:
responses = self.execute_on_device(commands)
@ -283,6 +301,9 @@ class ModuleManager(object):
'stdout_lines': self._to_lines(responses),
'warnings': warnings
})
if any(x for x in self.want.user_commands if x.startswith(changed)):
return True
return False
def parse_commands(self, warnings):
results = []
@ -315,10 +336,12 @@ class ModuleManager(object):
def execute_on_device(self, commands):
responses = []
escape_patterns = r'([$' + "'])"
for item in to_list(commands):
command = re.sub(escape_patterns, r'\\\1', item['command'])
output = self.client.api.tm.util.bash.exec_cmd(
'run',
utilCmdArgs='-c "{0}"'.format(item['command'])
utilCmdArgs='-c "{0}"'.format(command)
)
if hasattr(output, 'commandResult'):
responses.append(str(output.commandResult))