Various fixes to F5 modules (#39255)

* Adds gnat provisioning to bigip_provision * Adds special handling for AFM in bigip_provision * Add device rebooting for provisioning as necessary * Refactored route domain module to be inline with current f5 conventions * Minor refactors across modules
2026-05-06 21:32:49 +00:00 · 2018-04-24 19:49:52 -07:00
parent 39ca41eb1b
commit 256b5535ec
14 changed files with 845 additions and 481 deletions
--- a/test/units/modules/network/f5/fixtures/load_net_route_domain_1.json
+++ b/test/units/modules/network/f5/fixtures/load_net_route_domain_1.json
@@ -0,0 +1,36 @@
+{
+    "kind": "tm:net:route-domain:route-domainstate",
+    "name": "0",
+    "partition": "Common",
+    "fullPath": "/Common/0",
+    "generation": 1,
+    "selfLink": "https://localhost/mgmt/tm/net/route-domain/~Common~0?ver=13.1.0",
+    "connectionLimit": 0,
+    "id": 0,
+    "strict": "enabled",
+    "throughputCapacity": 0,
+    "vlans": [
+        "/Common/net1",
+        "/Common/internal",
+        "/Common/net2",
+        "/Common/socks-tunnel",
+        "/Common/http-tunnel"
+    ],
+    "vlansReference": [
+        {
+            "link": "https://localhost/mgmt/tm/net/vlan/~Common~net1?ver=13.1.0"
+        },
+        {
+            "link": "https://localhost/mgmt/tm/net/vlan/~Common~internal?ver=13.1.0"
+        },
+        {
+            "link": "https://localhost/mgmt/tm/net/vlan/~Common~net2?ver=13.1.0"
+        },
+        {
+            "link": "https://localhost/mgmt/tm/net/tunnels/tunnel/~Common~socks-tunnel?ver=13.1.0"
+        },
+        {
+            "link": "https://localhost/mgmt/tm/net/tunnels/tunnel/~Common~http-tunnel?ver=13.1.0"
+        }
+    ]
+}
--- a/test/units/modules/network/f5/test_bigip_provision.py
+++ b/test/units/modules/network/f5/test_bigip_provision.py
@@ -20,9 +20,9 @@ from ansible.compat.tests.mock import patch
 from ansible.module_utils.basic import AnsibleModule

 try:
-    from library.bigip_provision import Parameters
-    from library.bigip_provision import ModuleManager
-    from library.bigip_provision import ArgumentSpec
+    from library.modules.bigip_provision import Parameters
+    from library.modules.bigip_provision import ModuleManager
+    from library.modules.bigip_provision 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
@@ -107,6 +107,8 @@ class TestManager(unittest.TestCase):
        # Override methods to force specific logic in the module to happen
        mm.update_on_device = Mock(return_value=True)
        mm.read_current_from_device = Mock(return_value=current)
+        mm.reboot_device = Mock(return_value=True)
+        mm.save_on_device = Mock(return_value=True)

        # this forced sleeping can cause these tests to take 15
        # or more seconds to run. This is deliberate.
--- a/test/units/modules/network/f5/test_bigip_qkview.py
+++ b/test/units/modules/network/f5/test_bigip_qkview.py
@@ -20,11 +20,11 @@ from ansible.compat.tests.mock import patch
 from ansible.module_utils.basic import AnsibleModule

 try:
-    from library.bigip_qkview import Parameters
-    from library.bigip_qkview import ModuleManager
-    from library.bigip_qkview import MadmLocationManager
-    from library.bigip_qkview import BulkLocationManager
-    from library.bigip_qkview import ArgumentSpec
+    from library.modules.bigip_qkview import Parameters
+    from library.modules.bigip_qkview import ModuleManager
+    from library.modules.bigip_qkview import MadmLocationManager
+    from library.modules.bigip_qkview import BulkLocationManager
+    from library.modules.bigip_qkview 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
--- a/test/units/modules/network/f5/test_bigip_remote_syslog.py
+++ b/test/units/modules/network/f5/test_bigip_remote_syslog.py
@@ -20,11 +20,11 @@ from ansible.compat.tests.mock import patch
 from ansible.module_utils.basic import AnsibleModule

 try:
-    from library.bigip_remote_syslog import Parameters
-    from library.bigip_remote_syslog import ModuleManager
-    from library.bigip_remote_syslog import ArgumentSpec
-    from library.bigip_remote_syslog import HAS_F5SDK
-    from library.bigip_remote_syslog import HAS_NETADDR
+    from library.modules.bigip_remote_syslog import Parameters
+    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
--- a/test/units/modules/network/f5/test_bigip_routedomain.py
+++ b/test/units/modules/network/f5/test_bigip_routedomain.py
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright: (c) 2017, F5 Networks Inc.
+# GNU General Public License v3.0 (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import (absolute_import, division, print_function)
+__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 ansible.compat.tests import unittest
+from ansible.compat.tests.mock import Mock
+from ansible.compat.tests.mock import patch
+from ansible.module_utils.basic import AnsibleModule
+
+try:
+    from library.modules.bigip_routedomain import ApiParameters
+    from library.modules.bigip_routedomain import ModuleParameters
+    from library.modules.bigip_routedomain import ModuleManager
+    from library.modules.bigip_routedomain 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
+except ImportError:
+    try:
+        from ansible.modules.network.f5.bigip_routedomain import ApiParameters
+        from ansible.modules.network.f5.bigip_routedomain import ModuleParameters
+        from ansible.modules.network.f5.bigip_routedomain import ModuleManager
+        from ansible.modules.network.f5.bigip_routedomain import ArgumentSpec
+        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")
+
+fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
+fixture_data = {}
+
+
+def load_fixture(name):
+    path = os.path.join(fixture_path, name)
+
+    if path in fixture_data:
+        return fixture_data[path]
+
+    with open(path) as f:
+        data = f.read()
+
+    try:
+        data = json.loads(data)
+    except Exception:
+        pass
+
+    fixture_data[path] = data
+    return data
+
+
+class TestParameters(unittest.TestCase):
+    def test_module_parameters(self):
+        args = dict(
+            name='foo',
+            id='1234',
+            description='my description',
+            strict=True,
+            parent='parent1',
+            vlans=['vlan1', 'vlan2'],
+            routing_protocol=['BFD', 'BGP'],
+            bwc_policy='bwc1',
+            connection_limit=200,
+            flow_eviction_policy='evict1',
+            service_policy='service1'
+        )
+
+        p = ModuleParameters(params=args)
+        assert p.name == 'foo'
+        assert p.id == 1234
+        assert p.description == 'my description'
+        assert p.strict is True
+        assert p.connection_limit == 200
+
+    def test_api_parameters(self):
+        args = load_fixture('load_net_route_domain_1.json')
+
+        p = ApiParameters(params=args)
+        assert len(p.vlans) == 5
+        assert p.id == 0
+        assert p.strict is True
+        assert p.connection_limit == 0
+
+
+class TestManager(unittest.TestCase):
+
+    def setUp(self):
+        self.spec = ArgumentSpec()
+
+    def test_create(self, *args):
+        set_module_args(dict(
+            name='foo',
+            id=1234,
+            password='password',
+            server='localhost',
+            user='admin'
+        ))
+
+        module = AnsibleModule(
+            argument_spec=self.spec.argument_spec,
+            supports_check_mode=self.spec.supports_check_mode
+        )
+        mm = ModuleManager(module=module)
+
+        # Override methods to force specific logic in the module to happen
+        mm.exists = Mock(return_value=False)
+        mm.create_on_device = Mock(return_value=True)
+
+        results = mm.exec_module()
+
+        assert results['changed'] is True
+        assert results['id'] == 1234
--- a/test/units/modules/network/f5/test_bigip_security_address_list.py
+++ b/test/units/modules/network/f5/test_bigip_security_address_list.py
@@ -21,16 +21,15 @@ from ansible.compat.tests.mock import patch
 from ansible.module_utils.basic import AnsibleModule

 try:
-    from library.bigip_security_address_list import ApiParameters
-    from library.bigip_security_address_list import ModuleParameters
-    from library.bigip_security_address_list import ModuleManager
-    from library.bigip_security_address_list import ArgumentSpec
+    from library.modules.bigip_security_address_list import ApiParameters
+    from library.modules.bigip_security_address_list import ModuleParameters
+    from library.modules.bigip_security_address_list import ModuleManager
+    from library.modules.bigip_security_address_list 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
 except ImportError:
    try:
-        from ansible.modules.network.f5.bigip_security_address_list import Parameters
        from ansible.modules.network.f5.bigip_security_address_list import ApiParameters
        from ansible.modules.network.f5.bigip_security_address_list import ModuleParameters
        from ansible.modules.network.f5.bigip_security_address_list import ModuleManager
--- a/test/units/modules/network/f5/test_bigip_security_port_list.py
+++ b/test/units/modules/network/f5/test_bigip_security_port_list.py
@@ -21,16 +21,15 @@ from ansible.compat.tests.mock import patch
 from ansible.module_utils.basic import AnsibleModule

 try:
-    from library.bigip_security_port_list import ApiParameters
-    from library.bigip_security_port_list import ModuleParameters
-    from library.bigip_security_port_list import ModuleManager
-    from library.bigip_security_port_list import ArgumentSpec
+    from library.modules.bigip_security_port_list import ApiParameters
+    from library.modules.bigip_security_port_list import ModuleParameters
+    from library.modules.bigip_security_port_list import ModuleManager
+    from library.modules.bigip_security_port_list 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
 except ImportError:
    try:
-        from ansible.modules.network.f5.bigip_security_port_list import Parameters
        from ansible.modules.network.f5.bigip_security_port_list import ApiParameters
        from ansible.modules.network.f5.bigip_security_port_list import ModuleParameters
        from ansible.modules.network.f5.bigip_security_port_list import ModuleManager