Flatten the directory hierarchy of modules (#68966)

* Flatten the directory hierarchy of modules

* Update ignore.txt, flatten units

* Update imports

* Completely flatten the modules directory

* Update sanity ignore

* Fix some sanity test ignores

* Fix relative import

* Fix docs builds without category

* ci_complete

* Clean up docs. ci_complete

* Adjust needs/file alias

* ci_complete

* fix hardcoded ping module paths

Co-authored-by: Matt Davis <mrd@redhat.com>

changelogs/fragments/flatten-modules.yml

@@ -0,0 +1,2 @@
+minor_changes:
+- Flatten the directory hierarchy of modules

docs/templates/list_of_CATEGORY_modules.rst.j2

@@ -1,10 +1,19 @@
 {# avoids rST "isn't included in any toctree" errors for module docs #}
 :orphan:
 
+{% if title %}
 .. _@{ title.lower() + '_' + plugin_type + 's' }@:
+{% else %}
+.. _@{ plugin_type + 's' }@:
+{% endif %}
 
+{% if title %}
 @{ title }@ @{ plugin_type + 's' }@
 @{ '`' * title | length }@````````
+{% else %}
+@{ plugin_type + 's' }@
+```````
+{% endif %}
 
 {% if blurb %}
 @{ blurb }@

docs/templates/modules_by_category.rst.j2

@@ -10,5 +10,8 @@ Module Index
 .. toctree:: :maxdepth: 1
 
 {% for name in categories %}
+{# strip out empty category names as a result flattening the dir structure #}
+{% if name %}
    list_of_@{ name }@_modules
+{% endif %}
 {% endfor %}

lib/ansible/modules/setup.py

@@ -133,7 +133,7 @@ EXAMPLES = """
 """
 
 # import module snippets
-from ...module_utils.basic import AnsibleModule
+from ..module_utils.basic import AnsibleModule
 
 from ansible.module_utils.facts.namespace import PrefixFactNamespace
 from ansible.module_utils.facts import ansible_collector

test/integration/targets/infra/aliases

@@ -1,3 +1,3 @@
 shippable/posix/group3
 needs/file/hacking/test-module.py
-needs/file/lib/ansible/modules/system/ping.py
+needs/file/lib/ansible/modules/ping.py

test/integration/targets/infra/runme.sh

@@ -24,7 +24,7 @@ echo "$PB_OUT" | grep -F "assert works (True)" || exit 1
 
 set -e
 
-PING_MODULE_PATH="../../../../lib/ansible/modules/system/ping.py"
+PING_MODULE_PATH="../../../../lib/ansible/modules/ping.py"
 
 # ensure test-module.py script works without passing Python interpreter path
 ../../../../hacking/test-module.py -m "$PING_MODULE_PATH"
@@ -36,4 +36,4 @@ PING_MODULE_PATH="../../../../lib/ansible/modules/system/ping.py"
 ../../../../hacking/test-module.py -m library/test.py -I ansible_python_interpreter="$(which python)" <<< '{"ANSIBLE_MODULE_ARGS": {}}'
 
 # ensure exercising module code locally works
-python -m ansible.modules.files.file  <<< '{"ANSIBLE_MODULE_ARGS": {"path": "/path/to/file", "state": "absent"}}'
+python -m ansible.modules.file  <<< '{"ANSIBLE_MODULE_ARGS": {"path": "/path/to/file", "state": "absent"}}'

test/lib/ansible_test/_data/sanity/import/importer.py

@@ -206,7 +206,7 @@ def main():
         is_ansible_module = (path.startswith('lib/ansible/modules/') or path.startswith('plugins/modules/')) and os.path.basename(path) != '__init__.py'
         run_main = is_ansible_module
 
-        if path == 'lib/ansible/modules/utilities/logic/async_wrapper.py':
+        if path == 'lib/ansible/modules/async_wrapper.py':
             # async_wrapper is a non-standard Ansible module (does not use AnsibleModule) so we cannot test the main function
             run_main = False
 

test/lib/ansible_test/_data/sanity/pylint/plugins/blacklist.py

@@ -125,7 +125,7 @@ class AnsibleBlacklistChecker(BaseChecker):
         'sys.exit': BlacklistEntry('exit_json or fail_json',
                                    ignore_paths=(
                                        '/lib/ansible/module_utils/basic.py',
-                                       '/lib/ansible/modules/utilities/logic/async_wrapper.py',
+                                       '/lib/ansible/modules/async_wrapper.py',
                                        '/lib/ansible/module_utils/common/removed.py',
                                    ),
                                    modules_only=True),

test/sanity/ignore.txt

@@ -107,115 +107,115 @@ lib/ansible/module_utils/urls.py pylint:blacklisted-name
 lib/ansible/module_utils/urls.py replace-urlopen
 lib/ansible/module_utils/yumdnf.py future-import-boilerplate
 lib/ansible/module_utils/yumdnf.py metaclass-boilerplate
-lib/ansible/modules/commands/command.py validate-modules:doc-missing-type
+lib/ansible/modules/command.py validate-modules:doc-missing-type
-lib/ansible/modules/commands/command.py validate-modules:nonexistent-parameter-documented
+lib/ansible/modules/command.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/commands/command.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/command.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/commands/command.py validate-modules:undocumented-parameter
+lib/ansible/modules/command.py validate-modules:undocumented-parameter
-lib/ansible/modules/commands/expect.py validate-modules:doc-missing-type
+lib/ansible/modules/expect.py validate-modules:doc-missing-type
-lib/ansible/modules/files/assemble.py validate-modules:nonexistent-parameter-documented
+lib/ansible/modules/assemble.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/files/blockinfile.py validate-modules:doc-choices-do-not-match-spec
+lib/ansible/modules/blockinfile.py validate-modules:doc-choices-do-not-match-spec
-lib/ansible/modules/files/blockinfile.py validate-modules:doc-default-does-not-match-spec
+lib/ansible/modules/blockinfile.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/files/copy.py pylint:blacklisted-name
+lib/ansible/modules/copy.py pylint:blacklisted-name
-lib/ansible/modules/files/copy.py validate-modules:doc-default-does-not-match-spec
+lib/ansible/modules/copy.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/files/copy.py validate-modules:doc-type-does-not-match-spec
+lib/ansible/modules/copy.py validate-modules:doc-type-does-not-match-spec
-lib/ansible/modules/files/copy.py validate-modules:nonexistent-parameter-documented
+lib/ansible/modules/copy.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/files/copy.py validate-modules:undocumented-parameter
+lib/ansible/modules/copy.py validate-modules:undocumented-parameter
-lib/ansible/modules/files/file.py pylint:ansible-bad-function
+lib/ansible/modules/file.py pylint:ansible-bad-function
-lib/ansible/modules/files/file.py validate-modules:doc-default-does-not-match-spec
+lib/ansible/modules/file.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/files/file.py validate-modules:undocumented-parameter
+lib/ansible/modules/file.py validate-modules:undocumented-parameter
-lib/ansible/modules/files/find.py use-argspec-type-path # fix needed
+lib/ansible/modules/find.py use-argspec-type-path # fix needed
-lib/ansible/modules/files/find.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/find.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/files/find.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/find.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/files/lineinfile.py validate-modules:doc-choices-do-not-match-spec
+lib/ansible/modules/lineinfile.py validate-modules:doc-choices-do-not-match-spec
-lib/ansible/modules/files/lineinfile.py validate-modules:doc-default-does-not-match-spec
+lib/ansible/modules/lineinfile.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/files/lineinfile.py validate-modules:nonexistent-parameter-documented
+lib/ansible/modules/lineinfile.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/files/replace.py validate-modules:nonexistent-parameter-documented
+lib/ansible/modules/replace.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/files/stat.py validate-modules:parameter-invalid
+lib/ansible/modules/stat.py validate-modules:parameter-invalid
-lib/ansible/modules/files/stat.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/stat.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/files/stat.py validate-modules:undocumented-parameter
+lib/ansible/modules/stat.py validate-modules:undocumented-parameter
-lib/ansible/modules/files/unarchive.py validate-modules:nonexistent-parameter-documented
+lib/ansible/modules/unarchive.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/files/unarchive.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/unarchive.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/net_tools/basics/get_url.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/get_url.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/net_tools/basics/uri.py pylint:blacklisted-name
+lib/ansible/modules/uri.py pylint:blacklisted-name
-lib/ansible/modules/net_tools/basics/uri.py validate-modules:doc-required-mismatch
+lib/ansible/modules/uri.py validate-modules:doc-required-mismatch
-lib/ansible/modules/net_tools/basics/uri.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/uri.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/net_tools/basics/uri.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/uri.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/packaging/language/pip.py pylint:blacklisted-name
+lib/ansible/modules/pip.py pylint:blacklisted-name
-lib/ansible/modules/packaging/language/pip.py validate-modules:doc-elements-mismatch
+lib/ansible/modules/pip.py validate-modules:doc-elements-mismatch
-lib/ansible/modules/packaging/language/pip.py validate-modules:invalid-ansiblemodule-schema
+lib/ansible/modules/pip.py validate-modules:invalid-ansiblemodule-schema
-lib/ansible/modules/packaging/os/apt.py validate-modules:doc-default-does-not-match-spec
+lib/ansible/modules/apt.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/packaging/os/apt.py validate-modules:parameter-invalid
+lib/ansible/modules/apt.py validate-modules:parameter-invalid
-lib/ansible/modules/packaging/os/apt.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/apt.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/packaging/os/apt.py validate-modules:undocumented-parameter
+lib/ansible/modules/apt.py validate-modules:undocumented-parameter
-lib/ansible/modules/packaging/os/apt_key.py validate-modules:mutually_exclusive-unknown
+lib/ansible/modules/apt_key.py validate-modules:mutually_exclusive-unknown
-lib/ansible/modules/packaging/os/apt_key.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/apt_key.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/packaging/os/apt_key.py validate-modules:undocumented-parameter
+lib/ansible/modules/apt_key.py validate-modules:undocumented-parameter
-lib/ansible/modules/packaging/os/apt_repository.py validate-modules:doc-default-does-not-match-spec
+lib/ansible/modules/apt_repository.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/packaging/os/apt_repository.py validate-modules:parameter-invalid
+lib/ansible/modules/apt_repository.py validate-modules:parameter-invalid
-lib/ansible/modules/packaging/os/apt_repository.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/apt_repository.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/packaging/os/apt_repository.py validate-modules:undocumented-parameter
+lib/ansible/modules/apt_repository.py validate-modules:undocumented-parameter
-lib/ansible/modules/packaging/os/dnf.py validate-modules:doc-missing-type
+lib/ansible/modules/dnf.py validate-modules:doc-missing-type
-lib/ansible/modules/packaging/os/dnf.py validate-modules:doc-required-mismatch
+lib/ansible/modules/dnf.py validate-modules:doc-required-mismatch
-lib/ansible/modules/packaging/os/dnf.py validate-modules:parameter-invalid
+lib/ansible/modules/dnf.py validate-modules:parameter-invalid
-lib/ansible/modules/packaging/os/dnf.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/dnf.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/packaging/os/dnf.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/dnf.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/packaging/os/dpkg_selections.py validate-modules:doc-missing-type
+lib/ansible/modules/dpkg_selections.py validate-modules:doc-missing-type
-lib/ansible/modules/packaging/os/dpkg_selections.py validate-modules:doc-required-mismatch
+lib/ansible/modules/dpkg_selections.py validate-modules:doc-required-mismatch
-lib/ansible/modules/packaging/os/package_facts.py validate-modules:doc-choices-do-not-match-spec
+lib/ansible/modules/package_facts.py validate-modules:doc-choices-do-not-match-spec
-lib/ansible/modules/packaging/os/package_facts.py validate-modules:doc-missing-type
+lib/ansible/modules/package_facts.py validate-modules:doc-missing-type
-lib/ansible/modules/packaging/os/package_facts.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/package_facts.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/packaging/os/package_facts.py validate-modules:return-syntax-error
+lib/ansible/modules/package_facts.py validate-modules:return-syntax-error
-lib/ansible/modules/packaging/os/rpm_key.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/rpm_key.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/packaging/os/yum.py pylint:blacklisted-name
+lib/ansible/modules/yum.py pylint:blacklisted-name
-lib/ansible/modules/packaging/os/yum.py validate-modules:doc-default-does-not-match-spec
+lib/ansible/modules/yum.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/packaging/os/yum.py validate-modules:doc-missing-type
+lib/ansible/modules/yum.py validate-modules:doc-missing-type
-lib/ansible/modules/packaging/os/yum.py validate-modules:parameter-invalid
+lib/ansible/modules/yum.py validate-modules:parameter-invalid
-lib/ansible/modules/packaging/os/yum.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/yum.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/packaging/os/yum.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/yum.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/packaging/os/yum.py validate-modules:undocumented-parameter
+lib/ansible/modules/yum.py validate-modules:undocumented-parameter
-lib/ansible/modules/packaging/os/yum_repository.py validate-modules:doc-default-does-not-match-spec
+lib/ansible/modules/yum_repository.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/packaging/os/yum_repository.py validate-modules:doc-missing-type
+lib/ansible/modules/yum_repository.py validate-modules:doc-missing-type
-lib/ansible/modules/packaging/os/yum_repository.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/yum_repository.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/packaging/os/yum_repository.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/yum_repository.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/packaging/os/yum_repository.py validate-modules:undocumented-parameter
+lib/ansible/modules/yum_repository.py validate-modules:undocumented-parameter
-lib/ansible/modules/source_control/git.py pylint:blacklisted-name
+lib/ansible/modules/git.py pylint:blacklisted-name
-lib/ansible/modules/source_control/git.py use-argspec-type-path
+lib/ansible/modules/git.py use-argspec-type-path
-lib/ansible/modules/source_control/git.py validate-modules:doc-missing-type
+lib/ansible/modules/git.py validate-modules:doc-missing-type
-lib/ansible/modules/source_control/git.py validate-modules:doc-required-mismatch
+lib/ansible/modules/git.py validate-modules:doc-required-mismatch
-lib/ansible/modules/source_control/git.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/git.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/source_control/git.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/git.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/source_control/subversion.py validate-modules:doc-required-mismatch
+lib/ansible/modules/subversion.py validate-modules:doc-required-mismatch
-lib/ansible/modules/source_control/subversion.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/subversion.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/source_control/subversion.py validate-modules:undocumented-parameter
+lib/ansible/modules/subversion.py validate-modules:undocumented-parameter
-lib/ansible/modules/system/getent.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/getent.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/system/hostname.py validate-modules:invalid-ansiblemodule-schema
+lib/ansible/modules/hostname.py validate-modules:invalid-ansiblemodule-schema
-lib/ansible/modules/system/hostname.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/hostname.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/system/iptables.py pylint:blacklisted-name
+lib/ansible/modules/iptables.py pylint:blacklisted-name
-lib/ansible/modules/system/iptables.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/iptables.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/system/known_hosts.py validate-modules:doc-default-does-not-match-spec
+lib/ansible/modules/known_hosts.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/system/known_hosts.py validate-modules:doc-missing-type
+lib/ansible/modules/known_hosts.py validate-modules:doc-missing-type
-lib/ansible/modules/system/known_hosts.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/known_hosts.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/system/service.py validate-modules:nonexistent-parameter-documented
+lib/ansible/modules/service.py validate-modules:nonexistent-parameter-documented
-lib/ansible/modules/system/service.py validate-modules:use-run-command-not-popen
+lib/ansible/modules/service.py validate-modules:use-run-command-not-popen
-lib/ansible/modules/system/setup.py validate-modules:doc-missing-type
+lib/ansible/modules/setup.py validate-modules:doc-missing-type
-lib/ansible/modules/system/setup.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/setup.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/system/setup.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/setup.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/system/systemd.py validate-modules:parameter-invalid
+lib/ansible/modules/systemd.py validate-modules:parameter-invalid
-lib/ansible/modules/system/systemd.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/systemd.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/system/systemd.py validate-modules:return-syntax-error
+lib/ansible/modules/systemd.py validate-modules:return-syntax-error
-lib/ansible/modules/system/sysvinit.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/sysvinit.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/system/sysvinit.py validate-modules:parameter-type-not-in-doc
+lib/ansible/modules/sysvinit.py validate-modules:parameter-type-not-in-doc
-lib/ansible/modules/system/sysvinit.py validate-modules:return-syntax-error
+lib/ansible/modules/sysvinit.py validate-modules:return-syntax-error
-lib/ansible/modules/system/user.py validate-modules:doc-default-does-not-match-spec
+lib/ansible/modules/user.py validate-modules:doc-default-does-not-match-spec
-lib/ansible/modules/system/user.py validate-modules:doc-default-incompatible-type
+lib/ansible/modules/user.py validate-modules:doc-default-incompatible-type
-lib/ansible/modules/system/user.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/user.py validate-modules:parameter-list-no-elements
-lib/ansible/modules/system/user.py validate-modules:use-run-command-not-popen
+lib/ansible/modules/user.py validate-modules:use-run-command-not-popen
-lib/ansible/modules/utilities/logic/async_status.py use-argspec-type-path
+lib/ansible/modules/async_status.py use-argspec-type-path
-lib/ansible/modules/utilities/logic/async_status.py validate-modules!skip
+lib/ansible/modules/async_status.py validate-modules!skip
-lib/ansible/modules/utilities/logic/async_wrapper.py ansible-doc!skip  # not an actual module
+lib/ansible/modules/async_wrapper.py ansible-doc!skip  # not an actual module
-lib/ansible/modules/utilities/logic/async_wrapper.py pylint:ansible-bad-function
+lib/ansible/modules/async_wrapper.py pylint:ansible-bad-function
-lib/ansible/modules/utilities/logic/async_wrapper.py use-argspec-type-path
+lib/ansible/modules/async_wrapper.py use-argspec-type-path
-lib/ansible/modules/utilities/logic/wait_for.py validate-modules:parameter-list-no-elements
+lib/ansible/modules/wait_for.py validate-modules:parameter-list-no-elements
 lib/ansible/parsing/vault/__init__.py pylint:blacklisted-name
 lib/ansible/playbook/base.py pylint:blacklisted-name
 lib/ansible/playbook/collectionsearch.py required-and-default-attributes  # https://github.com/ansible/ansible/issues/61460
@@ -500,21 +500,21 @@ test/units/module_utils/urls/test_Request.py replace-urlopen
 test/units/module_utils/urls/test_fetch_url.py replace-urlopen
 test/units/modules/conftest.py future-import-boilerplate
 test/units/modules/conftest.py metaclass-boilerplate
-test/units/modules/files/test_copy.py future-import-boilerplate
+test/units/modules/test_copy.py future-import-boilerplate
-test/units/modules/packaging/language/test_pip.py future-import-boilerplate
+test/units/modules/test_pip.py future-import-boilerplate
-test/units/modules/packaging/language/test_pip.py metaclass-boilerplate
+test/units/modules/test_pip.py metaclass-boilerplate
-test/units/modules/packaging/os/test_apt.py future-import-boilerplate
+test/units/modules/test_apt.py future-import-boilerplate
-test/units/modules/packaging/os/test_apt.py metaclass-boilerplate
+test/units/modules/test_apt.py metaclass-boilerplate
-test/units/modules/packaging/os/test_apt.py pylint:blacklisted-name
+test/units/modules/test_apt.py pylint:blacklisted-name
-test/units/modules/packaging/os/test_yum.py future-import-boilerplate
+test/units/modules/test_yum.py future-import-boilerplate
-test/units/modules/packaging/os/test_yum.py metaclass-boilerplate
+test/units/modules/test_yum.py metaclass-boilerplate
-test/units/modules/system/test_iptables.py future-import-boilerplate
+test/units/modules/test_iptables.py future-import-boilerplate
-test/units/modules/system/test_iptables.py metaclass-boilerplate
+test/units/modules/test_iptables.py metaclass-boilerplate
-test/units/modules/system/test_known_hosts.py future-import-boilerplate
+test/units/modules/test_known_hosts.py future-import-boilerplate
-test/units/modules/system/test_known_hosts.py metaclass-boilerplate
+test/units/modules/test_known_hosts.py metaclass-boilerplate
-test/units/modules/system/test_known_hosts.py pylint:ansible-bad-function
+test/units/modules/test_known_hosts.py pylint:ansible-bad-function
-test/units/modules/system/test_systemd.py future-import-boilerplate
+test/units/modules/test_systemd.py future-import-boilerplate
-test/units/modules/system/test_systemd.py metaclass-boilerplate
+test/units/modules/test_systemd.py metaclass-boilerplate
 test/units/modules/utils.py future-import-boilerplate
 test/units/modules/utils.py metaclass-boilerplate
 test/units/parsing/utils/test_addresses.py future-import-boilerplate

test/units/modules/test_apt.py

@@ -5,7 +5,7 @@ from units.compat import mock
 from units.compat import unittest
 
 try:
-    from ansible.modules.packaging.os.apt import (
+    from ansible.modules.apt import (
         expand_pkgspec_from_fnmatches,
     )
 except Exception:

test/units/modules/test_copy.py

@@ -9,7 +9,7 @@ __metaclass__ = type
 
 import pytest
 
-from ansible.modules.files.copy import AnsibleModuleError, split_pre_existing_dir
+from ansible.modules.copy import AnsibleModuleError, split_pre_existing_dir
 
 from ansible.module_utils.basic import AnsibleModule
 

test/units/modules/test_iptables.py

@@ -1,6 +1,6 @@
 from units.compat.mock import patch
 from ansible.module_utils import basic
-from ansible.modules.system import iptables
+from ansible.modules import iptables
 from units.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args
 
 

test/units/modules/test_known_hosts.py

@@ -6,7 +6,7 @@ from units.compat import unittest
 from ansible.module_utils._text import to_bytes
 from ansible.module_utils.basic import AnsibleModule
 
-from ansible.modules.system.known_hosts import compute_diff, sanity_check
+from ansible.modules.known_hosts import compute_diff, sanity_check
 
 
 class KnownHostsDiffTestCase(unittest.TestCase):

test/units/modules/test_pip.py

@@ -4,7 +4,7 @@ import json
 
 import pytest
 
-from ansible.modules.packaging.language import pip
+from ansible.modules import pip
 
 
 pytestmark = pytest.mark.usefixtures('patch_ansible_module')

test/units/modules/test_systemd.py

@@ -1,6 +1,6 @@
 
 from units.compat import unittest
-from ansible.modules.system.systemd import parse_systemctl_show
+from ansible.modules.systemd import parse_systemctl_show
 
 
 class ParseSystemctlShowTestCase(unittest.TestCase):