Adds minor fixes and features to f5 modules (#39202)

* Add Mac_address parameter to bigip_traffic_group * Fix docs * Fix f5 conventions
2025-05-21 16:39:08 -07:00 · 2018-04-23 18:57:43 -07:00 · 2018-04-23 18:57:43 -07:00 · e254121729
commit e254121729
parent 0c96863ec6
11 changed files with 156 additions and 69 deletions
--- a/test/sanity/validate-modules/ignore.txt
+++ b/test/sanity/validate-modules/ignore.txt
@ -1166,8 +1166,6 @@ lib/ansible/modules/network/f5/bigip_routedomain.py E326
 lib/ansible/modules/network/f5/bigip_selfip.py E324
 lib/ansible/modules/network/f5/bigip_static_route.py E325
 lib/ansible/modules/network/f5/bigip_sys_global.py E326
-lib/ansible/modules/network/f5/bigip_ucs.py E325
-lib/ansible/modules/network/f5/bigip_ucs.py E326
 lib/ansible/modules/network/f5/bigip_virtual_server.py E326
 lib/ansible/modules/network/f5/bigiq_regkey_license.py E325
 lib/ansible/modules/network/fortimanager/fmgr_script.py E324
--- a/test/units/modules/network/f5/fixtures/load_net_timer_policy_1.json
+++ b/test/units/modules/network/f5/fixtures/load_net_timer_policy_1.json
@ -0,0 +1,9 @@
+{
+    "kind": "tm:net:timer-policy:timer-policystate",
+    "name": "timer1",
+    "partition": "Common",
+    "fullPath": "/Common/timer1",
+    "generation": 148,
+    "selfLink": "https://localhost/mgmt/tm/net/timer-policy/~Common~timer1?ver=13.1.0.4",
+    "description": "my description"
+}
--- a/test/units/modules/network/f5/fixtures/load_tm_cm_traffic_group_1.json
+++ b/test/units/modules/network/f5/fixtures/load_tm_cm_traffic_group_1.json
@ -0,0 +1,16 @@
+{
+    "kind": "tm:cm:traffic-group:traffic-groupstate",
+    "name": "traffic-group-1",
+    "partition": "Common",
+    "fullPath": "/Common/traffic-group-1",
+    "generation": 1,
+    "selfLink": "https://localhost/mgmt/tm/cm/traffic-group/~Common~traffic-group-1?ver=13.0.0",
+    "autoFailbackEnabled": "false",
+    "autoFailbackTime": 60,
+    "failoverMethod": "ha-order",
+    "haLoadFactor": 1,
+    "isFloating": "true",
+    "mac": "none",
+    "monitor": {},
+    "unitId": 1
+}
--- a/test/units/modules/network/f5/fixtures/load_tm_cm_traffic_group_2.json
+++ b/test/units/modules/network/f5/fixtures/load_tm_cm_traffic_group_2.json
@ -0,0 +1,16 @@
+{
+    "kind": "tm:cm:traffic-group:traffic-groupstate",
+    "name": "asd",
+    "partition": "Common",
+    "fullPath": "/Common/asd",
+    "generation": 176,
+    "selfLink": "https://localhost/mgmt/tm/cm/traffic-group/~Common~asd?ver=13.0.0",
+    "autoFailbackEnabled": "false",
+    "autoFailbackTime": 60,
+    "failoverMethod": "ha-order",
+    "haLoadFactor": 1,
+    "isFloating": "true",
+    "mac": "00:00:00:00:00:02",
+    "monitor": {},
+    "unitId": 2
+}
--- a/test/units/modules/network/f5/fixtures/load_tm_net_trunk_1.json
+++ b/test/units/modules/network/f5/fixtures/load_tm_net_trunk_1.json
@ -0,0 +1,29 @@
+{
+    "kind": "tm:net:trunk:trunkstate",
+    "name": "foo",
+    "fullPath": "foo",
+    "generation": 79,
+    "selfLink": "https://localhost/mgmt/tm/net/trunk/foo?ver=13.1.0.4",
+    "bandwidth": 10000,
+    "cfgMbrCount": 1,
+    "distributionHash": "dst-mac",
+    "id": 0,
+    "lacp": "disabled",
+    "lacpMode": "active",
+    "lacpTimeout": "long",
+    "linkSelectPolicy": "maximum-bandwidth",
+    "macAddress": "08:00:27:ea:18:52",
+    "media": "10000",
+    "qinqEthertype": "0x8100",
+    "stp": "enabled",
+    "type": "normal",
+    "workingMbrCount": 1,
+    "interfaces": [
+        "1.3"
+    ],
+    "interfacesReference": [
+        {
+            "link": "https://localhost/mgmt/tm/net/interface/1.3?ver=13.1.0.4"
+        }
+    ]
+}
--- a/test/units/modules/network/f5/test_bigip_traffic_group.py
+++ b/test/units/modules/network/f5/test_bigip_traffic_group.py
@ -21,15 +21,17 @@ from ansible.compat.tests.mock import patch
 from ansible.module_utils.basic import AnsibleModule

 try:
-    from library.bigip_traffic_group import Parameters
-    from library.bigip_traffic_group import ModuleManager
-    from library.bigip_traffic_group import ArgumentSpec
+    from library.modules.bigip_traffic_group import ApiParameters
+    from library.modules.bigip_traffic_group import ModuleParameters
+    from library.modules.bigip_traffic_group import ModuleManager
+    from library.modules.bigip_traffic_group 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_traffic_group import Parameters
+        from ansible.modules.network.f5.bigip_traffic_group import ApiParameters
+        from ansible.modules.network.f5.bigip_traffic_group import ModuleParameters
        from ansible.modules.network.f5.bigip_traffic_group import ModuleManager
        from ansible.modules.network.f5.bigip_traffic_group import ArgumentSpec
        from ansible.module_utils.network.f5.common import F5ModuleError
@ -61,13 +63,35 @@ def load_fixture(name):


 class TestParameters(unittest.TestCase):
-    def test_module_parameters(self):
+    def test_module_parameters_1(self):
        args = dict(
-            name='foo'
+            name='foo',
+            mac_address=''
        )

-        p = Parameters(params=args)
+        p = ModuleParameters(params=args)
        assert p.name == 'foo'
+        assert p.mac_address == 'none'
+
+    def test_module_parameters_2(self):
+        args = dict(
+            mac_address='00:00:00:00:00:02'
+        )
+
+        p = ModuleParameters(params=args)
+        assert p.mac_address == '00:00:00:00:00:02'
+
+    def test_api_parameters_1(self):
+        args = load_fixture('load_tm_cm_traffic_group_1.json')
+
+        p = ApiParameters(params=args)
+        assert p.mac_address == 'none'
+
+    def test_api_parameters_2(self):
+        args = load_fixture('load_tm_cm_traffic_group_2.json')
+
+        p = ApiParameters(params=args)
+        assert p.mac_address == '00:00:00:00:00:02'


 class TestManager(unittest.TestCase):
--- a/test/units/modules/network/f5/test_bigip_ucs.py
+++ b/test/units/modules/network/f5/test_bigip_ucs.py
@ -21,11 +21,11 @@ from ansible.compat.tests.mock import patch
 from ansible.module_utils.basic import AnsibleModule

 try:
-    from library.bigip_ucs import Parameters
-    from library.bigip_ucs import ModuleManager
-    from library.bigip_ucs import ArgumentSpec
-    from library.bigip_ucs import V1Manager
-    from library.bigip_ucs import V2Manager
+    from library.modules.bigip_ucs import Parameters
+    from library.modules.bigip_ucs import ModuleManager
+    from library.modules.bigip_ucs import ArgumentSpec
+    from library.modules.bigip_ucs import V1Manager
+    from library.modules.bigip_ucs import V2Manager
    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_ucs_fetch.py
+++ b/test/units/modules/network/f5/test_bigip_ucs_fetch.py
@ -20,11 +20,11 @@ from ansible.compat.tests.mock import patch
 from ansible.module_utils.basic import AnsibleModule

 try:
-    from library.bigip_ucs_fetch import Parameters
-    from library.bigip_ucs_fetch import ModuleManager
-    from library.bigip_ucs_fetch import V1Manager
-    from library.bigip_ucs_fetch import V2Manager
-    from library.bigip_ucs_fetch import ArgumentSpec
+    from library.modules.bigip_ucs_fetch import Parameters
+    from library.modules.bigip_ucs_fetch import ModuleManager
+    from library.modules.bigip_ucs_fetch import V1Manager
+    from library.modules.bigip_ucs_fetch import V2Manager
+    from library.modules.bigip_ucs_fetch 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