mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-06 13:22:48 +00:00
Remove f5-sdk from bigip_partition. Fix partition descriptions. (#48522)
This commit is contained in:
@@ -14,25 +14,32 @@ 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:
|
||||
from library.modules.bigip_partition import Parameters
|
||||
from library.modules.bigip_partition import ApiParameters
|
||||
from library.modules.bigip_partition import ModuleParameters
|
||||
from library.modules.bigip_partition import ModuleManager
|
||||
from library.modules.bigip_partition 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_partition import Parameters
|
||||
from ansible.modules.network.f5.bigip_partition import ApiParameters
|
||||
from ansible.modules.network.f5.bigip_partition import ModuleParameters
|
||||
from ansible.modules.network.f5.bigip_partition import ModuleManager
|
||||
from ansible.modules.network.f5.bigip_partition 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")
|
||||
@@ -67,7 +74,7 @@ class TestParameters(unittest.TestCase):
|
||||
route_domain=0
|
||||
)
|
||||
|
||||
p = Parameters(params=args)
|
||||
p = ModuleParameters(params=args)
|
||||
assert p.name == 'foo'
|
||||
assert p.description == 'my description'
|
||||
assert p.route_domain == 0
|
||||
@@ -78,7 +85,7 @@ class TestParameters(unittest.TestCase):
|
||||
route_domain='0'
|
||||
)
|
||||
|
||||
p = Parameters(params=args)
|
||||
p = ModuleParameters(params=args)
|
||||
assert p.name == 'foo'
|
||||
assert p.route_domain == 0
|
||||
|
||||
@@ -89,7 +96,7 @@ class TestParameters(unittest.TestCase):
|
||||
defaultRouteDomain=1
|
||||
)
|
||||
|
||||
p = Parameters(params=args)
|
||||
p = ApiParameters(params=args)
|
||||
assert p.name == 'foo'
|
||||
assert p.description == 'my description'
|
||||
assert p.route_domain == 1
|
||||
@@ -118,6 +125,7 @@ class TestManagerEcho(unittest.TestCase):
|
||||
mm = ModuleManager(module=module)
|
||||
mm.exists = Mock(side_effect=[False, True])
|
||||
mm.create_on_device = Mock(return_value=True)
|
||||
mm.update_folder_on_device = Mock(return_value=True)
|
||||
|
||||
results = mm.exec_module()
|
||||
|
||||
@@ -132,7 +140,8 @@ class TestManagerEcho(unittest.TestCase):
|
||||
user='admin'
|
||||
))
|
||||
|
||||
current = Parameters(params=load_fixture('load_tm_auth_partition.json'))
|
||||
current = ApiParameters(params=load_fixture('load_tm_auth_partition.json'))
|
||||
current.update({'folder_description': 'my description'})
|
||||
module = AnsibleModule(
|
||||
argument_spec=self.spec.argument_spec,
|
||||
supports_check_mode=self.spec.supports_check_mode
|
||||
@@ -156,7 +165,7 @@ class TestManagerEcho(unittest.TestCase):
|
||||
user='admin'
|
||||
))
|
||||
|
||||
current = Parameters(params=load_fixture('load_tm_auth_partition.json'))
|
||||
current = ApiParameters(params=load_fixture('load_tm_auth_partition.json'))
|
||||
module = AnsibleModule(
|
||||
argument_spec=self.spec.argument_spec,
|
||||
supports_check_mode=self.spec.supports_check_mode
|
||||
@@ -167,6 +176,7 @@ class TestManagerEcho(unittest.TestCase):
|
||||
mm.exists = Mock(return_value=True)
|
||||
mm.read_current_from_device = Mock(return_value=current)
|
||||
mm.update_on_device = Mock(return_value=True)
|
||||
mm.update_folder_on_device = Mock(return_value=True)
|
||||
|
||||
results = mm.exec_module()
|
||||
|
||||
@@ -182,7 +192,7 @@ class TestManagerEcho(unittest.TestCase):
|
||||
user='admin'
|
||||
))
|
||||
|
||||
current = Parameters(params=load_fixture('load_tm_auth_partition.json'))
|
||||
current = ApiParameters(params=load_fixture('load_tm_auth_partition.json'))
|
||||
module = AnsibleModule(
|
||||
argument_spec=self.spec.argument_spec,
|
||||
supports_check_mode=self.spec.supports_check_mode
|
||||
|
||||
Reference in New Issue
Block a user