Fix undefined variables, basestring usage, and some associated python3 issues

lib/ansible/modules/network/aos/aos_device.py

@@ -101,7 +101,11 @@ value:
 '''
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.aos import get_aos_session, check_aos_version, find_collection_item
+from ansible.module_utils.aos import HAS_AOS_PYEZ, get_aos_session, check_aos_version, find_collection_item
+
+if HAS_AOS_PYEZ:
+    from apstra.aosom.exc import SessionError, SessionRqstError
+
 
 def aos_device_normal(module, aos, dev):
 

lib/ansible/modules/network/asa/asa_command.py

@@ -133,9 +133,12 @@ failed_conditions:
   type: list
   sample: ['...', '...']
 """
+import time
+
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.asa import asa_argument_spec, check_args
 from ansible.module_utils.asa import run_commands
+from ansible.module_utils.netcli import Conditional
 from ansible.module_utils.six import string_types
 
 

lib/ansible/modules/network/cloudengine/ce_command.py

@@ -150,19 +150,21 @@ failed_conditions:
 
 
 import time
+import traceback
 
-from ansible.module_utils.ce import run_commands
-from ansible.module_utils.pycompat24 import get_exception
 from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.ce import ce_argument_spec, check_args
+from ansible.module_utils.ce import run_commands
 from ansible.module_utils.netcli import Conditional
 from ansible.module_utils.network_common import ComplexList
-from ansible.module_utils.ce import ce_argument_spec, check_args
+from ansible.module_utils.six import string_types
+from ansible.module_utils._text import to_native
 
 
 def to_lines(stdout):
     lines = list()
     for item in stdout:
-        if isinstance(item, basestring):
+        if isinstance(item, string_types):
             item = str(item).split('\n')
         lines.append(item)
     return lines
@@ -223,9 +225,8 @@ def main():
 
     try:
         conditionals = [Conditional(c) for c in wait_for]
-    except AttributeError:
-        exc = get_exception()
-        module.fail_json(msg=str(exc))
+    except AttributeError as exc:
+        module.fail_json(msg=to_native(exc), exception=traceback.format_exc())
 
     retries = module.params['retries']
     interval = module.params['interval']

lib/ansible/modules/network/cloudengine/ce_ntp.py

@@ -353,8 +353,8 @@ class Ntp(object):
         if not addr_list:
             self.module.fail_json(msg='Error: Match ip-address fail.')
 
-        value = ((long(addr_list[0][0])) * 0x1000000) + (long(addr_list[0][1]) * 0x10000) + \
-            (long(addr_list[0][2]) * 0x100) + (long(addr_list[0][3]))
+        value = ((int(addr_list[0][0])) * 0x1000000) + (int(addr_list[0][1]) * 0x10000) + \
+            (int(addr_list[0][2]) * 0x100) + (int(addr_list[0][3]))
         if (value & (0xff000000) == 0x7f000000) or (value & (0xF0000000) == 0xF0000000) \
                 or (value & (0xF0000000) == 0xE0000000) or (value == 0):
             return False

lib/ansible/modules/network/cloudengine/ce_ntp_auth.py

@@ -200,8 +200,9 @@ changed:
     sample: true
 '''
 
-import re
 import copy
+import re
+
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.ce import ce_argument_spec, load_config, get_nc_config, set_nc_config
 
@@ -322,7 +323,7 @@ class NtpAuth(object):
             self.module.fail_json(
                 msg='Error: key_id is not digit.')
 
-        if (long(self.key_id) < 1) or (long(self.key_id) > 4294967295):
+        if (int(self.key_id) < 1) or (int(self.key_id) > 4294967295):
             self.module.fail_json(
                 msg='Error: The length of key_id is between 1 and 4294967295.')
 

lib/ansible/modules/network/dellos10/dellos10_command.py

@@ -147,11 +147,12 @@ from ansible.module_utils.dellos10 import dellos10_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network_common import ComplexList
 from ansible.module_utils.netcli import Conditional
+from ansible.module_utils.six import string_types
 
 
 def to_lines(stdout):
     for item in stdout:
-        if isinstance(item, basestring):
+        if isinstance(item, string_types):
             item = str(item).split('\n')
         yield item
 

lib/ansible/modules/network/dellos10/dellos10_facts.py

@@ -134,21 +134,21 @@ ansible_net_neighbors:
 
 import re
 
+try:
+    from lxml import etree as ET
+except ImportError:
+    import xml.etree.ElementTree as ET
+
 from ansible.module_utils.dellos10 import run_commands
 from ansible.module_utils.dellos10 import dellos10_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import iteritems
 from ansible.module_utils.six.moves import zip
 
-try:
-    from lxml import etree as ET
-except ImportError:
-    import xml.etree.ElementTree as ET
-
 
 class FactsBase(object):
 
-    COMMANDS = list()
+    COMMANDS = []
 
     def __init__(self, module):
         self.module = module
@@ -365,7 +365,7 @@ class Interfaces(FactsBase):
                 intf['mediatype'] = mediatype
             except:
                 # fanout
-                for subport in xrange(1, 5):
+                for subport in range(1, 5):
                     name = "ethernet" + sname + ":" + str(subport)
                     try:
                         intf = self.intf_facts[name]

lib/ansible/modules/network/dellos6/dellos6_command.py

@@ -143,16 +143,17 @@ warnings:
 
 import time
 
+from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.dellos6 import run_commands
 from ansible.module_utils.dellos6 import dellos6_argument_spec, check_args
-from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network_common import ComplexList
 from ansible.module_utils.netcli import Conditional
+from ansible.module_utils.six import string_types
 
 
 def to_lines(stdout):
     for item in stdout:
-        if isinstance(item, basestring):
+        if isinstance(item, string_types):
             item = str(item).split('\n')
         yield item
 

lib/ansible/modules/network/dellos9/dellos9_command.py

@@ -147,16 +147,17 @@ warnings:
 """
 import time
 
+from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.dellos9 import run_commands
 from ansible.module_utils.dellos9 import dellos9_argument_spec, check_args
-from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network_common import ComplexList
 from ansible.module_utils.netcli import Conditional
+from ansible.module_utils.six import string_types
 
 
 def to_lines(stdout):
     for item in stdout:
-        if isinstance(item, basestring):
+        if isinstance(item, string_types):
             item = str(item).split('\n')
         yield item
 

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

@@ -398,7 +398,7 @@ class BaseManager(object):
 
     def wait_for_rest_api_restart(self):
         time.sleep(5)
-        for x in xrange(0, 60):
+        for x in range(0, 60):
             try:
                 self.client.reconnect()
                 break

lib/ansible/modules/network/nxos/nxos_pim_interface.py

@@ -147,9 +147,10 @@ commands:
 '''
 
 
+from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.nxos import get_config, load_config, run_commands
 from ansible.module_utils.nxos import nxos_argument_spec, check_args
-from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.six import string_types
 
 
 PARAM_TO_COMMAND_KEYMAP = {
@@ -251,8 +252,7 @@ def get_pim_interface(module, interface):
     try:
         get_data = body[0]['TABLE_iod']['ROW_iod']
 
-        if isinstance(get_data.get('dr-priority'), unicode) or \
-                isinstance(get_data.get('dr-priority'), str):
+        if isinstance(get_data.get('dr-priority'), string_types):
             pim_interface['dr_prio'] = get_data.get('dr-priority')
         else:
             pim_interface['dr_prio'] = get_data.get('dr-priority')[0]
@@ -283,8 +283,7 @@ def get_pim_interface(module, interface):
         if jp_in_policy == 'none configured':
             pim_interface['jp_policy_in'] = None
 
-        if isinstance(get_data.get('jp-out-policy-name'), unicode) or \
-                isinstance(get_data.get('jp-out-policy-name'), str):
+        if isinstance(get_data.get('jp-out-policy-name'), string_types):
             pim_interface['jp_policy_out'] = get_data.get('jp-out-policy-name')
         else:
             pim_interface['jp_policy_out'] = get_data.get(

lib/ansible/modules/network/ordnance/ordnance_facts.py

@@ -101,12 +101,14 @@ ansible_net_interfaces:
   returned: when interfaces is configured
   type: dict
 """
-import re
 import itertools
+import re
+import traceback
 
 from ansible.module_utils.network import NetworkModule
 from ansible.module_utils.six import iteritems
 from ansible.module_utils.six.moves import zip
+from ansible.module_utils._text import to_native
 
 
 class FactsBase(object):
@@ -283,9 +285,8 @@ def main():
             inst.populate()
             failed_commands.extend(inst.failed_commands)
             facts.update(inst.facts)
-    except Exception:
-        exc = get_exception()
-        module.fail_json(msg=str(exc))
+    except Exception as exc:
+        module.fail_json(msg=to_native(exc), exception=traceback.format_exc())
 
     ansible_facts = dict()
     for key, value in iteritems(facts):

lib/ansible/modules/network/panos/panos_restart.py

@@ -65,8 +65,8 @@ ANSIBLE_METADATA = {'metadata_version': '1.0',
                     'supported_by': 'community'}
 
 
-from ansible.module_utils.basic import AnsibleModule
 import sys
+import traceback
 
 try:
     import pan.xapi
@@ -74,6 +74,10 @@ try:
 except ImportError:
     HAS_LIB = False
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_native
+
+
 def main():
     argument_spec = dict(
         ip_address=dict(),
@@ -101,15 +105,14 @@ def main():
 
     try:
         xapi.op(cmd="<request><restart><system></system></restart></request>")
-    except Exception:
-        x = sys.exc_info()[1]
-        if 'succeeded' in str(x):
-            module.exit_json(changed=True, msg=str(msg))
+    except Exception as e:
+        if 'succeeded' in to_native(e):
+            module.exit_json(changed=True, msg=to_native(e))
         else:
-            module.fail_json(msg=x)
-            raise
+            module.fail_json(msg=to_native(e), exception=traceback.format_exc())
 
     module.exit_json(changed=True, msg="okey dokey")
 
+
 if __name__ == '__main__':
     main()