code clean of old code from network modules updates

lib/ansible/executor/task_executor.py

@@ -768,8 +768,7 @@ def _get_action_handler(self, connection, templar):
         elif all((module_prefix in network_group_modules, module_prefix in self._shared_loader_obj.action_loader)):
             handler_name = module_prefix
         else:
-            pc_conn = self._shared_loader_obj.connection_loader.get(self._play_context.connection, class_only=True)
-            handler_name = getattr(pc_conn, 'action_handler', 'normal')
+            handler_name = 'normal'
 
         handler = self._shared_loader_obj.action_loader.get(
             handler_name,

lib/ansible/plugins/action/net_config.py

@@ -24,7 +24,7 @@
 import time
 import glob
 
-from ansible.plugins.action.network import ActionModule as _ActionModule
+from ansible.plugins.action.normal import ActionModule as _ActionModule
 from ansible.module_utils._text import to_text
 from ansible.module_utils.six.moves.urllib.parse import urlsplit
 from ansible.utils.vars import merge_hash
@@ -43,10 +43,7 @@ def run(self, tmp=None, task_vars=None):
             except ValueError as exc:
                 return dict(failed=True, msg=exc.message)
 
-        if self._play_context.connection == 'local':
-            result = self.normal(tmp, task_vars)
-        else:
-            result = super(ActionModule, self).run(tmp, task_vars)
+        result = super(ActionModule, self).run(tmp, task_vars)
 
         if self._task.args.get('backup') and result.get('__backup__'):
             # User requested backup and no error occurred in module.
@@ -64,22 +61,6 @@ def run(self, tmp=None, task_vars=None):
 
         return result
 
-    def normal(self, tmp=None, task_vars=None):
-        if task_vars is None:
-            task_vars = dict()
-
-        #results = super(ActionModule, self).run(tmp, task_vars)
-        # remove as modules might hide due to nolog
-        #del results['invocation']['module_args']
-
-        results = {}
-        results = merge_hash(results, self._execute_module(tmp=tmp, task_vars=task_vars))
-
-        # hack to keep --verbose from showing all the setup module results
-        if self._task.action == 'setup':
-            results['_ansible_verbose_override'] = True
-
-        return results
     def _get_working_path(self):
         cwd = self._loader.get_basedir()
         if self._task._role is not None:

lib/ansible/plugins/action/net_template.py

@@ -25,7 +25,7 @@
 import urlparse
 
 from ansible.module_utils._text import to_text
-from ansible.plugins.action.network import ActionModule as _ActionModule
+from ansible.plugins.action.normal import ActionModule as _ActionModule
 
 
 class ActionModule(_ActionModule):

lib/ansible/plugins/connection/__init__.py

@@ -67,7 +67,6 @@ class ConnectionBase(with_metaclass(ABCMeta, object)):
     # language means any language.
     module_implementation_preferences = ('',)
     allow_executable = True
-    action_handler = 'normal'
 
     def __init__(self, play_context, new_stdin, *args, **kwargs):
         # All these hasattrs allow subclasses to override these parameters

lib/ansible/plugins/connection/network_cli.py

@@ -42,7 +42,6 @@ class Connection(_Connection):
 
     transport = 'network_cli'
     has_pipelining = False
-    action_handler = 'network'
 
     def __init__(self, play_context, new_stdin, *args, **kwargs):
         super(Connection, self).__init__(play_context, new_stdin, *args, **kwargs)