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

added previously omitted parameter in gtm topology module (#60015)

Browse source
This commit is contained in:
Wojciech Wypior 2019-08-02 22:09:20 -07:00 committed by Tim Rupp
parent 95ef456bb7
commit 1268993506
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/modules/network/f5/bigip_gtm_topology_region.py
View file

@ -38,6 +38,11 @@ options:
- Only a single list entry can be specified together with negate. - Only a single list entry can be specified together with negate.
type: bool type: bool
default: no default: no
subnet:
description:
- An IP address and network mask in the CIDR format.
type: str
version_added: 2.9
region: region:
description: description:
- Specifies the name of region already defined in the configuration. - Specifies the name of region already defined in the configuration.
@ -167,6 +172,7 @@ try:
from library.module_utils.network.f5.common import f5_argument_spec from library.module_utils.network.f5.common import f5_argument_spec
from library.module_utils.network.f5.common import flatten_boolean from library.module_utils.network.f5.common import flatten_boolean
from library.module_utils.network.f5.compare import cmp_simple_list from library.module_utils.network.f5.compare import cmp_simple_list
from library.module_utils.network.f5.ipaddress import is_valid_ip_network
except ImportError: except ImportError:
from ansible.module_utils.network.f5.bigip import F5RestClient from ansible.module_utils.network.f5.bigip import F5RestClient
from ansible.module_utils.network.f5.common import F5ModuleError from ansible.module_utils.network.f5.common import F5ModuleError
@ -176,6 +182,7 @@ except ImportError:
from ansible.module_utils.network.f5.common import f5_argument_spec from ansible.module_utils.network.f5.common import f5_argument_spec
from ansible.module_utils.network.f5.common import flatten_boolean from ansible.module_utils.network.f5.common import flatten_boolean
from ansible.module_utils.network.f5.compare import cmp_simple_list from ansible.module_utils.network.f5.compare import cmp_simple_list
from ansible.module_utils.network.f5.ipaddress import is_valid_ip_network
class Parameters(AnsibleF5Parameters): class Parameters(AnsibleF5Parameters):
@ -531,8 +538,19 @@ class ModuleParameters(Parameters):
return key, self.countries.get(value, value) return key, self.countries.get(value, value)
if key == 'geo_isp': if key == 'geo_isp':
return 'geoip-isp', value return 'geoip-isp', value
if key == 'subnet':
return key, self._test_subnet(value)
return key, value return key, value
def _test_subnet(self, item):
if item is None:
return None
if is_valid_ip_network(item):
return item
raise F5ModuleError(
"Specified 'subnet' is not a valid subnet."
)
class Changes(Parameters): class Changes(Parameters):
def to_return(self): def to_return(self):
@ -822,6 +840,7 @@ class ArgumentSpec(object):
type='list', type='list',
elements='dict', elements='dict',
options=dict( options=dict(
subnet=dict(),
region=dict(), region=dict(),
continent=dict(), continent=dict(),
country=dict(), country=dict(),