Migrated to dellemc_networking.os10

8 files changed, 0 insertions, 1583 deletions

diff --git a/lib/ansible/module_utils/network/dellos10/dellos10.py b/lib/ansible/module_utils/network/dellos10/dellos10.py
deleted file mode 100644
index dd5a040339..0000000000
--- a/lib/ansible/module_utils/network/dellos10/dellos10.py
+++ /dev/null
@@ -1,167 +0,0 @@
-#
-# (c) 2015 Peter Sprygada, <psprygada@ansible.com>
-# (c) 2017 Red Hat, Inc
-#
-# Copyright (c) 2016 Dell Inc.
-#
-# This code is part of Ansible, but is an independent component.
-# This particular file snippet, and this file snippet only, is BSD licensed.
-# Modules you write using this snippet, which is embedded dynamically by Ansible
-# still belong to the author of the module, and may assign their own license
-# to the complete work.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-#    * Redistributions of source code must retain the above copyright
-#      notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright notice,
-#      this list of conditions and the following disclaimer in the documentation
-#      and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-import json
-
-from ansible.module_utils._text import to_text
-from ansible.module_utils.basic import env_fallback
-from ansible.module_utils.network.common.utils import to_list, ComplexList
-from ansible.module_utils.connection import Connection, ConnectionError, exec_command
-from ansible.module_utils.network.common.config import NetworkConfig, ConfigLine
-
-_DEVICE_CONFIGS = {}
-
-WARNING_PROMPTS_RE = [
-    r"[\r\n]?\[confirm yes/no\]:\s?$",
-    r"[\r\n]?\[y/n\]:\s?$",
-    r"[\r\n]?\[yes/no\]:\s?$"
-]
-
-dellos10_provider_spec = {
-    'host': dict(),
-    'port': dict(type='int'),
-    'username': dict(fallback=(env_fallback, ['ANSIBLE_NET_USERNAME'])),
-    'password': dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True),
-    'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
-    'authorize': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTHORIZE']), type='bool'),
-    'auth_pass': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTH_PASS']), no_log=True),
-    'timeout': dict(type='int'),
-}
-dellos10_argument_spec = {
-    'provider': dict(type='dict', options=dellos10_provider_spec),
-}
-dellos10_top_spec = {
-    'host': dict(removed_in_version=2.9),
-    'port': dict(removed_in_version=2.9, type='int'),
-    'username': dict(removed_in_version=2.9),
-    'password': dict(removed_in_version=2.9, no_log=True),
-    'ssh_keyfile': dict(removed_in_version=2.9, type='path'),
-    'authorize': dict(removed_in_version=2.9, type='bool'),
-    'auth_pass': dict(removed_in_version=2.9, no_log=True),
-    'timeout': dict(removed_in_version=2.9, type='int'),
-}
-dellos10_argument_spec.update(dellos10_top_spec)
-
-
-def get_provider_argspec():
-    return dellos10_provider_spec
-
-
-def get_connection(module):
-    if hasattr(module, '_dellos10_connection'):
-        return module._dellos10_connection
-
-    capabilities = get_capabilities(module)
-    network_api = capabilities.get('network_api')
-    if network_api == 'cliconf':
-        module._dellos10_connection = Connection(module._socket_path)
-    else:
-        module.fail_json(msg='Invalid connection type %s' % network_api)
-
-    return module._dellos10_connection
-
-
-def get_capabilities(module):
-    if hasattr(module, '_dellos10_capabilities'):
-        return module._dellos10_capabilities
-    try:
-        capabilities = Connection(module._socket_path).get_capabilities()
-    except ConnectionError as exc:
-        module.fail_json(msg=to_text(exc, errors='surrogate_then_replace'))
-    module._dellos10_capabilities = json.loads(capabilities)
-    return module._dellos10_capabilities
-
-
-def check_args(module, warnings):
-    pass
-
-
-def get_config(module, flags=None):
-    flags = [] if flags is None else flags
-
-    cmd = 'show running-configuration '
-    cmd += ' '.join(flags)
-    cmd = cmd.strip()
-
-    try:
-        return _DEVICE_CONFIGS[cmd]
-    except KeyError:
-        rc, out, err = exec_command(module, cmd)
-        if rc != 0:
-            module.fail_json(msg='unable to retrieve current config', stderr=to_text(err, errors='surrogate_or_strict'))
-        cfg = to_text(out, errors='surrogate_or_strict').strip()
-        _DEVICE_CONFIGS[cmd] = cfg
-        return cfg
-
-
-def run_commands(module, commands, check_rc=True):
-    connection = get_connection(module)
-    try:
-        return connection.run_commands(commands=commands, check_rc=check_rc)
-    except ConnectionError as exc:
-        module.fail_json(msg=to_text(exc))
-
-
-def load_config(module, commands):
-    rc, out, err = exec_command(module, 'configure terminal')
-    if rc != 0:
-        module.fail_json(msg='unable to enter configuration mode', err=to_text(err, errors='surrogate_or_strict'))
-
-    commands.append('commit')
-    for command in to_list(commands):
-        if command == 'end':
-            continue
-        rc, out, err = exec_command(module, command)
-        if rc != 0:
-            module.fail_json(msg=to_text(err, errors='surrogate_or_strict'), command=command, rc=rc)
-
-    exec_command(module, 'end')
-
-
-def get_sublevel_config(running_config, module):
-    contents = list()
-    current_config_contents = list()
-    running_config = NetworkConfig(contents=running_config, indent=1)
-    obj = running_config.get_object(module.params['parents'])
-    if obj:
-        contents = obj.children
-    contents[:0] = module.params['parents']
-
-    indent = 0
-    for c in contents:
-        if isinstance(c, str):
-            current_config_contents.append(c.rjust(len(c) + indent, ' '))
-        if isinstance(c, ConfigLine):
-            current_config_contents.append(c.raw)
-        indent = 1
-    sublevel_config = '\n'.join(current_config_contents)
-
-    return sublevel_config
diff --git a/lib/ansible/modules/network/dellos10/dellos10_command.py b/lib/ansible/modules/network/dellos10/dellos10_command.py
deleted file mode 100644
index 64894c4823..0000000000
--- a/lib/ansible/modules/network/dellos10/dellos10_command.py
+++ /dev/null
@@ -1,231 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2015, Peter Sprygada <psprygada@ansible.com>
-# Copyright: (c) 2017, Dell Inc.
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
-
-DOCUMENTATION = """
----
-module: dellos10_command
-version_added: "2.2"
-author: "Senthil Kumar Ganesan (@skg-net)"
-short_description: Run commands on remote devices running Dell OS10
-description:
-  - Sends arbitrary commands to a Dell EMC OS10 node and returns the results
-    read from the device. This module includes an
-    argument that will cause the module to wait for a specific condition
-    before returning or timing out if the condition is not met.
-  - This module does not support running commands in configuration mode.
-    Please use M(dellos10_config) to configure Dell EMC OS10 devices.
-extends_documentation_fragment: dellos10
-options:
-  commands:
-    description:
-      - List of commands to send to the remote dellos10 device over the
-        configured provider. The resulting output from the command
-        is returned. If the I(wait_for) argument is provided, the
-        module is not returned until the condition is satisfied or
-        the number of retries has expired. If a command sent to the
-        device requires answering a prompt, it is possible to pass
-        a dict containing I(command), I(answer) and I(prompt).
-        Common answers are 'yes' or "\\r" (carriage return, must be
-        double quotes). See examples.
-    type: list
-    required: true
-  wait_for:
-    description:
-      - List of conditions to evaluate against the output of the
-        command. The task will wait for each condition to be true
-        before moving forward. If the conditional is not true
-        within the configured number of retries, the task fails.
-        See examples.
-    type: list
-    version_added: "2.2"
-  match:
-    description:
-      - The I(match) argument is used in conjunction with the
-        I(wait_for) argument to specify the match policy.  Valid
-        values are C(all) or C(any).  If the value is set to C(all)
-        then all conditionals in the wait_for must be satisfied.  If
-        the value is set to C(any) then only one of the values must be
-        satisfied.
-    type: str
-    default: all
-    choices: [ 'all', 'any' ]
-    version_added: "2.5"
-  retries:
-    description:
-      - Specifies the number of retries a command should be tried
-        before it is considered failed. The command is run on the
-        target device every retry and evaluated against the
-        I(wait_for) conditions.
-    type: int
-    default: 10
-  interval:
-    description:
-      - Configures the interval in seconds to wait between retries
-        of the command. If the command does not pass the specified
-        conditions, the interval indicates how long to wait before
-        trying the command again.
-    type: int
-    default: 1
-"""
-
-EXAMPLES = """
-tasks:
-  - name: run show version on remote devices
-    dellos10_command:
-      commands: show version
-
-  - name: run show version and check to see if output contains OS10
-    dellos10_command:
-      commands: show version
-      wait_for: result[0] contains OS10
-
-  - name: run multiple commands on remote nodes
-    dellos10_command:
-      commands:
-        - show version
-        - show interface
-
-  - name: run multiple commands and evaluate the output
-    dellos10_command:
-      commands:
-        - show version
-        - show interface
-      wait_for:
-        - result[0] contains OS10
-        - result[1] contains Ethernet
-
-  - name: run commands that require answering a prompt
-    dellos10_command:
-      commands:
-        - command: 'reload'
-          prompt: '[confirm yes/no]: ?$'
-          answer: 'no'
-"""
-
-RETURN = """
-stdout:
-  description: The set of responses from the commands
-  returned: always apart from low level errors (such as action plugin)
-  type: list
-  sample: ['...', '...']
-stdout_lines:
-  description: The value of stdout split into a list
-  returned: always apart from low level errors (such as action plugin)
-  type: list
-  sample: [['...', '...'], ['...'], ['...']]
-failed_conditions:
-  description: The list of conditionals that have failed
-  returned: failed
-  type: list
-  sample: ['...', '...']
-warnings:
-  description: The list of warnings (if any) generated by module based on arguments
-  returned: always
-  type: list
-  sample: ['...', '...']
-"""
-import time
-
-from ansible.module_utils._text import to_text
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.network.common.parsing import Conditional
-from ansible.module_utils.network.common.utils import transform_commands, to_lines
-from ansible.module_utils.network.dellos10.dellos10 import run_commands
-from ansible.module_utils.network.dellos10.dellos10 import dellos10_argument_spec, check_args
-
-
-def parse_commands(module, warnings):
-    commands = transform_commands(module)
-
-    if module.check_mode:
-        for item in list(commands):
-            if not item['command'].startswith('show'):
-                warnings.append(
-                    'Only show commands are supported when using check mode, not '
-                    'executing %s' % item['command']
-                )
-                commands.remove(item)
-
-    return commands
-
-
-def main():
-    """main entry point for module execution
-    """
-    argument_spec = dict(
-        # { command: <str>, prompt: <str>, response: <str> }
-        commands=dict(type='list', required=True),
-
-        wait_for=dict(type='list'),
-        match=dict(default='all', choices=['all', 'any']),
-
-        retries=dict(default=10, type='int'),
-        interval=dict(default=1, type='int')
-    )
-
-    argument_spec.update(dellos10_argument_spec)
-
-    module = AnsibleModule(argument_spec=argument_spec,
-                           supports_check_mode=True)
-
-    result = {'changed': False}
-
-    warnings = list()
-    check_args(module, warnings)
-    commands = parse_commands(module, warnings)
-    result['warnings'] = warnings
-
-    wait_for = module.params['wait_for'] or list()
-
-    try:
-        conditionals = [Conditional(c) for c in wait_for]
-    except AttributeError as exc:
-        module.fail_json(msg=to_text(exc))
-    retries = module.params['retries']
-    interval = module.params['interval']
-    match = module.params['match']
-
-    while retries > 0:
-        responses = run_commands(module, commands)
-
-        for item in list(conditionals):
-            if item(responses):
-                if match == 'any':
-                    conditionals = list()
-                    break
-                conditionals.remove(item)
-
-        if not conditionals:
-            break
-
-        time.sleep(interval)
-        retries -= 1
-
-    if conditionals:
-        failed_conditions = [item.raw for item in conditionals]
-        msg = 'One or more conditional statements have not been satisfied'
-        module.fail_json(msg=msg, failed_conditions=failed_conditions)
-
-    result.update({
-        'stdout': responses,
-        'stdout_lines': list(to_lines(responses))
-    })
-
-    module.exit_json(**result)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/lib/ansible/modules/network/dellos10/dellos10_config.py b/lib/ansible/modules/network/dellos10/dellos10_config.py
deleted file mode 100644
index 0e8177f1a0..0000000000
--- a/lib/ansible/modules/network/dellos10/dellos10_config.py
+++ /dev/null
@@ -1,338 +0,0 @@
-#!/usr/bin/python
-#
-# (c) 2015 Peter Sprygada, <psprygada@ansible.com>
-# Copyright (c) 2017 Dell Inc.
-#
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
-
-DOCUMENTATION = """
----
-module: dellos10_config
-version_added: "2.2"
-author: "Senthil Kumar Ganesan (@skg-net)"
-short_description: Manage Dell EMC Networking OS10 configuration sections
-description:
-  - OS10 configurations use a simple block indent file syntax
-    for segmenting configuration into sections.  This module provides
-    an implementation for working with OS10 configuration sections in
-    a deterministic way.
-extends_documentation_fragment: dellos10
-options:
-  lines:
-    description:
-      - The ordered set of commands that should be configured in the
-        section.  The commands must be the exact same commands as found
-        in the device running-config. Be sure to note the configuration
-        command syntax as some commands are automatically modified by the
-        device config parser. This argument is mutually exclusive with I(src).
-    aliases: ['commands']
-  parents:
-    description:
-      - The ordered set of parents that uniquely identify the section or hierarchy
-        the commands should be checked against.  If the parents argument
-        is omitted, the commands are checked against the set of top
-        level or global commands.
-  src:
-    description:
-      - Specifies the source path to the file that contains the configuration
-        or configuration template to load.  The path to the source file can
-        either be the full path on the Ansible control host or a relative
-        path from the playbook or role root directory. This argument is
-        mutually exclusive with I(lines).
-  before:
-    description:
-      - The ordered set of commands to push on to the command stack if
-        a change needs to be made.  This allows the playbook designer
-        the opportunity to perform configuration commands prior to pushing
-        any changes without affecting how the set of commands are matched
-        against the system.
-  after:
-    description:
-      - The ordered set of commands to append to the end of the command
-        stack if a change needs to be made.  Just like with I(before) this
-        allows the playbook designer to append a set of commands to be
-        executed after the command set.
-  match:
-    description:
-      - Instructs the module on the way to perform the matching of
-        the set of commands against the current device config.  If
-        match is set to I(line), commands are matched line by line.  If
-        match is set to I(strict), command lines are matched with respect
-        to position.  If match is set to I(exact), command lines
-        must be an equal match.  Finally, if match is set to I(none), the
-        module will not attempt to compare the source configuration with
-        the running configuration on the remote device.
-    default: line
-    choices: ['line', 'strict', 'exact', 'none']
-  replace:
-    description:
-      - Instructs the module on the way to perform the configuration
-        on the device.  If the replace argument is set to I(line) then
-        the modified lines are pushed to the device in configuration
-        mode.  If the replace argument is set to I(block) then the entire
-        command block is pushed to the device in configuration mode if any
-        line is not correct.
-    default: line
-    choices: ['line', 'block']
-  update:
-    description:
-      - The I(update) argument controls how the configuration statements
-        are processed on the remote device.  Valid choices for the I(update)
-        argument are I(merge) and I(check).  When you set this argument to
-        I(merge), the configuration changes merge with the current
-        device running configuration.  When you set this argument to I(check)
-        the configuration updates are determined but not actually configured
-        on the remote device.
-    default: merge
-    choices: ['merge', 'check']
-  save:
-    description:
-      - The C(save) argument instructs the module to save the running-
-        config to the startup-config at the conclusion of the module
-        running.  If check mode is specified, this argument is ignored.
-    type: bool
-    default: 'no'
-  config:
-    description:
-      - The module, by default, will connect to the remote device and
-        retrieve the current running-config to use as a base for comparing
-        against the contents of source.  There are times when it is not
-        desirable to have the task get the current running-config for
-        every task in a playbook.  The I(config) argument allows the
-        implementer to pass in the configuration to use as the base
-        config for comparison.
-  backup:
-    description:
-      - This argument will cause the module to create a full backup of
-        the current C(running-config) from the remote device before any
-        changes are made. If the C(backup_options) value is not given,
-        the backup file is written to the C(backup) folder in the playbook
-        root directory. If the directory does not exist, it is created.
-    type: bool
-    default: 'no'
-  backup_options:
-    description:
-      - This is a dict object containing configurable options related to backup file path.
-        The value of this option is read only when C(backup) is set to I(yes), if C(backup) is set
-        to I(no) this option will be silently ignored.
-    suboptions:
-      filename:
-        description:
-          - The filename to be used to store the backup configuration. If the filename
-            is not given it will be generated based on the hostname, current time and date
-            in format defined by <hostname>_config.<current-date>@<current-time>
-      dir_path:
-        description:
-          - This option provides the path ending with directory name in which the backup
-            configuration file will be stored. If the directory does not exist it will be first
-            created and the filename is either the value of C(filename) or default filename
-            as described in C(filename) options description. If the path value is not given
-            in that case a I(backup) directory will be created in the current working directory
-            and backup configuration will be copied in C(filename) within I(backup) directory.
-        type: path
-    type: dict
-    version_added: "2.8"
-"""
-
-EXAMPLES = """
-- dellos10_config:
-    lines: ['hostname {{ inventory_hostname }}']
-
-- dellos10_config:
-    lines:
-      - 10 permit ip host 1.1.1.1 any log
-      - 20 permit ip host 2.2.2.2 any log
-      - 30 permit ip host 3.3.3.3 any log
-      - 40 permit ip host 4.4.4.4 any log
-      - 50 permit ip host 5.5.5.5 any log
-    parents: ['ip access-list test']
-    before: ['no ip access-list test']
-    match: exact
-
-- dellos10_config:
-    lines:
-      - 10 permit ip host 1.1.1.1 any log
-      - 20 permit ip host 2.2.2.2 any log
-      - 30 permit ip host 3.3.3.3 any log
-      - 40 permit ip host 4.4.4.4 any log
-    parents: ['ip access-list test']
-    before: ['no ip access-list test']
-    replace: block
-
-- dellos10_config:
-    lines: ['hostname {{ inventory_hostname }}']
-    backup: yes
-    backup_options:
-      filename: backup.cfg
-      dir_path: /home/user
-"""
-
-RETURN = """
-updates:
-  description: The set of commands that will be pushed to the remote device.
-  returned: always
-  type: list
-  sample: ['hostname foo', 'router bgp 1', 'router-id 1.1.1.1']
-commands:
-  description: The set of commands that will be pushed to the remote device
-  returned: always
-  type: list
-  sample: ['hostname foo', 'router bgp 1', 'router-id 1.1.1.1']
-saved:
-  description: Returns whether the configuration is saved to the startup
-               configuration or not.
-  returned: When not check_mode.
-  type: bool
-  sample: True
-backup_path:
-  description: The full path to the backup file
-  returned: when backup is yes
-  type: str
-  sample: /playbooks/ansible/backup/dellos10_config.2016-07-16@22:28:34
-"""
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.network.dellos10.dellos10 import get_config, get_sublevel_config
-from ansible.module_utils.network.dellos10.dellos10 import dellos10_argument_spec, check_args
-from ansible.module_utils.network.dellos10.dellos10 import load_config, run_commands
-from ansible.module_utils.network.dellos10.dellos10 import WARNING_PROMPTS_RE
-from ansible.module_utils.network.common.config import NetworkConfig, dumps
-
-
-def get_candidate(module):
-    candidate = NetworkConfig(indent=1)
-    if module.params['src']:
-        candidate.load(module.params['src'])
-    elif module.params['lines']:
-        parents = module.params['parents'] or list()
-        commands = module.params['lines'][0]
-        if (isinstance(commands, dict)) and (isinstance((commands['command']), list)):
-            candidate.add(commands['command'], parents=parents)
-        elif (isinstance(commands, dict)) and (isinstance((commands['command']), str)):
-            candidate.add([commands['command']], parents=parents)
-        else:
-            candidate.add(module.params['lines'], parents=parents)
-    return candidate
-
-
-def get_running_config(module):
-    contents = module.params['config']
-    if not contents:
-        contents = get_config(module)
-    return contents
-
-
-def main():
-
-    backup_spec = dict(
-        filename=dict(),
-        dir_path=dict(type='path')
-    )
-    argument_spec = dict(
-        lines=dict(aliases=['commands'], type='list'),
-        parents=dict(type='list'),
-
-        src=dict(type='path'),
-
-        before=dict(type='list'),
-        after=dict(type='list'),
-
-        match=dict(default='line',
-                   choices=['line', 'strict', 'exact', 'none']),
-        replace=dict(default='line', choices=['line', 'block']),
-
-        update=dict(choices=['merge', 'check'], default='merge'),
-        save=dict(type='bool', default=False),
-        config=dict(),
-        backup=dict(type='bool', default=False),
-        backup_options=dict(type='dict', options=backup_spec)
-    )
-
-    argument_spec.update(dellos10_argument_spec)
-
-    mutually_exclusive = [('lines', 'src')]
-
-    module = AnsibleModule(argument_spec=argument_spec,
-                           mutually_exclusive=mutually_exclusive,
-                           supports_check_mode=True)
-
-    parents = module.params['parents'] or list()
-
-    match = module.params['match']
-    replace = module.params['replace']
-
-    warnings = list()
-    check_args(module, warnings)
-
-    result = dict(changed=False, saved=False, warnings=warnings)
-
-    if module.params['backup']:
-        if not module.check_mode:
-            result['__backup__'] = get_config(module)
-
-    commands = list()
-    candidate = get_candidate(module)
-
-    if any((module.params['lines'], module.params['src'])):
-        if match != 'none':
-            config = get_running_config(module)
-            if parents:
-                contents = get_sublevel_config(config, module)
-                config = NetworkConfig(contents=contents, indent=1)
-            else:
-                config = NetworkConfig(contents=config, indent=1)
-            configobjs = candidate.difference(config, match=match, replace=replace)
-        else:
-            configobjs = candidate.items
-
-        if configobjs:
-            commands = dumps(configobjs, 'commands')
-            if ((isinstance((module.params['lines']), list)) and
-                    (isinstance((module.params['lines'][0]), dict)) and
-                    (set(['prompt', 'answer']).issubset(module.params['lines'][0]))):
-
-                cmd = {'command': commands,
-                       'prompt': module.params['lines'][0]['prompt'],
-                       'answer': module.params['lines'][0]['answer']}
-                commands = [module.jsonify(cmd)]
-            else:
-                commands = commands.split('\n')
-
-            if module.params['before']:
-                commands[:0] = module.params['before']
-
-            if module.params['after']:
-                commands.extend(module.params['after'])
-
-            if not module.check_mode and module.params['update'] == 'merge':
-                load_config(module, commands)
-
-            result['changed'] = True
-            result['commands'] = commands
-            result['updates'] = commands
-
-    if module.params['save']:
-        result['changed'] = True
-        if not module.check_mode:
-            cmd = {r'command': 'copy running-config startup-config',
-                   r'prompt': r'\[confirm yes/no\]:\s?$', 'answer': 'yes'}
-            run_commands(module, [cmd])
-            result['saved'] = True
-        else:
-            module.warn('Skipping command `copy running-config startup-config`'
-                        'due to check_mode.  Configuration not copied to '
-                        'non-volatile storage')
-
-    module.exit_json(**result)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/lib/ansible/modules/network/dellos10/dellos10_facts.py b/lib/ansible/modules/network/dellos10/dellos10_facts.py
deleted file mode 100644
index 52a7c1cdd6..0000000000
--- a/lib/ansible/modules/network/dellos10/dellos10_facts.py
+++ /dev/null
@@ -1,505 +0,0 @@
-#!/usr/bin/python
-#
-# (c) 2015 Peter Sprygada, <psprygada@ansible.com>
-# Copyright (c) 2017 Dell Inc.
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
-
-DOCUMENTATION = """
----
-module: dellos10_facts
-version_added: "2.2"
-author: "Senthil Kumar Ganesan (@skg-net)"
-short_description: Collect facts from remote devices running Dell EMC Networking OS10
-description:
-  - Collects a base set of device facts from a remote device that
-    is running OS10.  This module prepends all of the
-    base network fact keys with C(ansible_net_<fact>).  The facts
-    module will always collect a base set of facts from the device
-    and can enable or disable collection of additional facts.
-extends_documentation_fragment: dellos10
-options:
-  gather_subset:
-    description:
-      - When supplied, this argument will restrict the facts collected
-        to a given subset.  Possible values for this argument include
-        all, hardware, config, and interfaces.  Can specify a list of
-        values to include a larger subset.  Values can also be used
-        with an initial C(M(!)) to specify that a specific subset should
-        not be collected.
-    default: [ '!config' ]
-"""
-
-EXAMPLES = """
-# Collect all facts from the device
-- dellos10_facts:
-    gather_subset: all
-
-# Collect only the config and default facts
-- dellos10_facts:
-    gather_subset:
-      - config
-
-# Do not collect hardware facts
-- dellos10_facts:
-    gather_subset:
-      - "!hardware"
-"""
-
-RETURN = """
-ansible_net_gather_subset:
-  description: The list of fact subsets collected from the device
-  returned: always
-  type: list
-
-# default
-ansible_net_name:
-  description: The name of the OS that is running.
-  returned: Always.
-  type: str
-ansible_net_version:
-  description: The operating system version running on the remote device
-  returned: always
-  type: str
-ansible_net_servicetag:
-  description: The service tag number of the remote device.
-  returned: always
-  type: str
-ansible_net_model:
-  description: The model name returned from the device.
-  returned: always
-  type: str
-ansible_net_hostname:
-  description: The configured hostname of the device
-  returned: always
-  type: str
-
-# hardware
-ansible_net_cpu_arch:
-  description: CPU Architecture of the remote device.
-  returned: when hardware is configured
-  type: str
-ansible_net_memfree_mb:
-  description: The available free memory on the remote device in Mb
-  returned: when hardware is configured
-  type: int
-ansible_net_memtotal_mb:
-  description: The total memory on the remote device in Mb
-  returned: when hardware is configured
-  type: int
-
-# config
-ansible_net_config:
-  description: The current active config from the device
-  returned: when config is configured
-  type: str
-
-# interfaces
-ansible_net_all_ipv4_addresses:
-  description: All IPv4 addresses configured on the device
-  returned: when interfaces is configured
-  type: list
-ansible_net_all_ipv6_addresses:
-  description: All IPv6 addresses configured on the device
-  returned: when interfaces is configured
-  type: list
-ansible_net_interfaces:
-  description: A hash of all interfaces running on the system
-  returned: when interfaces is configured
-  type: dict
-ansible_net_neighbors:
-  description: The list of LLDP neighbors from the remote device
-  returned: when interfaces is configured
-  type: dict
-"""
-
-import re
-
-try:
-    from lxml import etree as ET
-except ImportError:
-    import xml.etree.ElementTree as ET
-
-from ansible.module_utils.network.dellos10.dellos10 import run_commands
-from ansible.module_utils.network.dellos10.dellos10 import dellos10_argument_spec, check_args
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
-
-
-class FactsBase(object):
-
-    COMMANDS = []
-
-    def __init__(self, module):
-        self.module = module
-        self.facts = dict()
-        self.responses = None
-
-    def populate(self):
-        self.responses = run_commands(self.module, self.COMMANDS, check_rc=False)
-
-    def run(self, cmd):
-        return run_commands(self.module, cmd, check_rc=False)
-
-
-class Default(FactsBase):
-
-    COMMANDS = [
-        'show version | display-xml',
-        'show system | display-xml',
-    ]
-
-    def populate(self):
-        super(Default, self).populate()
-        data = self.responses[0]
-        xml_data = ET.fromstring(data.encode('utf8'))
-
-        self.facts['name'] = self.parse_name(xml_data)
-        self.facts['version'] = self.parse_version(xml_data)
-        self.facts['model'] = self.parse_model(xml_data)
-        self.facts['hostname'] = self.parse_hostname(xml_data)
-
-        data = self.responses[1]
-        xml_data = ET.fromstring(data.encode('utf8'))
-
-        self.facts['servicetag'] = self.parse_servicetag(xml_data)
-
-    def parse_name(self, data):
-        sw_name = data.find('./data/system-sw-state/sw-version/sw-name')
-        if sw_name is not None:
-            return sw_name.text
-        else:
-            return ""
-
-    def parse_version(self, data):
-        sw_ver = data.find('./data/system-sw-state/sw-version/sw-version')
-        if sw_ver is not None:
-            return sw_ver.text
-        else:
-            return ""
-
-    def parse_hostname(self, data):
-        hostname = data.find('./data/system-state/system-status/hostname')
-        if hostname is not None:
-            return hostname.text
-        else:
-            return ""
-
-    def parse_model(self, data):
-        prod_name = data.find('./data/system-sw-state/sw-version/sw-platform')
-        if prod_name is not None:
-            return prod_name.text
-        else:
-            return ""
-
-    def parse_servicetag(self, data):
-        svc_tag = data.find('./data/system/node/unit/mfg-info/service-tag')
-        if svc_tag is not None:
-            return svc_tag.text
-        else:
-            return ""
-
-
-class Hardware(FactsBase):
-
-    COMMANDS = [
-        'show version | display-xml',
-        'show processes node-id 1 | grep Mem:'
-    ]
-
-    def populate(self):
-
-        super(Hardware, self).populate()
-        data = self.responses[0]
-
-        xml_data = ET.fromstring(data.encode('utf8'))
-
-        self.facts['cpu_arch'] = self.parse_cpu_arch(xml_data)
-
-        data = self.responses[1]
-        match = self.parse_memory(data)
-        if match:
-            self.facts['memtotal_mb'] = int(match[0]) // 1024
-            self.facts['memfree_mb'] = int(match[2]) // 1024
-
-    def parse_cpu_arch(self, data):
-        cpu_arch = data.find('./data/system-sw-state/sw-version/cpu-arch')
-        if cpu_arch is not None:
-            return cpu_arch.text
-        else:
-            return ""
-
-    def parse_memory(self, data):
-        return re.findall(r'(\d+)', data, re.M)
-
-
-class Config(FactsBase):
-
-    COMMANDS = ['show running-config']
-
-    def populate(self):
-        super(Config, self).populate()
-        self.facts['config'] = self.responses[0]
-
-
-class Interfaces(FactsBase):
-
-    COMMANDS = [
-        'show interface | display-xml',
-        'show lldp neighbors | display-xml'
-    ]
-
-    def __init__(self, module):
-        self.intf_facts = dict()
-        self.lldp_facts = dict()
-        super(Interfaces, self).__init__(module)
-
-    def populate(self):
-        super(Interfaces, self).populate()
-        self.facts['all_ipv4_addresses'] = list()
-        self.facts['all_ipv6_addresses'] = list()
-
-        int_show_data = (self.responses[0]).splitlines()
-        pattern = '?xml version'
-        data = ''
-        skip = True
-
-        # The output returns multiple xml trees
-        # parse them before handling.
-        for line in int_show_data:
-            if pattern in line:
-                if skip is False:
-                    xml_data = ET.fromstring(data.encode('utf8'))
-                    self.populate_interfaces(xml_data)
-                    data = ''
-                else:
-                    skip = False
-
-            data += line
-
-        if skip is False:
-            xml_data = ET.fromstring(data.encode('utf8'))
-            self.populate_interfaces(xml_data)
-
-        self.facts['interfaces'] = self.intf_facts
-
-        lldp_data = (self.responses[1]).splitlines()
-        data = ''
-        skip = True
-        # The output returns multiple xml trees
-        # parse them before handling.
-        for line in lldp_data:
-            if pattern in line:
-                if skip is False:
-                    xml_data = ET.fromstring(data.encode('utf8'))
-                    self.populate_neighbors(xml_data)
-                    data = ''
-                else:
-                    skip = False
-
-            data += line
-
-        if skip is False:
-            xml_data = ET.fromstring(data.encode('utf8'))
-            self.populate_neighbors(xml_data)
-
-        self.facts['neighbors'] = self.lldp_facts
-
-    def populate_interfaces(self, interfaces):
-
-        for interface in interfaces.findall('./data/interfaces/interface'):
-            intf = dict()
-            name = self.parse_item(interface, 'name')
-
-            intf['description'] = self.parse_item(interface, 'description')
-            intf['duplex'] = self.parse_item(interface, 'duplex')
-            intf['primary_ipv4'] = self.parse_primary_ipv4(interface)
-            intf['secondary_ipv4'] = self.parse_secondary_ipv4(interface)
-            intf['ipv6'] = self.parse_ipv6_address(interface)
-            intf['mtu'] = self.parse_item(interface, 'mtu')
-            intf['type'] = self.parse_item(interface, 'type')
-
-            self.intf_facts[name] = intf
-
-        for interface in interfaces.findall('./bulk/data/interface'):
-            name = self.parse_item(interface, 'name')
-            try:
-                intf = self.intf_facts[name]
-                intf['bandwidth'] = self.parse_item(interface, 'speed')
-                intf['adminstatus'] = self.parse_item(interface, 'admin-status')
-                intf['operstatus'] = self.parse_item(interface, 'oper-status')
-                intf['macaddress'] = self.parse_item(interface, 'phys-address')
-            except KeyError:
-                # skip the reserved interfaces
-                pass
-
-        for interface in interfaces.findall('./data/ports/ports-state/port'):
-            name = self.parse_item(interface, 'name')
-            # media-type name interface name format phy-eth 1/1/1
-            mediatype = self.parse_item(interface, 'media-type')
-
-            typ, sname = name.split('-eth')
-            name = "ethernet" + sname
-            try:
-                intf = self.intf_facts[name]
-                intf['mediatype'] = mediatype
-            except Exception:
-                # fanout
-                for subport in range(1, 5):
-                    name = "ethernet" + sname + ":" + str(subport)
-                    try:
-                        intf = self.intf_facts[name]
-                        intf['mediatype'] = mediatype
-                    except Exception:
-                        # valid case to handle 2x50G
-                        pass
-
-    def add_ip_address(self, address, family):
-        if family == 'ipv4':
-            self.facts['all_ipv4_addresses'].append(address)
-        else:
-            self.facts['all_ipv6_addresses'].append(address)
-
-    def parse_item(self, interface, item):
-        elem = interface.find(item)
-        if elem is not None:
-            return elem.text
-        else:
-            return ""
-
-    def parse_primary_ipv4(self, interface):
-        ipv4 = interface.find('ipv4')
-        ip_address = ""
-        if ipv4 is not None:
-            prim_ipaddr = ipv4.find('./address/primary-addr')
-            if prim_ipaddr is not None:
-                ip_address = prim_ipaddr.text
-                self.add_ip_address(ip_address, 'ipv4')
-
-        return ip_address
-
-    def parse_secondary_ipv4(self, interface):
-        ipv4 = interface.find('ipv4')
-        ip_address = ""
-        if ipv4 is not None:
-            sec_ipaddr = ipv4.find('./address/secondary-addr')
-            if sec_ipaddr is not None:
-                ip_address = sec_ipaddr.text
-                self.add_ip_address(ip_address, 'ipv4')
-
-        return ip_address
-
-    def parse_ipv6_address(self, interface):
-
-        ip_address = list()
-
-        for addr in interface.findall('./ipv6/ipv6-addresses/address'):
-
-            ipv6_addr = addr.find('./ipv6-address')
-
-            if ipv6_addr is not None:
-                ip_address.append(ipv6_addr.text)
-                self.add_ip_address(ipv6_addr.text, 'ipv6')
-
-        return ip_address
-
-    def populate_neighbors(self, interfaces):
-        for interface in interfaces.findall('./bulk/data/interface'):
-            name = interface.find('name').text
-            rem_sys_name = interface.find('./lldp-rem-neighbor-info/info/rem-system-name')
-            if rem_sys_name is not None:
-                self.lldp_facts[name] = list()
-                fact = dict()
-                fact['host'] = rem_sys_name.text
-                rem_sys_port = interface.find('./lldp-rem-neighbor-info/info/rem-lldp-port-id')
-                fact['port'] = rem_sys_port.text
-                self.lldp_facts[name].append(fact)
-
-
-FACT_SUBSETS = dict(
-    default=Default,
-    hardware=Hardware,
-    interfaces=Interfaces,
-    config=Config,
-)
-
-VALID_SUBSETS = frozenset(FACT_SUBSETS.keys())
-
-
-def main():
-    """main entry point for module execution
-    """
-    argument_spec = dict(
-        gather_subset=dict(default=['!config'], type='list')
-    )
-
-    argument_spec.update(dellos10_argument_spec)
-
-    module = AnsibleModule(argument_spec=argument_spec,
-                           supports_check_mode=True)
-
-    gather_subset = module.params['gather_subset']
-
-    runable_subsets = set()
-    exclude_subsets = set()
-
-    for subset in gather_subset:
-        if subset == 'all':
-            runable_subsets.update(VALID_SUBSETS)
-            continue
-
-        if subset.startswith('!'):
-            subset = subset[1:]
-            if subset == 'all':
-                exclude_subsets.update(VALID_SUBSETS)
-                continue
-            exclude = True
-        else:
-            exclude = False
-
-        if subset not in VALID_SUBSETS:
-            module.fail_json(msg='Bad subset')
-
-        if exclude:
-            exclude_subsets.add(subset)
-        else:
-            runable_subsets.add(subset)
-
-    if not runable_subsets:
-        runable_subsets.update(VALID_SUBSETS)
-
-    runable_subsets.difference_update(exclude_subsets)
-    runable_subsets.add('default')
-
-    facts = dict()
-    facts['gather_subset'] = list(runable_subsets)
-
-    instances = list()
-    for key in runable_subsets:
-        instances.append(FACT_SUBSETS[key](module))
-
-    for inst in instances:
-        inst.populate()
-        facts.update(inst.facts)
-
-    ansible_facts = dict()
-    for key, value in iteritems(facts):
-        key = 'ansible_net_%s' % key
-        ansible_facts[key] = value
-
-    warnings = list()
-    check_args(module, warnings)
-
-    module.exit_json(ansible_facts=ansible_facts, warnings=warnings)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/lib/ansible/plugins/action/dellos10.py b/lib/ansible/plugins/action/dellos10.py
deleted file mode 100644
index 9f2fe6c360..0000000000
--- a/lib/ansible/plugins/action/dellos10.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# (c) 2016 Red Hat Inc.
-#
-# (c) 2017 Dell EMC.
-#
-# 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 sys
-import copy
-
-from ansible import constants as C
-from ansible.plugins.action.network import ActionModule as ActionNetworkModule
-from ansible.module_utils.network.common.utils import load_provider
-from ansible.module_utils.network.dellos10.dellos10 import dellos10_provider_spec
-from ansible.utils.display import Display
-
-display = Display()
-
-
-class ActionModule(ActionNetworkModule):
-
-    def run(self, tmp=None, task_vars=None):
-        del tmp  # tmp no longer has any effect
-
-        module_name = self._task.action.split('.')[-1]
-        self._config_module = True if module_name == 'dellos10_config' else False
-        persistent_connection = self._play_context.connection.split('.')[-1]
-
-        if persistent_connection == 'network_cli':
-            provider = self._task.args.get('provider', {})
-            if any(provider.values()):
-                display.warning('provider is unnecessary when using network_cli and will be ignored')
-                del self._task.args['provider']
-        elif self._play_context.connection == 'local':
-            provider = load_provider(dellos10_provider_spec, self._task.args)
-            pc = copy.deepcopy(self._play_context)
-            pc.connection = 'network_cli'
-            pc.network_os = 'dellos10'
-            pc.remote_addr = provider['host'] or self._play_context.remote_addr
-            pc.port = int(provider['port'] or self._play_context.port or 22)
-            pc.remote_user = provider['username'] or self._play_context.connection_user
-            pc.password = provider['password'] or self._play_context.password
-            pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
-            command_timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
-            pc.become = provider['authorize'] or False
-            if pc.become:
-                pc.become_method = 'enable'
-            pc.become_pass = provider['auth_pass']
-
-            display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
-            connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin, task_uuid=self._task._uuid)
-            connection.set_options(direct={'persistent_command_timeout': command_timeout})
-
-            socket_path = connection.run()
-            display.vvvv('socket_path: %s' % socket_path, pc.remote_addr)
-            if not socket_path:
-                return {'failed': True,
-                        'msg': 'unable to open shell. Please see: ' +
-                               'https://docs.ansible.com/ansible/network_debug_troubleshooting.html#unable-to-open-shell'}
-
-            task_vars['ansible_socket'] = socket_path
-
-        result = super(ActionModule, self).run(task_vars=task_vars)
-        return result
diff --git a/lib/ansible/plugins/cliconf/dellos10.py b/lib/ansible/plugins/cliconf/dellos10.py
deleted file mode 100644
index 85ea17ab4d..0000000000
--- a/lib/ansible/plugins/cliconf/dellos10.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# (c) 2017 Red Hat Inc.
-#
-# (c) 2017 Dell EMC.
-#
-# 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
-
-DOCUMENTATION = """
----
-cliconf: dellos10
-short_description: Use dellos10 cliconf to run command on Dell OS10 platform
-description:
-  - This dellos10 plugin provides low level abstraction apis for
-    sending and receiving CLI commands from Dell OS10 network devices.
-version_added: 2.5
-"""
-
-import re
-import json
-
-from itertools import chain
-
-from ansible.errors import AnsibleConnectionFailure
-from ansible.module_utils._text import to_bytes, to_text
-from ansible.module_utils.common._collections_compat import Mapping
-from ansible.module_utils.network.common.utils import to_list
-from ansible.plugins.cliconf import CliconfBase, enable_mode
-
-
-class Cliconf(CliconfBase):
-
-    def get_device_info(self):
-        device_info = {}
-
-        device_info['network_os'] = 'dellos10'
-        reply = self.get('show version')
-        data = to_text(reply, errors='surrogate_or_strict').strip()
-
-        match = re.search(r'OS Version (\S+)', data)
-        if match:
-            device_info['network_os_version'] = match.group(1)
-
-        match = re.search(r'System Type (\S+)', data, re.M)
-        if match:
-            device_info['network_os_model'] = match.group(1)
-
-        reply = self.get('show running-configuration | grep hostname')
-        data = to_text(reply, errors='surrogate_or_strict').strip()
-        match = re.search(r'^hostname (.+)', data, re.M)
-        if match:
-            device_info['network_os_hostname'] = match.group(1)
-
-        return device_info
-
-    @enable_mode
-    def get_config(self, source='running', format='text', flags=None):
-        if source not in ('running', 'startup'):
-            return self.invalid_params("fetching configuration from %s is not supported" % source)
-        if source == 'running':
-            cmd = 'show running-config all'
-        else:
-            cmd = 'show startup-config'
-        return self.send_command(cmd)
-
-    @enable_mode
-    def edit_config(self, command):
-        for cmd in chain(['configure terminal'], to_list(command), ['end']):
-            self.send_command(to_bytes(cmd))
-
-    def get(self, command, prompt=None, answer=None, sendonly=False, newline=True, check_all=False):
-        return self.send_command(command=command, prompt=prompt, answer=answer, sendonly=sendonly, newline=newline, check_all=check_all)
-
-    def get_capabilities(self):
-        result = super(Cliconf, self).get_capabilities()
-        return json.dumps(result)
-
-    def run_commands(self, commands=None, check_rc=True):
-        if commands is None:
-            raise ValueError("'commands' value is required")
-
-        responses = list()
-        for cmd in to_list(commands):
-            if not isinstance(cmd, Mapping):
-                cmd = {'command': cmd}
-
-            output = cmd.pop('output', None)
-            if output:
-                raise ValueError("'output' value %s is not supported for run_commands" % output)
-
-            try:
-                out = self.send_command(**cmd)
-            except AnsibleConnectionFailure as e:
-                if check_rc:
-                    raise
-                out = getattr(e, 'err', to_text(e))
-
-            responses.append(out)
-
-        return responses
-
-    def set_cli_prompt_context(self):
-        """
-        Make sure we are in the operational cli mode
-        :return: None
-        """
-        if self._connection.connected:
-            self._update_cli_prompt_context(config_context=')#')
diff --git a/lib/ansible/plugins/doc_fragments/dellos10.py b/lib/ansible/plugins/doc_fragments/dellos10.py
deleted file mode 100644
index e65e53cdc3..0000000000
--- a/lib/ansible/plugins/doc_fragments/dellos10.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2015, Peter Sprygada <psprygada@ansible.com>
-# Copyright: (c) 2016, Dell Inc.
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-
-class ModuleDocFragment(object):
-
-    # Standard files documentation fragment
-    DOCUMENTATION = r'''
-options:
-  provider:
-    description:
-      - A dict object containing connection details.
-    type: dict
-    suboptions:
-      host:
-        description:
-          - Specifies the DNS host name or address for connecting to the remote
-            device over the specified transport.  The value of host is used as
-            the destination address for the transport.
-        type: str
-        required: true
-      port:
-        description:
-          - Specifies the port to use when building the connection to the remote
-            device.
-        type: int
-        default: 22
-      username:
-        description:
-          - User to authenticate the SSH session to the remote device. If the
-            value is not specified in the task, the value of environment variable
-            C(ANSIBLE_NET_USERNAME) will be used instead.
-        type: str
-      password:
-        description:
-          - Password to authenticate the SSH session to the remote device. If the
-            value is not specified in the task, the value of environment variable
-            C(ANSIBLE_NET_PASSWORD) will be used instead.
-        type: str
-      ssh_keyfile:
-        description:
-          - Path to an ssh key used to authenticate the SSH session to the remote
-            device.  If the value is not specified in the task, the value of
-            environment variable C(ANSIBLE_NET_SSH_KEYFILE) will be used instead.
-        type: path
-      timeout:
-        description:
-          - Specifies idle timeout (in seconds) for the connection. Useful if the
-            console freezes before continuing. For example when saving
-            configurations.
-        type: int
-        default: 10
-notes:
-  - For more information on using Ansible to manage Dell EMC Network devices see U(https://www.ansible.com/ansible-dell-networking).
-'''
diff --git a/lib/ansible/plugins/terminal/dellos10.py b/lib/ansible/plugins/terminal/dellos10.py
deleted file mode 100644
index e35693f11b..0000000000
--- a/lib/ansible/plugins/terminal/dellos10.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# (c) 2016 Red Hat Inc.
-#
-# This file is part of Ansible
-#
-# Copyright (c) 2017 Dell Inc.
-#
-# 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 re
-import json
-
-from ansible.module_utils._text import to_text, to_bytes
-from ansible.plugins.terminal import TerminalBase
-from ansible.errors import AnsibleConnectionFailure
-
-
-class TerminalModule(TerminalBase):
-
-    terminal_stdout_re = [
-        re.compile(br"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:#) ?$"),
-        re.compile(br"\[\w+\@[\w\-\.]+(?: [^\]])\] ?[>#\$] ?$")
-    ]
-
-    terminal_stderr_re = [
-        re.compile(br"% ?Error"),
-        re.compile(br"% ?Bad secret"),
-        re.compile(br"Syntax error:"),
-        re.compile(br"invalid input", re.I),
-        re.compile(br"(?:incomplete|ambiguous) command", re.I),
-        re.compile(br"connection timed out", re.I),
-        re.compile(br"[^\r\n]+ not found", re.I),
-        re.compile(br"'[^']' +returned error code: ?\d+"),
-    ]
-
-    def on_open_shell(self):
-        try:
-            self._exec_cli_command(b'terminal length 0')
-        except AnsibleConnectionFailure:
-            raise AnsibleConnectionFailure('unable to set terminal parameters')
-
-    def on_become(self, passwd=None):
-        if self._get_prompt().endswith(b'#'):
-            return
-
-        cmd = {u'command': u'enable'}
-        if passwd:
-            cmd[u'prompt'] = to_text(r"[\r\n]?password: $", errors='surrogate_or_strict')
-            cmd[u'answer'] = passwd
-
-        try:
-            self._exec_cli_command(to_bytes(json.dumps(cmd), errors='surrogate_or_strict'))
-        except AnsibleConnectionFailure:
-            raise AnsibleConnectionFailure('unable to elevate privilege to enable mode')
-
-    def on_unbecome(self):
-        prompt = self._get_prompt()
-        if prompt is None:
-            # if prompt is None most likely the terminal is hung up at a prompt
-            return
-
-        if prompt.strip().endswith(b')#'):
-            self._exec_cli_command(b'end')
-            self._exec_cli_command(b'disable')
-
-        elif prompt.endswith(b'#'):
-            self._exec_cli_command(b'disable')