mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-25 06:10:22 -07:00
Adds refactors for more f5 modules (#34824)
The main patch is to remove the traceback generating code. There are other small fixes that were made in addition to doing that. * 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.
This commit is contained in:
parent
0e4e7de000
commit
a10aee0fc3
28 changed files with 1327 additions and 1593 deletions
|
@ -17,7 +17,7 @@ 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_qkview import Parameters
|
||||
|
@ -25,7 +25,8 @@ try:
|
|||
from library.bigip_qkview import MadmLocationManager
|
||||
from library.bigip_qkview import BulkLocationManager
|
||||
from library.bigip_qkview 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:
|
||||
|
@ -34,7 +35,8 @@ except ImportError:
|
|||
from ansible.modules.network.f5.bigip_qkview import MadmLocationManager
|
||||
from ansible.modules.network.f5.bigip_qkview import BulkLocationManager
|
||||
from ansible.modules.network.f5.bigip_qkview 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")
|
||||
|
@ -73,7 +75,7 @@ class TestParameters(unittest.TestCase):
|
|||
exclude=['audit', 'secure'],
|
||||
dest='/tmp/foo.qkview'
|
||||
)
|
||||
p = Parameters(args)
|
||||
p = Parameters(params=args)
|
||||
assert p.filename == 'foo.qkview'
|
||||
assert p.asm_request_log is None
|
||||
assert p.max_file_size == '-s 1024'
|
||||
|
@ -89,12 +91,10 @@ class TestParameters(unittest.TestCase):
|
|||
args = dict(
|
||||
asm_request_log=True,
|
||||
)
|
||||
p = Parameters(args)
|
||||
p = Parameters(params=args)
|
||||
assert p.asm_request_log == '-o asm-request-log'
|
||||
|
||||
|
||||
@patch('ansible.module_utils.f5_utils.AnsibleF5Client._get_mgmt_root',
|
||||
return_value=True)
|
||||
class TestMadmLocationManager(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
|
@ -108,14 +108,13 @@ class TestMadmLocationManager(unittest.TestCase):
|
|||
password='password'
|
||||
))
|
||||
|
||||
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
|
||||
tm = MadmLocationManager(client)
|
||||
tm = MadmLocationManager(module=module, params=module.params)
|
||||
tm.exists = Mock(return_value=False)
|
||||
tm.execute_on_device = Mock(return_value=True)
|
||||
tm._move_qkview_to_download = Mock(return_value=True)
|
||||
|
@ -123,7 +122,7 @@ class TestMadmLocationManager(unittest.TestCase):
|
|||
tm._delete_qkview = Mock(return_value=True)
|
||||
|
||||
# Override methods to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_less_than_14 = Mock(return_value=True)
|
||||
mm.get_manager = Mock(return_value=tm)
|
||||
|
||||
|
@ -134,8 +133,6 @@ class TestMadmLocationManager(unittest.TestCase):
|
|||
assert results['changed'] is False
|
||||
|
||||
|
||||
@patch('ansible.module_utils.f5_utils.AnsibleF5Client._get_mgmt_root',
|
||||
return_value=True)
|
||||
class TestBulkLocationManager(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
|
@ -149,14 +146,13 @@ class TestBulkLocationManager(unittest.TestCase):
|
|||
password='password'
|
||||
))
|
||||
|
||||
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
|
||||
tm = BulkLocationManager(client)
|
||||
tm = BulkLocationManager(module=module, params=module.params)
|
||||
tm.exists = Mock(return_value=False)
|
||||
tm.execute_on_device = Mock(return_value=True)
|
||||
tm._move_qkview_to_download = Mock(return_value=True)
|
||||
|
@ -164,7 +160,7 @@ class TestBulkLocationManager(unittest.TestCase):
|
|||
tm._delete_qkview = Mock(return_value=True)
|
||||
|
||||
# Override methods to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_less_than_14 = Mock(return_value=False)
|
||||
mm.get_manager = Mock(return_value=tm)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue