code clean of old code from network modules updates (#21469)

* removes unused code
* removes module_utils/local.py
* removes plugins/action/network.py
* removes action_handler from connection plugins
* removes code to use action_handler in task_executor
* updates action plugins to subclass from normal

lib/ansible/plugins/action/net_config.py

@@ -24,7 +24,7 @@ import re
 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 @@ class ActionModule(_ActionModule):
             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 @@ class ActionModule(_ActionModule):
 
         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 glob
 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/action/network.py

@@ -1,66 +0,0 @@
-#
-# (c) 2016 Red Hat Inc.
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-#
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-import datetime
-
-from ansible.plugins.action import ActionBase, display
-from ansible.module_utils.local import _modify_module
-from ansible.errors import AnsibleModuleExit
-
-class ActionModule(ActionBase):
-
-    def run(self, tmp=None, task_vars=None):
-        result = super(ActionModule, self).run(tmp, task_vars)
-        if result.get('invocation', {}).get('module_args'):
-            del result['invocation']['module_args']
-
-        self._update_module_args(self._task.action, self._task.args, task_vars)
-
-        try:
-            _modify_module(self._task.args, self._connection)
-            path = self._shared_loader_obj.module_loader.find_plugin(self._task.action)
-            pkg = '.'.join(['ansible', 'modules', self._task.action])
-            module = self._shared_loader_obj.module_loader._load_module_source(pkg, path)
-            start_time = datetime.datetime.now()
-            module.main()
-
-        except AnsibleModuleExit as exc:
-            result.update(exc.result)
-            for field in ('_ansible_notify',):
-                if field in result:
-                    result.pop(field)
-
-        except Exception as exc:
-            if display.verbosity > 2:
-                raise
-            result.update(dict(failed=True, msg=str(exc)))
-
-        end_time = datetime.datetime.now()
-        delta = end_time - start_time
-
-        result.update({
-            'start': str(start_time),
-            'end': str(end_time),
-            'delta': str(delta)
-        })
-
-        return result
-

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)