mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-06 21:32:49 +00:00
Remove f5-sdk from bigip_iapp_service module (#48511)
This commit is contained in:
@@ -14,9 +14,6 @@ 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:
|
||||
@@ -25,9 +22,13 @@ try:
|
||||
from library.modules.bigip_iapp_service import ModuleParameters
|
||||
from library.modules.bigip_iapp_service import ModuleManager
|
||||
from library.modules.bigip_iapp_service 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_iapp_service import Parameters
|
||||
@@ -35,8 +36,12 @@ except ImportError:
|
||||
from ansible.modules.network.f5.bigip_iapp_service import ModuleParameters
|
||||
from ansible.modules.network.f5.bigip_iapp_service import ModuleManager
|
||||
from ansible.modules.network.f5.bigip_iapp_service 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")
|
||||
@@ -80,7 +85,7 @@ class TestParameters(unittest.TestCase):
|
||||
|
||||
def test_module_parameters_lists(self):
|
||||
args = load_fixture('create_iapp_service_parameters_f5_http.json')
|
||||
p = Parameters(params=args)
|
||||
p = ModuleParameters(params=args)
|
||||
|
||||
assert 'lists' in p._values
|
||||
|
||||
@@ -96,7 +101,7 @@ class TestParameters(unittest.TestCase):
|
||||
|
||||
def test_module_parameters_tables(self):
|
||||
args = load_fixture('create_iapp_service_parameters_f5_http.json')
|
||||
p = Parameters(params=args)
|
||||
p = ModuleParameters(params=args)
|
||||
|
||||
assert 'tables' in p._values
|
||||
|
||||
@@ -195,13 +200,13 @@ class TestParameters(unittest.TestCase):
|
||||
args = dict(
|
||||
strictUpdates='enabled'
|
||||
)
|
||||
p = Parameters(params=args)
|
||||
p = ApiParameters(params=args)
|
||||
assert p.strict_updates == 'enabled'
|
||||
|
||||
args = dict(
|
||||
strictUpdates='disabled'
|
||||
)
|
||||
p = Parameters(params=args)
|
||||
p = ApiParameters(params=args)
|
||||
assert p.strict_updates == 'disabled'
|
||||
|
||||
def test_api_parameters_variables(self):
|
||||
@@ -214,7 +219,7 @@ class TestParameters(unittest.TestCase):
|
||||
)
|
||||
]
|
||||
)
|
||||
p = Parameters(params=args)
|
||||
p = ApiParameters(params=args)
|
||||
assert p.variables[0]['name'] == 'client__http_compression'
|
||||
|
||||
def test_api_parameters_tables(self):
|
||||
@@ -266,21 +271,21 @@ class TestParameters(unittest.TestCase):
|
||||
args = dict(
|
||||
inheritedTrafficGroup='true'
|
||||
)
|
||||
p = Parameters(params=args)
|
||||
p = ApiParameters(params=args)
|
||||
assert p.inheritedTrafficGroup == 'true'
|
||||
|
||||
def test_api_parameters_inherited_devicegroup(self):
|
||||
args = dict(
|
||||
inheritedDevicegroup='true'
|
||||
)
|
||||
p = Parameters(params=args)
|
||||
p = ApiParameters(params=args)
|
||||
assert p.inheritedDevicegroup == 'true'
|
||||
|
||||
def test_api_parameters_traffic_group(self):
|
||||
args = dict(
|
||||
trafficGroup='/Common/traffic-group-local-only'
|
||||
)
|
||||
p = Parameters(params=args)
|
||||
p = ApiParameters(params=args)
|
||||
assert p.traffic_group == '/Common/traffic-group-local-only'
|
||||
|
||||
def test_module_template_same_partition(self):
|
||||
|
||||
Reference in New Issue
Block a user