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

Pep8 fixes for ha_proxy module (#24090)

Browse source 
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2017-04-28 19:09:38 +05:30 committed by Matt Martz
parent 3d4523f231
commit ca7616b4a1
2 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/ansible/modules/net_tools/haproxy.py
View file

@ -181,16 +181,18 @@ import time
from string import Template from string import Template
DEFAULT_SOCKET_LOCATION="/var/run/haproxy.sock" DEFAULT_SOCKET_LOCATION = "/var/run/haproxy.sock"
RECV_SIZE = 1024 RECV_SIZE = 1024
ACTION_CHOICES = ['enabled', 'disabled'] ACTION_CHOICES = ['enabled', 'disabled']
WAIT_RETRIES=25 WAIT_RETRIES = 25
WAIT_INTERVAL=5 WAIT_INTERVAL = 5
###################################################################### ######################################################################
class TimeoutException(Exception): class TimeoutException(Exception):
pass pass
class HAProxy(object): class HAProxy(object):
""" """
Used for communicating with HAProxy through its local UNIX socket interface. Used for communicating with HAProxy through its local UNIX socket interface.
@ -237,7 +239,6 @@ class HAProxy(object):
self.client.close() self.client.close()
return result return result
def capture_command_output(self, cmd, output): def capture_command_output(self, cmd, output):
""" """
Capture the output for a command Capture the output for a command
@ -249,7 +250,6 @@ class HAProxy(object):
self.command_results['output'] = [] self.command_results['output'] = []
self.command_results['output'].append(output) self.command_results['output'].append(output)
def discover_all_backends(self): def discover_all_backends(self):
""" """
Discover all entries with svname = 'BACKEND' and return a list of their corresponding Discover all entries with svname = 'BACKEND' and return a list of their corresponding
@ -259,8 +259,7 @@ class HAProxy(object):
r = csv.DictReader(data.splitlines()) r = csv.DictReader(data.splitlines())
return tuple(map(lambda d: d['pxname'], filter(lambda d: d['svname'] == 'BACKEND', r))) return tuple(map(lambda d: d['pxname'], filter(lambda d: d['svname'] == 'BACKEND', r)))
def execute_for_backends(self, cmd, pxname, svname, wait_for_status=None):
def execute_for_backends(self, cmd, pxname, svname, wait_for_status = None):
""" """
Run some command on the specified backends. If no backends are provided they will Run some command on the specified backends. If no backends are provided they will
be discovered automatically (all backends) be discovered automatically (all backends)
@ -278,11 +277,10 @@ class HAProxy(object):
if (self.fail_on_not_found or self.wait) and state is None: if (self.fail_on_not_found or self.wait) and state is None:
self.module.fail_json(msg="The specified backend '%s/%s' was not found!" % (backend, svname)) self.module.fail_json(msg="The specified backend '%s/%s' was not found!" % (backend, svname))
self.execute(Template(cmd).substitute(pxname = backend, svname = svname)) self.execute(Template(cmd).substitute(pxname=backend, svname=svname))
if self.wait: if self.wait:
self.wait_until_status(backend, svname, wait_for_status) self.wait_until_status(backend, svname, wait_for_status)
def get_state_for(self, pxname, svname): def get_state_for(self, pxname, svname):
""" """
Find the state of specific services. When pxname is not set, get all backends for a specific host. Find the state of specific services. When pxname is not set, get all backends for a specific host.
@ -298,7 +296,6 @@ class HAProxy(object):
) )
return state or None return state or None
def wait_until_status(self, pxname, svname, status): def wait_until_status(self, pxname, svname, status):
""" """
Wait for a service to reach the specified status. Try RETRIES times Wait for a service to reach the specified status. Try RETRIES times
@ -317,7 +314,6 @@ class HAProxy(object):
self.module.fail_json(msg="server %s/%s not status '%s' after %d retries. Aborting." % (pxname, svname, status, self.wait_retries)) self.module.fail_json(msg="server %s/%s not status '%s' after %d retries. Aborting." % (pxname, svname, status, self.wait_retries))
def enabled(self, host, backend, weight): def enabled(self, host, backend, weight):
""" """
Enabled action, marks server to UP and checks are re-enabled, Enabled action, marks server to UP and checks are re-enabled,
@ -329,7 +325,6 @@ class HAProxy(object):
cmd += "; set weight $pxname/$svname %s" % weight cmd += "; set weight $pxname/$svname %s" % weight
self.execute_for_backends(cmd, backend, host, 'UP') self.execute_for_backends(cmd, backend, host, 'UP')
def disabled(self, host, backend, shutdown_sessions): def disabled(self, host, backend, shutdown_sessions):
""" """
Disabled action, marks server to DOWN for maintenance. In this mode, no more checks will be Disabled action, marks server to DOWN for maintenance. In this mode, no more checks will be
@ -341,7 +336,6 @@ class HAProxy(object):
cmd += "; shutdown sessions server $pxname/$svname" cmd += "; shutdown sessions server $pxname/$svname"
self.execute_for_backends(cmd, backend, host, 'MAINT') self.execute_for_backends(cmd, backend, host, 'MAINT')
def act(self): def act(self):
""" """
Figure out what you want to do from ansible, and then do it. Figure out what you want to do from ansible, and then do it.
@ -375,12 +369,12 @@ def main():
# load ansible module object # load ansible module object
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec=dict(
state = dict(required=True, default=None, choices=ACTION_CHOICES), state=dict(required=True, default=None, choices=ACTION_CHOICES),
host=dict(required=True, default=None), host=dict(required=True, default=None),
backend=dict(required=False, default=None), backend=dict(required=False, default=None),
weight=dict(required=False, default=None), weight=dict(required=False, default=None),
socket = dict(required=False, default=DEFAULT_SOCKET_LOCATION), socket=dict(required=False, default=DEFAULT_SOCKET_LOCATION),
shutdown_sessions=dict(required=False, default=False, type='bool'), shutdown_sessions=dict(required=False, default=False, type='bool'),
fail_on_not_found=dict(required=False, default=False, type='bool'), fail_on_not_found=dict(required=False, default=False, type='bool'),
wait=dict(required=False, default=False, type='bool'), wait=dict(required=False, default=False, type='bool'),
@ -396,7 +390,7 @@ def main():
ansible_haproxy.act() ansible_haproxy.act()
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import AnsibleModule
if __name__ == '__main__': if __name__ == '__main__':
main() main()

1
test/sanity/pep8/legacy-files.txt
View file

@ -498,7 +498,6 @@ lib/ansible/modules/network/f5/bigip_gtm_wide_ip.py
lib/ansible/modules/network/f5/bigip_virtual_server.py lib/ansible/modules/network/f5/bigip_virtual_server.py
lib/ansible/modules/network/fortios/fortios_config.py lib/ansible/modules/network/fortios/fortios_config.py
lib/ansible/modules/network/fortios/fortios_ipv4_policy.py lib/ansible/modules/network/fortios/fortios_ipv4_policy.py
lib/ansible/modules/net_tools/haproxy.py
lib/ansible/modules/network/illumos/dladm_iptun.py lib/ansible/modules/network/illumos/dladm_iptun.py
lib/ansible/modules/network/illumos/dladm_linkprop.py lib/ansible/modules/network/illumos/dladm_linkprop.py
lib/ansible/modules/network/ios/_ios_template.py lib/ansible/modules/network/ios/_ios_template.py