mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-05-29 12:29:10 -07:00
Refactors and deprecation removals (#34830)
This patch is primarily a refactor to make the validate-modules arg-spec no longer generate a traceback. It additionally includes removal of deprecated code in the virtual server module.
This commit is contained in:
parent
a10aee0fc3
commit
c548ab0f18
26 changed files with 1612 additions and 2099 deletions
|
@ -18,8 +18,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.f5_utils import F5ModuleError
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
|
||||
try:
|
||||
from library.bigip_ucs import Parameters
|
||||
|
@ -27,7 +26,8 @@ try:
|
|||
from library.bigip_ucs import ArgumentSpec
|
||||
from library.bigip_ucs import V1Manager
|
||||
from library.bigip_ucs import V2Manager
|
||||
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:
|
||||
|
@ -36,7 +36,8 @@ except ImportError:
|
|||
from ansible.modules.network.f5.bigip_ucs import ArgumentSpec
|
||||
from ansible.modules.network.f5.bigip_ucs import V1Manager
|
||||
from ansible.modules.network.f5.bigip_ucs import V2Manager
|
||||
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")
|
||||
|
@ -76,7 +77,7 @@ class TestParameters(unittest.TestCase):
|
|||
state='installed'
|
||||
)
|
||||
|
||||
p = Parameters(args)
|
||||
p = Parameters(params=args)
|
||||
assert p.ucs == '/root/bigip.localhost.localdomain.ucs'
|
||||
assert p.force is True
|
||||
assert p.include_chassis_level_config is True
|
||||
|
@ -98,7 +99,7 @@ class TestParameters(unittest.TestCase):
|
|||
reset_trust=False
|
||||
)
|
||||
|
||||
p = Parameters(args)
|
||||
p = Parameters(params=args)
|
||||
assert p.ucs == '/root/bigip.localhost.localdomain.ucs'
|
||||
assert p.include_chassis_level_config is False
|
||||
assert p.no_license is False
|
||||
|
@ -107,8 +108,6 @@ class TestParameters(unittest.TestCase):
|
|||
assert p.install_command == "tmsh load sys ucs /var/local/ucs/bigip.localhost.localdomain.ucs"
|
||||
|
||||
|
||||
@patch('ansible.module_utils.f5_utils.AnsibleF5Client._get_mgmt_root',
|
||||
return_value=True)
|
||||
class TestV1Manager(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
|
@ -122,17 +121,16 @@ class TestV1Manager(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 to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_v1 = Mock(return_value=True)
|
||||
|
||||
vm = V1Manager(client)
|
||||
vm = V1Manager(module=module)
|
||||
vm.create_on_device = Mock(return_value=True)
|
||||
vm.exists = Mock(side_effect=[False, True])
|
||||
|
||||
|
@ -149,17 +147,16 @@ class TestV1Manager(unittest.TestCase):
|
|||
state='present'
|
||||
))
|
||||
|
||||
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 to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_v1 = Mock(return_value=True)
|
||||
|
||||
vm = V1Manager(client)
|
||||
vm = V1Manager(module=module)
|
||||
vm.create_on_device = Mock(return_value=True)
|
||||
vm.exists = Mock(side_effect=[False, True])
|
||||
|
||||
|
@ -176,17 +173,16 @@ class TestV1Manager(unittest.TestCase):
|
|||
state='installed'
|
||||
))
|
||||
|
||||
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 to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_v1 = Mock(return_value=True)
|
||||
|
||||
vm = V1Manager(client)
|
||||
vm = V1Manager(module=module)
|
||||
vm.create_on_device = Mock(return_value=True)
|
||||
vm.exists = Mock(return_value=True)
|
||||
vm.install_on_device = Mock(return_value=True)
|
||||
|
@ -204,17 +200,16 @@ class TestV1Manager(unittest.TestCase):
|
|||
state='absent'
|
||||
))
|
||||
|
||||
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 to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_v1 = Mock(return_value=True)
|
||||
|
||||
vm = V1Manager(client)
|
||||
vm = V1Manager(module=module)
|
||||
vm.remove_from_device = Mock(return_value=True)
|
||||
vm.exists = Mock(side_effect=[True, False])
|
||||
|
||||
|
@ -231,17 +226,16 @@ class TestV1Manager(unittest.TestCase):
|
|||
state='absent'
|
||||
))
|
||||
|
||||
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 to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_v1 = Mock(return_value=True)
|
||||
|
||||
vm = V1Manager(client)
|
||||
vm = V1Manager(module=module)
|
||||
vm.remove_from_device = Mock(return_value=True)
|
||||
vm.exists = Mock(side_effect=[True, True])
|
||||
|
||||
|
@ -250,8 +244,6 @@ class TestV1Manager(unittest.TestCase):
|
|||
assert 'Failed to delete' in str(ex.value)
|
||||
|
||||
|
||||
@patch('ansible.module_utils.f5_utils.AnsibleF5Client._get_mgmt_root',
|
||||
return_value=True)
|
||||
class TestV2Manager(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
|
@ -265,17 +257,16 @@ class TestV2Manager(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 to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_v1 = Mock(return_value=False)
|
||||
|
||||
vm = V2Manager(client)
|
||||
vm = V2Manager(module=module)
|
||||
vm.create_on_device = Mock(return_value=True)
|
||||
vm.exists = Mock(side_effect=[False, True])
|
||||
|
||||
|
@ -292,17 +283,16 @@ class TestV2Manager(unittest.TestCase):
|
|||
state='present'
|
||||
))
|
||||
|
||||
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 to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_v1 = Mock(return_value=False)
|
||||
|
||||
vm = V2Manager(client)
|
||||
vm = V2Manager(module=module)
|
||||
vm.create_on_device = Mock(return_value=True)
|
||||
vm.exists = Mock(side_effect=[False, True])
|
||||
|
||||
|
@ -319,17 +309,16 @@ class TestV2Manager(unittest.TestCase):
|
|||
state='installed'
|
||||
))
|
||||
|
||||
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 to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_v1 = Mock(return_value=False)
|
||||
|
||||
vm = V2Manager(client)
|
||||
vm = V2Manager(module=module)
|
||||
vm.create_on_device = Mock(return_value=True)
|
||||
vm.exists = Mock(return_value=True)
|
||||
vm.install_on_device = Mock(return_value=True)
|
||||
|
@ -347,17 +336,16 @@ class TestV2Manager(unittest.TestCase):
|
|||
state='absent'
|
||||
))
|
||||
|
||||
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 to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_v1 = Mock(return_value=False)
|
||||
|
||||
vm = V1Manager(client)
|
||||
vm = V1Manager(module=module)
|
||||
vm.remove_from_device = Mock(return_value=True)
|
||||
vm.exists = Mock(side_effect=[True, False])
|
||||
|
||||
|
@ -374,17 +362,16 @@ class TestV2Manager(unittest.TestCase):
|
|||
state='absent'
|
||||
))
|
||||
|
||||
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 to force specific logic in the module to happen
|
||||
mm = ModuleManager(client)
|
||||
mm = ModuleManager(module=module)
|
||||
mm.is_version_v1 = Mock(return_value=False)
|
||||
|
||||
vm = V1Manager(client)
|
||||
vm = V1Manager(module=module)
|
||||
vm.remove_from_device = Mock(return_value=True)
|
||||
vm.exists = Mock(side_effect=[True, True])
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue