Various f5 module fixes (#39510)

Mainly fixing coding conventions. Also, added ipv6 suppor to pool members
This commit is contained in:
Tim Rupp 2018-04-30 09:48:41 -07:00 committed by GitHub
parent 7c9122a89d
commit 0cb11c61ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 75 additions and 132 deletions

View file

@ -340,15 +340,29 @@ class Parameters(AnsibleF5Parameters):
class ModuleParameters(Parameters):
@property
def full_name(self):
delimiter = ':'
try:
addr = netaddr.IPAddress(self.full_name_dict['name'])
if addr.version == 6:
delimiter = '.'
except netaddr.AddrFormatError:
pass
return '{0}{1}{2}'.format(self.full_name_dict['name'], delimiter, self.port)
@property
def full_name_dict(self):
if self._values['name'] is None:
name = self._values['address'] if self._values['address'] else self._values['fqdn']
else:
name = self._values['name']
return '{0}:{1}'.format(name, self.port)
return dict(
name=name,
port=self.port
)
@property
def node_name(self):
return self.full_name.split(':')[0]
return self.full_name_dict['name']
@property
def fqdn_name(self):
@ -848,8 +862,14 @@ class ArgumentSpec(object):
# Deprecated params
# TODO(Remove in 2.7)
session_state=dict(choices=['enabled', 'disabled']),
monitor_state=dict(choices=['enabled', 'disabled']),
session_state=dict(
choices=['enabled', 'disabled'],
removed_in_version=2.7,
),
monitor_state=dict(
choices=['enabled', 'disabled'],
removed_in_version=2.7,
),
)
self.argument_spec = {}
self.argument_spec.update(f5_argument_spec)