diff options
author | Tim Rupp <caphrim007@gmail.com> | 2018-01-12 14:43:35 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-12 14:43:35 -0800 |
commit | 0e4e7de0001c3b53c586e6b9bafcd3f15bb862c0 (patch) | |
tree | 10bc9e7f22b37b15dc0984f8ccfc9f3ab725c239 /test/units/modules/network/f5/test_bigip_partition.py | |
parent | 86e4619dcf69843a74889e06dc74ade06565bcc1 (diff) | |
download | ansible-0e4e7de0001c3b53c586e6b9bafcd3f15bb862c0.tar.gz |
Various F5 related fixes for traceback raising (#34820)
The main purpose of this patch is to do the refactor that
supports replacing tracebacks with fail_json. Additionally, the
following was done.
* Removed re-def of cleanup_tokens.
* Changed parameter args to be keywords.
* Changed imports to include new module_util locations.
* Imports also include developing (sideband) module_util locations.
* Changed to using F5Client and plain AnsibleModule to prevent tracebacks caused by missing libraries.
* Removed init and update methods from most Parameter classes (optimization) as its now included in module_utils.
* Changed module and module param references to take into account the new self.module arg.
* Minor bug fixes made during this refactor.
Diffstat (limited to 'test/units/modules/network/f5/test_bigip_partition.py')
-rw-r--r-- | test/units/modules/network/f5/test_bigip_partition.py | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/test/units/modules/network/f5/test_bigip_partition.py b/test/units/modules/network/f5/test_bigip_partition.py index e77e117d5c..795427ee5f 100644 --- a/test/units/modules/network/f5/test_bigip_partition.py +++ b/test/units/modules/network/f5/test_bigip_partition.py @@ -17,20 +17,22 @@ if sys.version_info < (2, 7): from ansible.compat.tests import unittest from ansible.compat.tests.mock import Mock from ansible.compat.tests.mock import patch -from ansible.module_utils.f5_utils import AnsibleF5Client +from ansible.module_utils.basic import AnsibleModule try: from library.bigip_partition import Parameters from library.bigip_partition import ModuleManager from library.bigip_partition import ArgumentSpec - from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError + 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 except ImportError: try: from ansible.modules.network.f5.bigip_partition import Parameters from ansible.modules.network.f5.bigip_partition import ModuleManager from ansible.modules.network.f5.bigip_partition import ArgumentSpec - from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError + from ansible.module_utils.network.f5.common import F5ModuleError + from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError from units.modules.utils import set_module_args except ImportError: raise SkipTest("F5 Ansible modules require the f5-sdk Python library") @@ -65,7 +67,7 @@ class TestParameters(unittest.TestCase): route_domain=0 ) - p = Parameters(args) + p = Parameters(params=args) assert p.name == 'foo' assert p.description == 'my description' assert p.route_domain == 0 @@ -76,7 +78,7 @@ class TestParameters(unittest.TestCase): route_domain='0' ) - p = Parameters(args) + p = Parameters(params=args) assert p.name == 'foo' assert p.route_domain == 0 @@ -87,14 +89,12 @@ class TestParameters(unittest.TestCase): defaultRouteDomain=1 ) - p = Parameters(args) + p = Parameters(params=args) assert p.name == 'foo' assert p.description == 'my description' assert p.route_domain == 1 -@patch('ansible.module_utils.f5_utils.AnsibleF5Client._get_mgmt_root', - return_value=True) class TestManagerEcho(unittest.TestCase): def setUp(self): @@ -109,14 +109,13 @@ class TestManagerEcho(unittest.TestCase): user='admin' )) - client = AnsibleF5Client( + module = AnsibleModule( argument_spec=self.spec.argument_spec, - supports_check_mode=self.spec.supports_check_mode, - f5_product_name=self.spec.f5_product_name + supports_check_mode=self.spec.supports_check_mode ) # Override methods in the specific type of manager - mm = ModuleManager(client) + mm = ModuleManager(module=module) mm.exists = Mock(side_effect=[False, True]) mm.create_on_device = Mock(return_value=True) @@ -133,15 +132,14 @@ class TestManagerEcho(unittest.TestCase): user='admin' )) - current = Parameters(load_fixture('load_tm_auth_partition.json')) - client = AnsibleF5Client( + current = Parameters(params=load_fixture('load_tm_auth_partition.json')) + module = AnsibleModule( argument_spec=self.spec.argument_spec, - supports_check_mode=self.spec.supports_check_mode, - f5_product_name=self.spec.f5_product_name + supports_check_mode=self.spec.supports_check_mode ) # Override methods in the specific type of manager - mm = ModuleManager(client) + mm = ModuleManager(module=module) mm.exists = Mock(return_value=True) mm.read_current_from_device = Mock(return_value=current) @@ -158,15 +156,14 @@ class TestManagerEcho(unittest.TestCase): user='admin' )) - current = Parameters(load_fixture('load_tm_auth_partition.json')) - client = AnsibleF5Client( + current = Parameters(params=load_fixture('load_tm_auth_partition.json')) + module = AnsibleModule( argument_spec=self.spec.argument_spec, - supports_check_mode=self.spec.supports_check_mode, - f5_product_name=self.spec.f5_product_name + supports_check_mode=self.spec.supports_check_mode ) # Override methods in the specific type of manager - mm = ModuleManager(client) + mm = ModuleManager(module=module) mm.exists = Mock(return_value=True) mm.read_current_from_device = Mock(return_value=current) mm.update_on_device = Mock(return_value=True) @@ -185,15 +182,14 @@ class TestManagerEcho(unittest.TestCase): user='admin' )) - current = Parameters(load_fixture('load_tm_auth_partition.json')) - client = AnsibleF5Client( + current = Parameters(params=load_fixture('load_tm_auth_partition.json')) + module = AnsibleModule( argument_spec=self.spec.argument_spec, - supports_check_mode=self.spec.supports_check_mode, - f5_product_name=self.spec.f5_product_name + supports_check_mode=self.spec.supports_check_mode ) # Override methods in the specific type of manager - mm = ModuleManager(client) + mm = ModuleManager(module=module) mm.exists = Mock(return_value=True) mm.read_current_from_device = Mock(return_value=current) mm.update_on_device = Mock(return_value=True) |