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>

11 files changed, 7 insertions, 7 deletions

diff --git a/test/units/modules/packaging/__init__.py b/test/units/modules/packaging/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/units/modules/packaging/__init__.py
+++ /dev/null
diff --git a/test/units/modules/packaging/language/__init__.py b/test/units/modules/packaging/language/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/units/modules/packaging/language/__init__.py
+++ /dev/null
diff --git a/test/units/modules/packaging/os/__init__.py b/test/units/modules/packaging/os/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/units/modules/packaging/os/__init__.py
+++ /dev/null
diff --git a/test/units/modules/system/__init__.py b/test/units/modules/system/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/units/modules/system/__init__.py
+++ /dev/null
diff --git a/test/units/modules/packaging/os/test_apt.py b/test/units/modules/test_apt.py
index d003ec40f4..3e4303309f 100644
--- a/test/units/modules/packaging/os/test_apt.py
+++ b/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:
diff --git a/test/units/modules/files/test_copy.py b/test/units/modules/test_copy.py
index ff8f03818e..19cff255cc 100644
--- a/test/units/modules/files/test_copy.py
+++ b/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
 
diff --git a/test/units/modules/system/test_iptables.py b/test/units/modules/test_iptables.py
index 9cd5b2ed18..0dc734b564 100644
--- a/test/units/modules/system/test_iptables.py
+++ b/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
 
 
diff --git a/test/units/modules/system/test_known_hosts.py b/test/units/modules/test_known_hosts.py
index 962cf05f5b..9dbfc5ace8 100644
--- a/test/units/modules/system/test_known_hosts.py
+++ b/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):
diff --git a/test/units/modules/packaging/language/test_pip.py b/test/units/modules/test_pip.py
index 1ae3c16f73..5de82bb4a4 100644
--- a/test/units/modules/packaging/language/test_pip.py
+++ b/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')
diff --git a/test/units/modules/system/test_systemd.py b/test/units/modules/test_systemd.py
index 8471fd5c3b..29dc679c04 100644
--- a/test/units/modules/system/test_systemd.py
+++ b/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):
diff --git a/test/units/modules/packaging/os/test_yum.py b/test/units/modules/test_yum.py
index 6aa672d21f..38c06d3dc7 100644
--- a/test/units/modules/packaging/os/test_yum.py
+++ b/test/units/modules/test_yum.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from units.compat import unittest
 
-from ansible.modules.packaging.os.yum import YumModule
+from ansible.modules.yum import YumModule
 
 
 yum_plugin_load_error = """