Refactored code to remove unused usages, and modified comments

Author: rsmekala

action_plugins/juniper_junos_common_action.py

@@ -36,12 +36,6 @@
 from ansible.module_utils.basic import boolean as ansible_vars_convert_to_boolean
 import os
 
-try:
-    # Python 2
-    basestring
-except NameError:
-    # Python 3
-    basestring = str
 
 connection_spec_fallbacks = {
     'host': ['ansible_host', 'inventory_hostname'],
@@ -54,7 +48,7 @@
 
 # Moved the defintion
 class ActionModule(ActionNetworkModule):
-    """A subclass of ActionNormal used by all juniper_junos_* modules.
+    """A subclass of ansible.plugins.action.network.ActionModule used by all juniper_junos_* modules.
 
     All juniper_junos_* modules share common behavior which is implemented in
     this class. This includes specific option fallback/default behavior and
@@ -64,6 +58,8 @@ class ActionModule(ActionNetworkModule):
         convert_to_bool: Try converting to bool using aliases for bool.
     """
     def run(self, tmp=None, task_vars=None):
+        # This variable is no longer used in the run definition
+        del tmp
         # The new connection arguments based on fallback/defaults.
         new_connection_args = dict()
 

module_utils/juniper_junos_common.py

@@ -507,25 +507,14 @@ class ModuleDocFragment(object):
                     required=False,
                     default=30),
 }
+
 # Connection arguments which are mutually exclusive.
 connection_spec_mutually_exclusive = [['mode', 'console'],
                                       ['port', 'console'],
                                       ['baud', 'console'],
                                       ['attempts','console'],
                                       ['cs_user', 'console'],
                                       ['cs_passwd', 'console']]
-# Keys are connection options. Values are a list of task_vars to use as the
-# default value. Order of values specified against each key represents the
-# preference order of options in the key. Has to be maintained consistent with
-# ansible core modules
-connection_spec_fallbacks = {
-    'host': ['ansible_host', 'inventory_hostname'],
-    'user': ['ansible_connection_user', 'ansible_ssh_user', 'ansible_user'],
-    'passwd': ['ansible_ssh_pass', 'ansible_pass'],
-    'port': ['ansible_ssh_port', 'ansible_port'],
-    'ssh_private_key_file': ['ansible_ssh_private_key_file',
-                             'ansible_private_key_file']
-}
 
 # Specify the provider spec with options matching connection_spec.
 provider_spec = {
@@ -1888,5 +1877,3 @@ def save_text_output(self, name, format, text):
             except IOError:
                 self.fail_json(msg="Unable to save output. Failed to "
                                    "open the %s file." % (file_path))
-
-