archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove f5-sdk and add qinq ethertype (#48006)

Browse Source 
This patch removes the f5-sdk from bigip trunk and adds the qinq
ethertype parameter
pull/48009/head
Tim Rupp 6 years ago committed by GitHub
parent b4af058c55
commit 24be9c030c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 103 additions and 59 deletions
Show Stats Download Patch File Download Diff File

141
lib/ansible/modules/network/f5/bigip_trunk.py
Unescape Escape View File

@ -117,6 +117,7 @@ options:
extends_documentation_fragment: f5
author:
- Tim Rupp (@caphrim007)
- Wojciech Wypior (@wojtek0806)
'''
EXAMPLES = r'''
@ -186,29 +187,23 @@ qinq_ethertype:
from ansible.module_utils.basic import AnsibleModule
try:
from library.module_utils.network.f5.bigip import HAS_F5SDK
from library.module_utils.network.f5.bigip import F5Client
from library.module_utils.network.f5.bigip import F5RestClient
from library.module_utils.network.f5.common import F5ModuleError
from library.module_utils.network.f5.common import AnsibleF5Parameters
from library.module_utils.network.f5.common import cleanup_tokens
from library.module_utils.network.f5.common import exit_json
from library.module_utils.network.f5.common import fail_json
from library.module_utils.network.f5.common import f5_argument_spec
from library.module_utils.network.f5.compare import cmp_simple_list
try:
from library.module_utils.network.f5.common import iControlUnexpectedHTTPError
except ImportError:
HAS_F5SDK = False
except ImportError:
from ansible.module_utils.network.f5.bigip import HAS_F5SDK
from ansible.module_utils.network.f5.bigip import F5Client
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 AnsibleF5Parameters
from ansible.module_utils.network.f5.common import cleanup_tokens
from ansible.module_utils.network.f5.common import exit_json
from ansible.module_utils.network.f5.common import fail_json
from ansible.module_utils.network.f5.common import f5_argument_spec
from ansible.module_utils.network.f5.compare import cmp_simple_list
try:
from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError
except ImportError:
HAS_F5SDK = False
class Parameters(AnsibleF5Parameters):
@ -218,7 +213,7 @@ class Parameters(AnsibleF5Parameters):
'linkSelectPolicy': 'link_selection_policy',
'distributionHash': 'frame_distribution_hash',
'lacp': 'lacp_enabled',
'qinqEthertype': 'qinq_ethertype'
'qinqEthertype': 'qinq_ethertype',
}
api_attributes = [
@ -229,7 +224,7 @@ class Parameters(AnsibleF5Parameters):
'distributionHash',
'interfaces',
'description',
'qinqEthertype'
'qinqEthertype',
]
returnables = [
@ -240,7 +235,7 @@ class Parameters(AnsibleF5Parameters):
'lacp_enabled',
'interfaces',
'description',
'qinq_ethertype'
'qinq_ethertype',
]
updatables = [
@ -251,7 +246,7 @@ class Parameters(AnsibleF5Parameters):
'lacp_enabled',
'interfaces',
'description',
'qinq_ethertype'
'qinq_ethertype',
]
@ -412,13 +407,10 @@ class ModuleManager(object):
result = dict()
state = self.want.state
try:
if state == "present":
changed = self.present()
elif state == "absent":
changed = self.absent()
except iControlUnexpectedHTTPError as e:
raise F5ModuleError(str(e))
if state == "present":
changed = self.present()
elif state == "absent":
changed = self.absent()
reportable = ReportableChanges(params=self.changes.to_return())
changes = reportable.to_return()
@ -441,11 +433,10 @@ class ModuleManager(object):
else:
return self.create()
def exists(self):
result = self.client.api.tm.net.trunks.trunk.exists(
name=self.want.name
)
return result
def absent(self):
if self.exists():
return self.remove()
return False
def update(self):
self.have = self.read_current_from_device()
@ -481,38 +472,87 @@ class ModuleManager(object):
self.create_on_device()
return True
def exists(self):
uri = "https://{0}:{1}/mgmt/tm/net/trunk/{2}".format(
self.client.provider['server'],
self.client.provider['server_port'],
self.want.name
)
resp = self.client.api.get(uri)
try:
response = resp.json()
except ValueError:
return False
if resp.status == 404 or 'code' in response and response['code'] == 404:
return False
return True
def create_on_device(self):
params = self.changes.api_params()
self.client.api.tm.net.trunks.trunk.create(
name=self.want.name,
**params
params['name'] = self.want.name
uri = "https://{0}:{1}/mgmt/tm/net/trunk/".format(
self.client.provider['server'],
self.client.provider['server_port'],
)
resp = self.client.api.post(uri, json=params)
try:
response = resp.json()
except ValueError as ex:
raise F5ModuleError(str(ex))
if 'code' in response and response['code'] in [400, 403, 409]:
if 'message' in response:
raise F5ModuleError(response['message'])
else:
raise F5ModuleError(resp.content)
def update_on_device(self):
params = self.changes.api_params()
resource = self.client.api.tm.net.trunks.trunk.load(
name=self.want.name
uri = "https://{0}:{1}/mgmt/tm/net/trunk/{2}".format(
self.client.provider['server'],
self.client.provider['server_port'],
self.want.name
)
resource.modify(**params)
resp = self.client.api.patch(uri, json=params)
try:
response = resp.json()
except ValueError as ex:
raise F5ModuleError(str(ex))
def absent(self):
if self.exists():
return self.remove()
return False
if 'code' in response and response['code'] == 400:
if 'message' in response:
raise F5ModuleError(response['message'])
else:
raise F5ModuleError(resp.content)
def remove_from_device(self):
resource = self.client.api.tm.net.trunks.trunk.load(
name=self.want.name
uri = "https://{0}:{1}/mgmt/tm/net/trunk/{2}".format(
self.client.provider['server'],
self.client.provider['server_port'],
self.want.name
)
if resource:
resource.delete()
resp = self.client.api.delete(uri)
if resp.status == 200:
return True
def read_current_from_device(self):
resource = self.client.api.tm.net.trunks.trunk.load(
name=self.want.name
uri = "https://{0}:{1}/mgmt/tm/net/trunk/{2}".format(
self.client.provider['server'],
self.client.provider['server_port'],
self.want.name
)
result = resource.attrs
return ApiParameters(params=result)
resp = self.client.api.get(uri)
try:
response = resp.json()
except ValueError as ex:
raise F5ModuleError(str(ex))
if 'code' in response and response['code'] == 400:
if 'message' in response:
raise F5ModuleError(response['message'])
else:
raise F5ModuleError(resp.content)
return ApiParameters(params=response)
class ArgumentSpec(object):
@ -549,18 +589,17 @@ def main():
argument_spec=spec.argument_spec,
supports_check_mode=spec.supports_check_mode
)
if not HAS_F5SDK:
module.fail_json(msg="The python f5-sdk module is required")
client = F5RestClient(**module.params)
try:
client = F5Client(**module.params)
mm = ModuleManager(module=module, client=client)
results = mm.exec_module()
cleanup_tokens(client)
module.exit_json(**results)
exit_json(module, results, client)
except F5ModuleError as ex:
cleanup_tokens(client)
module.fail_json(msg=str(ex))
fail_json(module, ex, client)
if __name__ == '__main__':

21
test/units/modules/network/f5/test_bigip_trunk.py
Unescape Escape View File

@ -15,9 +15,6 @@ from nose.plugins.skip import SkipTest
if sys.version_info < (2, 7):
raise SkipTest("F5 Ansible modules require Python >= 2.7")
from units.compat import unittest
from units.compat.mock import Mock
from units.compat.mock import patch
from ansible.module_utils.basic import AnsibleModule
try:
@ -25,17 +22,25 @@ try:
from library.modules.bigip_trunk import ModuleParameters
from library.modules.bigip_trunk import ModuleManager
from library.modules.bigip_trunk import ArgumentSpec
from library.module_utils.network.f5.common import F5ModuleError
from library.module_utils.network.f5.common import iControlUnexpectedHTTPError
from test.unit.modules.utils import set_module_args
# In Ansible 2.8, Ansible changed import paths.
from test.units.compat import unittest
from test.units.compat.mock import Mock
from test.units.compat.mock import patch
from test.units.modules.utils import set_module_args
except ImportError:
try:
from ansible.modules.network.f5.bigip_trunk import ApiParameters
from ansible.modules.network.f5.bigip_trunk import ModuleParameters
from ansible.modules.network.f5.bigip_trunk import ModuleManager
from ansible.modules.network.f5.bigip_trunk import ArgumentSpec
from ansible.module_utils.network.f5.common import F5ModuleError
from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError
# Ansible 2.8 imports
from units.compat import unittest
from units.compat.mock import Mock
from units.compat.mock import patch
from units.modules.utils import set_module_args
except ImportError:
raise SkipTest("F5 Ansible modules require the f5-sdk Python library")

Write Preview
Loading…
Cancel
Save