Refactors device group (#44599)

Make module use patterns that other modules use
This commit is contained in:
Tim Rupp
2018-08-24 13:58:12 -04:00
committed by GitHub
parent 9db3e597f3
commit 639cfe3b6f
2 changed files with 202 additions and 82 deletions

View File

@@ -20,7 +20,8 @@ from ansible.compat.tests.mock import patch
from ansible.module_utils.basic import AnsibleModule
try:
from library.modules.bigip_device_group import Parameters
from library.modules.bigip_device_group import ApiParameters
from library.modules.bigip_device_group import ModuleParameters
from library.modules.bigip_device_group import ModuleManager
from library.modules.bigip_device_group import ArgumentSpec
from library.module_utils.network.f5.common import F5ModuleError
@@ -28,7 +29,8 @@ try:
from test.unit.modules.utils import set_module_args
except ImportError:
try:
from ansible.modules.network.f5.bigip_device_group import Parameters
from ansible.modules.network.f5.bigip_device_group import ApiParameters
from ansible.modules.network.f5.bigip_device_group import ModuleParameters
from ansible.modules.network.f5.bigip_device_group import ModuleManager
from ansible.modules.network.f5.bigip_device_group import ArgumentSpec
from ansible.module_utils.network.f5.common import F5ModuleError
@@ -69,12 +71,12 @@ class TestParameters(unittest.TestCase):
auto_sync=True
)
p = Parameters(params=args)
p = ModuleParameters(params=args)
assert p.save_on_auto_sync is True
assert p.full_sync is False
assert p.description == "my description"
assert p.type == "sync-failover"
assert p.auto_sync == 'enabled'
assert p.auto_sync is True
def test_api_parameters(self):
args = dict(
@@ -87,8 +89,8 @@ class TestParameters(unittest.TestCase):
type="sync-only"
)
p = Parameters(params=args)
assert p.auto_sync == 'enabled'
p = ApiParameters(params=args)
assert p.auto_sync is True
assert p.full_sync is False
assert p.max_incremental_sync_size == 1024
assert p.save_on_auto_sync is False
@@ -136,7 +138,7 @@ class TestModuleManager(unittest.TestCase):
)
)
current = Parameters(params=load_fixture('load_tm_cm_device_group.json'))
current = ApiParameters(params=load_fixture('load_tm_cm_device_group.json'))
module = AnsibleModule(
argument_spec=self.spec.argument_spec,
supports_check_mode=self.spec.supports_check_mode