Remove the f5-sdk from bigip_remote_syslog (#48539)

This commit is contained in:
Tim Rupp 2018-11-16 15:13:08 -08:00 committed by GitHub
parent 5271f771f0
commit 9af5724bd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 336 additions and 271 deletions

View file

@ -29,7 +29,7 @@
"remotePort": 514
},
{
"name": "/Common/remotesyslog1",
"name": "/Common/remotesyslog2",
"host": "20.20.20.20",
"localIp": "1.1.1.1",
"remotePort": 8000

View file

@ -0,0 +1,38 @@
{
"kind": "tm:sys:syslog:syslogstate",
"selfLink": "https://localhost/mgmt/tm/sys/syslog?ver=13.0.0",
"authPrivFrom": "notice",
"authPrivTo": "emerg",
"clusteredHostSlot": "enabled",
"clusteredMessageSlot": "disabled",
"consoleLog": "enabled",
"cronFrom": "warning",
"cronTo": "emerg",
"daemonFrom": "notice",
"daemonTo": "emerg",
"isoDate": "disabled",
"kernFrom": "debug",
"kernTo": "emerg",
"local6From": "notice",
"local6To": "emerg",
"mailFrom": "notice",
"mailTo": "emerg",
"messagesFrom": "notice",
"messagesTo": "warning",
"userLogFrom": "notice",
"userLogTo": "emerg",
"remoteServers": [
{
"name": "/Common/remotesyslog1",
"host": "10.10.10.10",
"localIp": "none",
"remotePort": 514
},
{
"name": "/Common/remotesyslog2",
"host": "10.10.10.10",
"localIp": "1.1.1.1",
"remotePort": 8000
}
]
}

View file

@ -9,41 +9,43 @@ __metaclass__ = type
import os
import json
import sys
import pytest
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_remote_syslog import Parameters
from library.modules.bigip_remote_syslog import ApiParameters
from library.modules.bigip_remote_syslog import ModuleParameters
from library.modules.bigip_remote_syslog import ModuleManager
from library.modules.bigip_remote_syslog import ArgumentSpec
from library.modules.bigip_remote_syslog import HAS_F5SDK
from library.modules.bigip_remote_syslog import HAS_NETADDR
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:
from ansible.modules.network.f5.bigip_remote_syslog import Parameters
from ansible.modules.network.f5.bigip_remote_syslog import ModuleManager
from ansible.modules.network.f5.bigip_remote_syslog import ArgumentSpec
from ansible.modules.network.f5.bigip_remote_syslog import HAS_F5SDK
from ansible.modules.network.f5.bigip_remote_syslog import HAS_NETADDR
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")
from ansible.modules.network.f5.bigip_remote_syslog import HAS_NETADDR
if not HAS_NETADDR:
raise SkipTest("F5 Ansible modules require the netaddr Python library")
from library.module_utils.network.f5.common import F5ModuleError
# 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:
from ansible.modules.network.f5.bigip_remote_syslog import ApiParameters
from ansible.modules.network.f5.bigip_remote_syslog import ModuleParameters
from ansible.modules.network.f5.bigip_remote_syslog import ModuleManager
from ansible.modules.network.f5.bigip_remote_syslog import ArgumentSpec
from ansible.module_utils.network.f5.common import F5ModuleError
# 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
fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_data = {}
@ -75,26 +77,11 @@ class TestParameters(unittest.TestCase):
local_ip='1.1.1.1'
)
p = Parameters(params=args)
p = ModuleParameters(params=args)
assert p.remote_host == '10.10.10.10'
assert p.remote_port == 514
assert p.local_ip == '1.1.1.1'
def test_api_parameters(self):
args = dict(
remoteServers=[
dict(
name='/Common/remotesyslog1',
host='10.10.10.10',
localIp='none',
remotePort=514
)
]
)
p = Parameters(params=args)
assert len(p.remoteServers) == 1
class TestManager(unittest.TestCase):
@ -103,12 +90,15 @@ class TestManager(unittest.TestCase):
def test_create_remote_syslog(self, *args):
set_module_args(dict(
remote_host='10.10.10.10',
remote_host='1.1.1.1',
server='localhost',
password='password',
user='admin'
))
fixture = load_fixture('load_tm_sys_syslog_1.json')
current = fixture['remoteServers']
module = AnsibleModule(
argument_spec=self.spec.argument_spec,
supports_check_mode=self.spec.supports_check_mode
@ -118,6 +108,7 @@ class TestManager(unittest.TestCase):
mm = ModuleManager(module=module)
mm.exists = Mock(side_effect=[False, True])
mm.update_on_device = Mock(return_value=True)
mm.read_current_from_device = Mock(return_value=current)
results = mm.exec_module()
@ -125,13 +116,16 @@ class TestManager(unittest.TestCase):
def test_create_remote_syslog_idempotent(self, *args):
set_module_args(dict(
name='remotesyslog1',
remote_host='10.10.10.10',
server='localhost',
password='password',
user='admin'
))
current = Parameters(params=load_fixture('load_tm_sys_syslog.json'))
fixture = load_fixture('load_tm_sys_syslog_1.json')
current = fixture['remoteServers']
module = AnsibleModule(
argument_spec=self.spec.argument_spec,
supports_check_mode=self.spec.supports_check_mode
@ -155,7 +149,9 @@ class TestManager(unittest.TestCase):
user='admin'
))
current = Parameters(params=load_fixture('load_tm_sys_syslog.json'))
fixture = load_fixture('load_tm_sys_syslog_1.json')
current = fixture['remoteServers']
module = AnsibleModule(
argument_spec=self.spec.argument_spec,
supports_check_mode=self.spec.supports_check_mode
@ -181,7 +177,9 @@ class TestManager(unittest.TestCase):
user='admin'
))
current = Parameters(params=load_fixture('load_tm_sys_syslog.json'))
fixture = load_fixture('load_tm_sys_syslog_1.json')
current = fixture['remoteServers']
module = AnsibleModule(
argument_spec=self.spec.argument_spec,
supports_check_mode=self.spec.supports_check_mode
@ -197,3 +195,31 @@ class TestManager(unittest.TestCase):
assert results['changed'] is True
assert results['local_ip'] == '2.2.2.2'
def test_update_no_name_dupe_host(self, *args):
set_module_args(dict(
remote_host='10.10.10.10',
local_ip='2.2.2.2',
server='localhost',
password='password',
user='admin'
))
fixture = load_fixture('load_tm_sys_syslog_2.json')
current = fixture['remoteServers']
module = AnsibleModule(
argument_spec=self.spec.argument_spec,
supports_check_mode=self.spec.supports_check_mode
)
# Override methods in the specific type of manager
mm = ModuleManager(module=module)
mm.exists = Mock(return_value=True)
mm.read_current_from_device = Mock(return_value=current)
mm.update_on_device = Mock(return_value=True)
with pytest.raises(F5ModuleError) as ex:
mm.exec_module()
assert "Multiple occurrences of hostname" in str(ex)