Change port to allow strings too (#48899)

The port technically supports an asterisk, but the argument spec was
requiring integers only.

lib/ansible/modules/network/f5/bigip_gtm_monitor_bigip.py

@@ -614,7 +614,7 @@ class ArgumentSpec(object):
             name=dict(required=True),
             parent=dict(default='/Common/bigip'),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             ignore_down_response=dict(type='bool'),

lib/ansible/modules/network/f5/bigip_gtm_monitor_external.py

@@ -659,7 +659,7 @@ class ArgumentSpec(object):
             parent=dict(default='/Common/external'),
             arguments=dict(),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             external_program=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),

lib/ansible/modules/network/f5/bigip_gtm_monitor_firepass.py

@@ -733,7 +733,7 @@ class ArgumentSpec(object):
             name=dict(required=True),
             parent=dict(default='/Common/firepass_gtm'),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             ignore_down_response=dict(type='bool'),

lib/ansible/modules/network/f5/bigip_gtm_monitor_http.py

@@ -779,7 +779,7 @@ class ArgumentSpec(object):
             send=dict(),
             receive=dict(),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             ignore_down_response=dict(type='bool'),

lib/ansible/modules/network/f5/bigip_gtm_monitor_https.py

@@ -895,7 +895,7 @@ class ArgumentSpec(object):
             send=dict(),
             receive=dict(),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             ignore_down_response=dict(type='bool'),

lib/ansible/modules/network/f5/bigip_gtm_monitor_tcp.py

@@ -747,7 +747,7 @@ class ArgumentSpec(object):
             send=dict(),
             receive=dict(),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             ignore_down_response=dict(type='bool'),

lib/ansible/modules/network/f5/bigip_gtm_monitor_tcp_half_open.py

@@ -654,7 +654,7 @@ class ArgumentSpec(object):
             name=dict(required=True),
             parent=dict(default='/Common/tcp_half_open'),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             probe_interval=dict(type='int'),

lib/ansible/modules/network/f5/bigip_monitor_dns.py

@@ -960,7 +960,7 @@ class ArgumentSpec(object):
             receive=dict(),
             ip=dict(),
             description=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             manual_resume=dict(type='bool'),

lib/ansible/modules/network/f5/bigip_monitor_external.py

@@ -696,7 +696,7 @@ class ArgumentSpec(object):
             description=dict(),
             arguments=dict(),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             external_program=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),

lib/ansible/modules/network/f5/bigip_monitor_http.py

@@ -698,7 +698,7 @@ class ArgumentSpec(object):
             receive=dict(),
             receive_disable=dict(required=False),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             reverse=dict(type='bool'),
             timeout=dict(type='int'),

lib/ansible/modules/network/f5/bigip_monitor_https.py

@@ -56,7 +56,7 @@ options:
       - Port address part of the IP/port definition. If this parameter is not
         provided when creating a new monitor, then the default value will be
         '*'. Note that if specifying an IP address, a value between 1 and 65535
-        must be specified
+        must be specified.
   interval:
     description:
       - The interval specifying how frequently the monitor instance of this
@@ -667,7 +667,7 @@ class ArgumentSpec(object):
             receive=dict(),
             receive_disable=dict(required=False),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             time_until_up=dict(type='int'),

lib/ansible/modules/network/f5/bigip_monitor_ldap.py

@@ -756,7 +756,7 @@ class ArgumentSpec(object):
             parent=dict(default='/Common/ldap'),
             ip=dict(),
             description=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             target_username=dict(),

lib/ansible/modules/network/f5/bigip_monitor_tcp.py

@@ -621,7 +621,7 @@ class ArgumentSpec(object):
             send=dict(),
             receive=dict(),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             time_until_up=dict(type='int'),

lib/ansible/modules/network/f5/bigip_monitor_tcp_echo.py

@@ -38,8 +38,6 @@ options:
       - IP address part of the IP/port definition. If this parameter is not
         provided when creating a new monitor, then the default value will be
         '*'.
-      - If this value is an IP address, and the C(type) is C(tcp) (the default),
-        then a C(port) number must be specified.
   interval:
     description:
       - The interval specifying how frequently the monitor instance of this

lib/ansible/modules/network/f5/bigip_monitor_tcp_half_open.py

@@ -606,7 +606,7 @@ class ArgumentSpec(object):
             parent=dict(default='/Common/tcp_half_open'),
             description=dict(),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             time_until_up=dict(type='int'),

lib/ansible/modules/network/f5/bigip_monitor_udp.py

@@ -616,7 +616,7 @@ class ArgumentSpec(object):
             receive=dict(),
             receive_disable=dict(required=False),
             ip=dict(),
-            port=dict(type='int'),
+            port=dict(),
             interval=dict(type='int'),
             timeout=dict(type='int'),
             time_until_up=dict(type='int'),

test/units/modules/network/f5/test_bigip_gtm_monitor_bigip.py

@@ -29,7 +29,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ApiParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ModuleParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ModuleManager
@@ -41,8 +40,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_gtm_monitor_external.py

@@ -29,7 +29,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_gtm_monitor_external import ApiParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_external import ModuleParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_external import ModuleManager
@@ -41,8 +40,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_gtm_monitor_firepass.py

@@ -29,7 +29,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ApiParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ModuleParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ModuleManager
@@ -41,8 +40,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_gtm_monitor_http.py

@@ -29,7 +29,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_gtm_monitor_http import ApiParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_http import ModuleParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_http import ModuleManager
@@ -41,8 +40,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_gtm_monitor_https.py

@@ -29,7 +29,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_gtm_monitor_https import ApiParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_https import ModuleParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_https import ModuleManager
@@ -41,8 +40,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_gtm_monitor_tcp.py

@@ -29,7 +29,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ApiParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ModuleParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ModuleManager
@@ -41,8 +40,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_gtm_monitor_tcp_half_open.py

@@ -29,7 +29,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ApiParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ModuleParameters
     from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ModuleManager
@@ -41,8 +40,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_monitor_dns.py

@@ -29,7 +29,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_monitor_dns import ApiParameters
     from ansible.modules.network.f5.bigip_monitor_dns import ModuleParameters
     from ansible.modules.network.f5.bigip_monitor_dns import ModuleManager
@@ -41,8 +40,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_monitor_external.py

@@ -29,7 +29,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_monitor_external import ApiParameters
     from ansible.modules.network.f5.bigip_monitor_external import ModuleParameters
     from ansible.modules.network.f5.bigip_monitor_external import ModuleManager
@@ -41,8 +40,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}
@@ -89,8 +87,6 @@ class TestParameters(unittest.TestCase):
         assert p.timeout == 30
 
 
-@patch('ansible.module_utils.f5_utils.AnsibleF5Client._get_mgmt_root',
-       return_value=True)
 class TestManager(unittest.TestCase):
 
     def setUp(self):

test/units/modules/network/f5/test_bigip_monitor_http.py

@@ -31,7 +31,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_monitor_http import Parameters
     from ansible.modules.network.f5.bigip_monitor_http import ModuleManager
     from ansible.modules.network.f5.bigip_monitor_http import ArgumentSpec
@@ -44,8 +43,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_monitor_https.py

@@ -31,7 +31,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_monitor_https import Parameters
     from ansible.modules.network.f5.bigip_monitor_https import ModuleManager
     from ansible.modules.network.f5.bigip_monitor_https import ArgumentSpec
@@ -44,8 +43,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_monitor_ldap.py

@@ -29,7 +29,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_monitor_ldap import ApiParameters
     from ansible.modules.network.f5.bigip_monitor_ldap import ModuleParameters
     from ansible.modules.network.f5.bigip_monitor_ldap import ModuleManager
@@ -41,8 +40,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_monitor_snmp_dca.py

@@ -28,7 +28,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_monitor_snmp_dca import Parameters
     from ansible.modules.network.f5.bigip_monitor_snmp_dca import ModuleManager
     from ansible.modules.network.f5.bigip_monitor_snmp_dca import ArgumentSpec
@@ -39,8 +38,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_monitor_tcp.py

@@ -31,7 +31,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_monitor_tcp import Parameters
     from ansible.modules.network.f5.bigip_monitor_tcp import ModuleManager
     from ansible.modules.network.f5.bigip_monitor_tcp import ArgumentSpec
@@ -44,8 +43,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_monitor_tcp_echo.py

@@ -31,7 +31,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_monitor_tcp_echo import Parameters
     from ansible.modules.network.f5.bigip_monitor_tcp_echo import ModuleManager
     from ansible.modules.network.f5.bigip_monitor_tcp_echo import ArgumentSpec
@@ -44,8 +43,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_monitor_tcp_half_open.py

@@ -31,7 +31,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_monitor_tcp_half_open import Parameters
     from ansible.modules.network.f5.bigip_monitor_tcp_half_open import ModuleManager
     from ansible.modules.network.f5.bigip_monitor_tcp_half_open import ArgumentSpec
@@ -44,8 +43,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}

test/units/modules/network/f5/test_bigip_monitor_udp.py

@@ -31,7 +31,6 @@ try:
 
     from test.units.modules.utils import set_module_args
 except ImportError:
-    try:
     from ansible.modules.network.f5.bigip_monitor_udp import Parameters
     from ansible.modules.network.f5.bigip_monitor_udp import ModuleManager
     from ansible.modules.network.f5.bigip_monitor_udp import ArgumentSpec
@@ -44,8 +43,7 @@ except ImportError:
     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")
 
 fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
 fixture_data = {}