Remove the f5-sdk from as3 module (#48449)

This commit is contained in:
Tim Rupp
2018-11-09 19:40:27 -08:00
committed by GitHub
parent 3a2ab5959d
commit 77d14b36b0
2 changed files with 60 additions and 30 deletions

View File

@@ -8,16 +8,12 @@ __metaclass__ = type
import os
import json
import pytest
import sys
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,17 +21,25 @@ try:
from library.modules.bigip_appsvcs_extension import ModuleParameters
from library.modules.bigip_appsvcs_extension import ModuleManager
from library.modules.bigip_appsvcs_extension 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_appsvcs_extension import ApiParameters
from ansible.modules.network.f5.bigip_appsvcs_extension import ModuleParameters
from ansible.modules.network.f5.bigip_appsvcs_extension import ModuleManager
from ansible.modules.network.f5.bigip_appsvcs_extension 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")
@@ -65,13 +69,13 @@ def load_fixture(name):
class TestParameters(unittest.TestCase):
def test_module_parameters(self):
args = dict(
content='foo',
content='{ "foo": "bar" }',
force=True,
targets=['T1', 'T2']
)
p = ModuleParameters(params=args)
assert p.content == 'foo'
assert 'foo' in p.content
assert p.force is True
assert p.targets == ['T1', 'T2']
@@ -85,7 +89,7 @@ class TestManager(unittest.TestCase):
def test_create(self, *args):
set_module_args(dict(
content='foo',
content='{ "foo": "bar" }',
server='localhost',
user='admin',
password='password'