Network module code cleanup (#5061)

* Fix imports in junos_template

* Python 3 compatibility in eos_command

* Python 3 compatibility for ios_command

* Clean up issues with ios_facts

* Python 3 compatibility for ios_facts

* Import shuffle in ios_template

* Python 3 compatibility for iosxr_command

* Clean up iosxr_facts.py

* Python 3 compatibility for iosxr_facts

* Python 3 compatibility for junos_command

* Python 3 compatibility for ops_command

* Cleanup issues with ops_facts

* Python 3 compatibility for ops_facts

* Cleanup issues with ops_template

* Python 3 compatibility for vyos_command

* Cleanup issues with vyos_facts

* Python 3 compatibility for vyos_facts

lib/ansible/modules/network/openswitch/ops_command.py

@@ -126,22 +126,24 @@ failed_conditions:
   type: list
   sample: ['...', '...']
 """
+import ansible.module_utils.openswitch
 from ansible.module_utils.basic import get_exception
 from ansible.module_utils.netcli import CommandRunner
 from ansible.module_utils.netcli import AddCommandError, FailedConditionsError
-from ansible.module_utils.openswitch import NetworkModule, NetworkError
+from ansible.module_utils.network import NetworkModule, NetworkError
+from ansible.module_utils.six import string_types
 
 VALID_KEYS = ['command', 'prompt', 'response']
 
 def to_lines(stdout):
     for item in stdout:
-        if isinstance(item, basestring):
+        if isinstance(item, string_types):
             item = str(item).split('\n')
         yield item
 
 def parse_commands(module):
     for cmd in module.params['commands']:
-        if isinstance(cmd, basestring):
+        if isinstance(cmd, string_types):
             cmd = dict(command=cmd, output=None)
         elif 'command' not in cmd:
             module.fail_json(msg='command keyword argument is required')
@@ -220,4 +222,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-

lib/ansible/modules/network/openswitch/ops_facts.py

@@ -171,9 +171,10 @@ endpoints:
 """
 import re
 
-from ansible.module_utils.basic import get_exception
+import ansible.module_utils.openswitch
 from ansible.module_utils.netcli import CommandRunner, AddCommandError
-from ansible.module_utils.openswitch import NetworkModule
+from ansible.module_utils.network import NetworkModule
+from ansible.module_utils.six import iteritems
 
 
 def add_command(runner, command):
@@ -196,6 +197,9 @@ class FactsBase(object):
         if self.transport == 'cli':
             self.commands()
 
+    def commands(self):
+        raise NotImplementedError
+
     def populate(self):
         getattr(self, self.transport)()
 
@@ -395,11 +399,10 @@ def main():
             inst.populate()
             facts.update(inst.facts)
     except Exception:
-        raise
         module.exit_json(out=module.from_json(runner.items))
 
     ansible_facts = dict()
-    for key, value in facts.iteritems():
+    for key, value in iteritems(facts):
         # this is to maintain capability with ops_facts 2.1
         if key.startswith('_'):
             ansible_facts[key[1:]] = value

lib/ansible/modules/network/openswitch/ops_template.py

@@ -95,10 +95,11 @@ responses:
   type: list
   sample: [...]
 """
-import copy
 
+import ansible.module_utils.openswitch
 from ansible.module_utils.netcfg import NetworkConfig, dumps
-from ansible.module_utils.openswitch import NetworkModule
+from ansible.module_utils.network import NetworkModule
+from ansible.module_utils.openswitch import HAS_OPS
 
 
 def get_config(module):