multiple module utils: flatten directories (#11974)

* multiple module utils: flatten directories * adjust pritunl tests * adjust lxca and keycloak tests * adjust botmeta * rename test files correctly * and an import fix * rename pritunl api mod utils test * fix typo in test filename * rename references to pritunl api test * rename keycloak mod utils test
2026-05-06 21:32:49 +00:00 · 2026-05-06 17:07:51 +12:00
parent fb0541defb
commit 1047f45bec
84 changed files with 116 additions and 114 deletions
--- a/tests/unit/plugins/modules/test_bitbucket_access_key.py
+++ b/tests/unit/plugins/modules/test_bitbucket_access_key.py
@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
    set_module_args,
 )

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
 from ansible_collections.community.general.plugins.modules import bitbucket_access_key


--- a/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py
+++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_key_pair.py
@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
    set_module_args,
 )

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
 from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_key_pair


--- a/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py
+++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_known_host.py
@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
    set_module_args,
 )

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
 from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_known_host
 from ansible_collections.community.general.plugins.modules.bitbucket_pipeline_known_host import HAS_PARAMIKO

--- a/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py
+++ b/tests/unit/plugins/modules/test_bitbucket_pipeline_variable.py
@@ -13,7 +13,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
    set_module_args,
 )

-from ansible_collections.community.general.plugins.module_utils._source_control.bitbucket import BitbucketHelper
+from ansible_collections.community.general.plugins.module_utils._bitbucket import BitbucketHelper
 from ansible_collections.community.general.plugins.modules import bitbucket_pipeline_variable


--- a/tests/unit/plugins/modules/test_keycloak_authentication.py
+++ b/tests/unit/plugins/modules/test_keycloak_authentication.py
@@ -102,7 +102,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py
+++ b/tests/unit/plugins/modules/test_keycloak_authentication_required_actions.py
@@ -98,7 +98,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_client.py
+++ b/tests/unit/plugins/modules/test_keycloak_client.py
@@ -90,7 +90,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py
+++ b/tests/unit/plugins/modules/test_keycloak_client_rolemapping.py
@@ -119,7 +119,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_clientscope.py
+++ b/tests/unit/plugins/modules/test_keycloak_clientscope.py
@@ -124,7 +124,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_component.py
+++ b/tests/unit/plugins/modules/test_keycloak_component.py
@@ -69,7 +69,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_identity_provider.py
+++ b/tests/unit/plugins/modules/test_keycloak_identity_provider.py
@@ -122,7 +122,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_realm.py
+++ b/tests/unit/plugins/modules/test_keycloak_realm.py
@@ -81,7 +81,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_realm_info.py
+++ b/tests/unit/plugins/modules/test_keycloak_realm_info.py
@@ -78,7 +78,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_realm_keys.py
+++ b/tests/unit/plugins/modules/test_keycloak_realm_keys.py
@@ -78,7 +78,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py
+++ b/tests/unit/plugins/modules/test_keycloak_realm_keys_metadata_info.py
@@ -78,7 +78,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_realm_localization.py
+++ b/tests/unit/plugins/modules/test_keycloak_realm_localization.py
@@ -72,7 +72,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_role.py
+++ b/tests/unit/plugins/modules/test_keycloak_role.py
@@ -119,7 +119,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_user.py
+++ b/tests/unit/plugins/modules/test_keycloak_user.py
@@ -91,7 +91,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py
+++ b/tests/unit/plugins/modules/test_keycloak_user_execute_actions_email.py
@@ -46,7 +46,7 @@ def _mock_good_connection():
        )
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=_build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_user_federation.py
+++ b/tests/unit/plugins/modules/test_keycloak_user_federation.py
@@ -78,7 +78,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_keycloak_userprofile.py
+++ b/tests/unit/plugins/modules/test_keycloak_userprofile.py
@@ -79,7 +79,7 @@ def mock_good_connection():
        ),
    }
    return patch(
-        "ansible_collections.community.general.plugins.module_utils._identity.keycloak.keycloak.open_url",
+        "ansible_collections.community.general.plugins.module_utils._keycloak.open_url",
        side_effect=build_mocked_request(count(), token_response),
        autospec=True,
    )
--- a/tests/unit/plugins/modules/test_lxca_cmms.py
+++ b/tests/unit/plugins/modules/test_lxca_cmms.py
@@ -14,7 +14,7 @@ from ansible_collections.community.general.plugins.modules import lxca_cmms

@pytest.fixture(scope="module")
@mock.patch(
-    "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.close_conn",
+    "ansible_collections.community.general.plugins.module_utils._lxca_common.close_conn",
    autospec=True,
 )
 def setup_module(close_conn):
@@ -43,7 +43,7 @@ class TestMyModule:
    )
    @pytest.mark.usefixtures("patch_ansible_module")
    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms.execute_module", autospec=True)
@@ -59,7 +59,7 @@ class TestMyModule:
        assert "missing required arguments" in results["msg"]

    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms.execute_module", autospec=True)
@@ -87,7 +87,7 @@ class TestMyModule:
        assert mock.call(argument_spec=expected_arguments_spec, supports_check_mode=False) == ansible_mod_cls.call_args

    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_cmms._cmms_by_uuid", autospec=True)
--- a/tests/unit/plugins/modules/test_lxca_nodes.py
+++ b/tests/unit/plugins/modules/test_lxca_nodes.py
@@ -14,7 +14,7 @@ from ansible_collections.community.general.plugins.modules import lxca_nodes

@pytest.fixture(scope="module")
@mock.patch(
-    "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.close_conn",
+    "ansible_collections.community.general.plugins.module_utils._lxca_common.close_conn",
    autospec=True,
 )
 def setup_module(close_conn):
@@ -43,7 +43,7 @@ class TestMyModule:
    )
    @pytest.mark.usefixtures("patch_ansible_module")
    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes.execute_module", autospec=True)
@@ -59,7 +59,7 @@ class TestMyModule:
        assert "missing required arguments" in results["msg"]

    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes.execute_module", autospec=True)
@@ -96,7 +96,7 @@ class TestMyModule:
        assert mock.call(argument_spec=expected_arguments_spec, supports_check_mode=False) == ansible_mod_cls.call_args

    @mock.patch(
-        "ansible_collections.community.general.plugins.module_utils._remote_management.lxca.common.setup_conn",
+        "ansible_collections.community.general.plugins.module_utils._lxca_common.setup_conn",
        autospec=True,
    )
    @mock.patch("ansible_collections.community.general.plugins.modules.lxca_nodes._nodes_by_uuid", autospec=True)
--- a/tests/unit/plugins/modules/test_pritunl_org.py
+++ b/tests/unit/plugins/modules/test_pritunl_org.py
@@ -17,7 +17,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
 from ansible_collections.community.general.plugins.modules import (
    pritunl_org,
 )
-from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
+from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
    PritunlDeleteOrganizationMock,
    PritunlListOrganizationAfterPostMock,
    PritunlListOrganizationMock,
@@ -35,21 +35,21 @@ class TestPritunlOrg(ModuleTestCase):

    def patch_add_pritunl_organization(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._post_pritunl_organization",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._post_pritunl_organization",
            autospec=True,
            **kwds,
        )

    def patch_delete_pritunl_organization(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._delete_pritunl_organization",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._delete_pritunl_organization",
            autospec=True,
            **kwds,
        )

    def patch_get_pritunl_organizations(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
            autospec=True,
            **kwds,
        )
--- a/tests/unit/plugins/modules/test_pritunl_org_info.py
+++ b/tests/unit/plugins/modules/test_pritunl_org_info.py
@@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
 from ansible_collections.community.general.plugins.modules import (
    pritunl_org_info,
 )
-from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
+from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
    PritunlEmptyOrganizationMock,
    PritunlListOrganizationMock,
 )
@@ -32,7 +32,7 @@ class TestPritunlOrgInfo(ModuleTestCase):

    def patch_get_pritunl_organizations(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
            autospec=True,
            **kwds,
        )
--- a/tests/unit/plugins/modules/test_pritunl_user.py
+++ b/tests/unit/plugins/modules/test_pritunl_user.py
@@ -17,7 +17,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
 from ansible_collections.community.general.plugins.modules import (
    pritunl_user,
 )
-from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
+from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
    PritunlDeleteUserMock,
    PritunlListOrganizationMock,
    PritunlListUserMock,
@@ -47,35 +47,35 @@ class TestPritunlUser(ModuleTestCase):

    def patch_get_pritunl_users(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_users",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_users",
            autospec=True,
            **kwds,
        )

    def patch_add_pritunl_users(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._post_pritunl_user",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._post_pritunl_user",
            autospec=True,
            **kwds,
        )

    def patch_update_pritunl_users(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._put_pritunl_user",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._put_pritunl_user",
            autospec=True,
            **kwds,
        )

    def patch_delete_pritunl_users(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._delete_pritunl_user",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._delete_pritunl_user",
            autospec=True,
            **kwds,
        )

    def patch_get_pritunl_organizations(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
            autospec=True,
            **kwds,
        )
--- a/tests/unit/plugins/modules/test_pritunl_user_info.py
+++ b/tests/unit/plugins/modules/test_pritunl_user_info.py
@@ -16,7 +16,7 @@ from ansible_collections.community.internal_test_tools.tests.unit.plugins.module
 from ansible_collections.community.general.plugins.modules import (
    pritunl_user_info,
 )
-from ansible_collections.community.general.tests.unit.plugins.module_utils._net_tools.pritunl.test_api import (
+from ansible_collections.community.general.tests.unit.plugins.module_utils.test__pritunl_api import (
    PritunlListOrganizationMock,
    PritunlListUserMock,
 )
@@ -32,14 +32,14 @@ class TestPritunlUserInfo(ModuleTestCase):

    def patch_get_pritunl_users(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_users",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_users",
            autospec=True,
            **kwds,
        )

    def patch_get_pritunl_organizations(self, **kwds):
        return patch(
-            "ansible_collections.community.general.plugins.module_utils._net_tools.pritunl.api._get_pritunl_organizations",
+            "ansible_collections.community.general.plugins.module_utils._pritunl_api._get_pritunl_organizations",
            autospec=True,
            **kwds,
        )
--- a/tests/unit/plugins/modules/test_ss_3par_cpg.py
+++ b/tests/unit/plugins/modules/test_ss_3par_cpg.py
@@ -11,7 +11,7 @@ sys.modules["hpe3par_sdk"] = mock.Mock()
 sys.modules["hpe3par_sdk.client"] = mock.Mock()
 sys.modules["hpe3parclient"] = mock.Mock()
 sys.modules["hpe3parclient.exceptions"] = mock.Mock()
-from ansible_collections.community.general.plugins.module_utils._storage.hpe3par import hpe3par
+from ansible_collections.community.general.plugins.module_utils import _hpe3par as hpe3par
 from ansible_collections.community.general.plugins.modules import ss_3par_cpg