Fix modules' use of BOOLEANS*

* The canonical location of BOOLEANS has moved.  Switch imports to use that.
* clean up argument_spec use of booleans.
* Clean up imports to not use wildcards
* Remove usage of get_exception

lib/ansible/modules/network/cumulus/_cl_bond.py

@@ -216,6 +216,12 @@ msg:
     sample: "interface bond0 config updated"
 '''
 
+import os
+import re
+import tempfile
+
+from ansible.module_utils.basic import AnsibleModule
+
 
 # handy helper for calling system calls.
 # calls AnsibleModule.run_command and prints a more appropriate message
@@ -437,9 +443,9 @@ def main():
             virtual_mac=dict(type='str'),
             vids=dict(type='list'),
             pvid=dict(type='str'),
-            mstpctl_portnetwork=dict(type='bool', choices=BOOLEANS),
-            mstpctl_portadminedge=dict(type='bool', choices=BOOLEANS),
-            mstpctl_bpduguard=dict(type='bool', choices=BOOLEANS),
+            mstpctl_portnetwork=dict(type='bool'),
+            mstpctl_portadminedge=dict(type='bool'),
+            mstpctl_bpduguard=dict(type='bool'),
             clag_id=dict(type='str'),
             min_links=dict(type='int', default=1),
             mode=dict(type='str', default='802.3ad'),
@@ -484,11 +490,6 @@ def main():
 
     module.exit_json(changed=_changed, msg=_msg)
 
-# import module snippets
-from ansible.module_utils.basic import *
-import tempfile
-import os
-import re
 
 if __name__ == '__main__':
     main()

lib/ansible/modules/network/cumulus/_cl_bridge.py

@@ -164,6 +164,12 @@ msg:
     sample: "interface bond0 config updated"
 '''
 
+import os
+import re
+import tempfile
+
+from ansible.module_utils.basic import AnsibleModule
+
 
 # handy helper for calling system calls.
 # calls AnsibleModule.run_command and prints a more appropriate message
@@ -373,8 +379,8 @@ def main():
             vids=dict(type='list'),
             pvid=dict(type='str'),
             mstpctl_treeprio=dict(type='str'),
-            vlan_aware=dict(type='bool', choices=BOOLEANS),
-            stp=dict(type='bool', default='yes', choices=BOOLEANS),
+            vlan_aware=dict(type='bool'),
+            stp=dict(type='bool', default='yes'),
             location=dict(type='str',
                           default='/etc/network/interfaces.d')
         ),
@@ -410,11 +416,6 @@ def main():
 
     module.exit_json(changed=_changed, msg=_msg)
 
-# import module snippets
-from ansible.module_utils.basic import *
-import tempfile
-import os
-import re
 
 if __name__ == '__main__':
     main()

lib/ansible/modules/network/cumulus/_cl_img_install.py

@@ -110,6 +110,14 @@ msg:
     sample: "interface bond0 config updated"
 '''
 
+import re
+from urlparse import urlparse
+
+# import module snippets
+from ansible.module_utils.basic import AnsibleModule, platform
+# incompatible with ansible 1.4.4 - ubuntu 12.04 version
+# from ansible.module_utils.urls import *
+
 
 def check_url(module, url):
     parsed_url = urlparse(url)
@@ -124,8 +132,7 @@ def check_url(module, url):
 def run_cl_cmd(module, cmd, check_rc=True):
     try:
         (rc, out, err) = module.run_command(cmd, check_rc=check_rc)
-    except Exception:
-        e = get_exception()
+    except Exception as e:
         module.fail_json(msg=e.strerror)
     # trim last line as it is always empty
     ret = out.splitlines()
@@ -301,7 +308,7 @@ def main():
         argument_spec=dict(
             src=dict(required=True, type='str'),
             version=dict(type='str'),
-            switch_slot=dict(type='bool', choices=BOOLEANS, default=False),
+            switch_slot=dict(type='bool', default=False),
         ),
     )
 
@@ -315,12 +322,5 @@ def main():
     install_img(module)
 
 
-# import module snippets
-from ansible.module_utils.basic import *
-# incompatible with ansible 1.4.4 - ubuntu 12.04 version
-# from ansible.module_utils.urls import *
-from urlparse import urlparse
-import re
-
 if __name__ == '__main__':
     main()

lib/ansible/modules/network/cumulus/_cl_interface.py

@@ -209,6 +209,13 @@ msg:
     sample: "interface bond0 config updated"
 '''
 
+import os
+import platform
+import re
+import tempfile
+
+from ansible.module_utils.basic import AnsibleModule
+
 
 # handy helper for calling system calls.
 # calls AnsibleModule.run_command and prints a more appropriate message
@@ -401,10 +408,10 @@ def main():
             virtual_mac=dict(type='str'),
             vids=dict(type='list'),
             pvid=dict(type='str'),
-            mstpctl_portnetwork=dict(type='bool', choices=BOOLEANS),
-            mstpctl_portadminedge=dict(type='bool', choices=BOOLEANS),
-            mstpctl_bpduguard=dict(type='bool', choices=BOOLEANS),
-            clagd_enable=dict(type='bool', choices=BOOLEANS),
+            mstpctl_portnetwork=dict(type='bool'),
+            mstpctl_portadminedge=dict(type='bool'),
+            mstpctl_bpduguard=dict(type='bool'),
+            clagd_enable=dict(type='bool'),
             clagd_priority=dict(type='str'),
             clagd_peer_ip=dict(type='str'),
             clagd_sys_mac=dict(type='str'),
@@ -446,10 +453,6 @@ def main():
 
     module.exit_json(changed=_changed, msg=_msg)
 
-# import module snippets
-from ansible.module_utils.basic import *
-import tempfile
-import os
 
 if __name__ == '__main__':
     main()

lib/ansible/modules/network/cumulus/_cl_license.py

@@ -107,6 +107,9 @@ msg:
     sample: "interface bond0 config updated"
 '''
 
+# import module snippets
+from ansible.module_utils.basic import AnsibleModule
+
 CL_LICENSE_PATH='/usr/cumulus/bin/cl-license'
 
 def install_license(module):
@@ -121,8 +124,7 @@ def main():
     module = AnsibleModule(
         argument_spec=dict(
             src=dict(required=True, type='str'),
-            force=dict(type='bool', choices=BOOLEANS,
-                default=False)
+            force=dict(type='bool', default=False)
         ),
     )
 
@@ -142,9 +144,5 @@ def main():
     module.exit_json(changed=module.changed, msg=module.msg)
 
 
-# import module snippets
-from ansible.module_utils.basic import *
-# from ansible.module_utils.urls import *
-
 if __name__ == '__main__':
     main()

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

@@ -146,7 +146,6 @@ from ansible.module_utils.f5_utils import (
     iteritems,
     defaultdict
 )
-from ansible.module_utils.basic import BOOLEANS
 
 
 class Parameters(AnsibleF5Parameters):

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

@@ -118,6 +118,10 @@ try:
 except ImportError:
     HAS_F5SDK = False
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.ec2 import camel_dict_to_snake_dict
+from ansible.module_utils.f5_utils import F5ModuleError, f5_argument_spec
+
 
 class BigIpGtmDatacenter(object):
     def __init__(self, *args, **kwargs):
@@ -346,7 +350,7 @@ def main():
     meta_args = dict(
         contact=dict(required=False, default=None),
         description=dict(required=False, default=None),
-        enabled=dict(required=False, type='bool', default=None, choices=BOOLEANS),
+        enabled=dict(required=False, type='bool', default=None),
         location=dict(required=False, default=None),
         name=dict(required=True)
     )
@@ -365,9 +369,6 @@ def main():
     except F5ModuleError as e:
         module.fail_json(msg=str(e))
 
-from ansible.module_utils.basic import *
-from ansible.module_utils.ec2 import camel_dict_to_snake_dict
-from ansible.module_utils.f5_utils import *
 
 if __name__ == '__main__':
     main()

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

@@ -118,7 +118,15 @@ RETURN = '''
 import re
 import uuid
 
-from ansible.module_utils.basic import BOOLEANS
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
+
+from f5.utils.iapp_parser import (
+    NonextantTemplateNameException
+)
+
 from ansible.module_utils.f5_utils import (
     AnsibleF5Client,
     AnsibleF5Parameters,
@@ -128,14 +136,6 @@ from ansible.module_utils.f5_utils import (
     defaultdict,
     iControlUnexpectedHTTPError
 )
-from f5.utils.iapp_parser import (
-    NonextantTemplateNameException
-)
-
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
 
 
 class Parameters(AnsibleF5Parameters):
@@ -453,7 +453,6 @@ class ArgumentSpec(object):
                 choices=['present', 'absent']
             ),
             force=dict(
-                choices=BOOLEANS,
                 type='bool'
             ),
             content=dict()

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

@@ -138,6 +138,10 @@ try:
 except ImportError:
     HAS_NETADDR = False
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.ec2 import camel_dict_to_snake_dict
+from ansible.module_utils.f5_utils import F5ModuleError, f5_argument_spec
+
 
 class BigIpSnatPoolManager(object):
     def __init__(self, *args, **kwargs):
@@ -363,7 +367,6 @@ class BigIpSnatPoolModuleConfig(object):
             append=dict(
                 default=False,
                 type='bool',
-                choices=BOOLEANS
             ),
             name=dict(required=True),
             members=dict(
@@ -410,9 +413,6 @@ def main():
     except F5ModuleError as e:
         module.fail_json(msg=str(e))
 
-from ansible.module_utils.basic import *
-from ansible.module_utils.ec2 import camel_dict_to_snake_dict
-from ansible.module_utils.f5_utils import *
 
 if __name__ == '__main__':
     main()

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

@@ -196,8 +196,6 @@ try:
 except ImportError:
     HAS_NETADDR = False
 
-from ansible.module_utils.basic import BOOLEANS_TRUE
-from ansible.module_utils.basic import BOOLEANS_FALSE
 from ansible.module_utils.f5_utils import (
     AnsibleF5Client,
     AnsibleF5Parameters,
@@ -205,6 +203,7 @@ from ansible.module_utils.f5_utils import (
     F5ModuleError,
     iControlUnexpectedHTTPError
 )
+from ansible.module_utils.parsing.convert_bool import BOOLEANS_FALSE, BOOLEANS_TRUE
 
 
 class Parameters(AnsibleF5Parameters):

lib/ansible/modules/network/illumos/dladm_linkprop.py

@@ -231,7 +231,7 @@ def main():
             link=dict(required=True, default=None, type='str', aliases=['nic', 'interface']),
             property=dict(required=True, type='str', aliases=['name']),
             value=dict(required=False, type='str'),
-            temporary=dict(default=False, type='bool', choices=BOOLEANS),
+            temporary=dict(default=False, type='bool'),
             state=dict(
                 default='present', choices=['absent', 'present', 'reset']),
         ),
@@ -298,6 +298,5 @@ def main():
     module.exit_json(**result)
 
 
-
 if __name__ == '__main__':
     main()