Move env_config module to ipatests.pytest_plugins.integration.env_config

https://pagure.io/freeipa/issue/6798
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Milan Kubik <mkubik@redhat.com>

10 files changed, 13 insertions, 14 deletions

diff --git a/ipatests/ipa-test-config b/ipatests/ipa-test-config
index a86510c04..3d1ff757b 100755
--- a/ipatests/ipa-test-config
+++ b/ipatests/ipa-test-config
@@ -27,8 +27,7 @@ import argparse
 import json
 
 from ipalib.constants import FQDN
-from ipatests.test_integration import env_config
-from ipatests.pytest_plugins.integration import config
+from ipatests.pytest_plugins.integration import config, env_config
 
 
 def main(argv):
diff --git a/ipatests/pytest_plugins/integration/__init__.py b/ipatests/pytest_plugins/integration/__init__.py
index 142406dc8..4c905289f 100644
--- a/ipatests/pytest_plugins/integration/__init__.py
+++ b/ipatests/pytest_plugins/integration/__init__.py
@@ -31,6 +31,7 @@ from pytest_multihost import make_multihost_fixture
 from ipapython import ipautil
 from ipapython.ipa_log_manager import log_mgr
 from .config import Config
+from .env_config import get_global_config
 
 log = log_mgr.get_logger(__name__)
 
@@ -155,7 +156,6 @@ def mh(request, class_integration_logs):
     """
     # TODO: cleanup modules
     from ipatests.test_integration import tasks
-    from ipatests.test_integration.env_config import get_global_config
 
     cls = request.cls
 
diff --git a/ipatests/pytest_plugins/integration/config.py b/ipatests/pytest_plugins/integration/config.py
index 0e4ac1f1d..94c833d8e 100644
--- a/ipatests/pytest_plugins/integration/config.py
+++ b/ipatests/pytest_plugins/integration/config.py
@@ -88,11 +88,11 @@ class Config(pytest_multihost.config.Config):
 
     @classmethod
     def from_env(cls, env):
-        from ipatests.test_integration.env_config import config_from_env
+        from ipatests.pytest_plugins.integration.env_config import config_from_env
         return config_from_env(env)
 
     def to_env(self, **kwargs):
-        from ipatests.test_integration.env_config import config_to_env
+        from ipatests.pytest_plugins.integration.env_config import config_to_env
         return config_to_env(self, **kwargs)
 
 
@@ -155,9 +155,9 @@ class Domain(pytest_multihost.config.Domain):
 
     @classmethod
     def from_env(cls, env, config, index, domain_type):
-        from ipatests.test_integration.env_config import domain_from_env
+        from ipatests.pytest_plugins.integration.env_config import domain_from_env
         return domain_from_env(env, config, index, domain_type)
 
     def to_env(self, **kwargs):
-        from ipatests.test_integration.env_config import domain_to_env
+        from ipatests.pytest_plugins.integration.env_config import domain_to_env
         return domain_to_env(self, **kwargs)
diff --git a/ipatests/test_integration/env_config.py b/ipatests/pytest_plugins/integration/env_config.py
index bd8c8d2a9..bd8c8d2a9 100644
--- a/ipatests/test_integration/env_config.py
+++ b/ipatests/pytest_plugins/integration/env_config.py
diff --git a/ipatests/test_integration/host.py b/ipatests/test_integration/host.py
index 121f91640..45a2ea286 100644
--- a/ipatests/test_integration/host.py
+++ b/ipatests/test_integration/host.py
@@ -53,11 +53,11 @@ class Host(pytest_multihost.host.Host):
 
     @classmethod
     def from_env(cls, env, domain, hostname, role, index, domain_index):
-        from ipatests.test_integration.env_config import host_from_env
+        from ipatests.pytest_plugins.integration.env_config import host_from_env
         return host_from_env(env, domain, hostname, role, index, domain_index)
 
     def to_env(self, **kwargs):
-        from ipatests.test_integration.env_config import host_to_env
+        from ipatests.pytest_plugins.integration.env_config import host_to_env
         return host_to_env(self, **kwargs)
 
 
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index 4f932622a..f92ab5e02 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -37,7 +37,7 @@ from ipaplatform.paths import paths
 from ipapython.dn import DN
 from ipapython.ipa_log_manager import log_mgr
 from ipatests.test_integration import util
-from ipatests.test_integration.env_config import env_to_script
+from ipatests.pytest_plugins.integration.env_config import env_to_script
 from ipatests.test_integration.host import Host
 from ipalib import errors
 from ipalib.util import get_reverse_zone_default, verify_host_resolvable
diff --git a/ipatests/test_integration/test_idviews.py b/ipatests/test_integration/test_idviews.py
index 8a117e0b1..8482ff0c6 100644
--- a/ipatests/test_integration/test_idviews.py
+++ b/ipatests/test_integration/test_idviews.py
@@ -7,7 +7,7 @@ import re
 import string
 from ipatests.test_integration import tasks
 from ipatests.test_integration.base import IntegrationTest
-from ipatests.test_integration.env_config import get_global_config
+from ipatests.pytest_plugins.integration.env_config import get_global_config
 from ipaplatform.paths import paths
 config = get_global_config()
 
diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py
index f3e9ebac1..954355be1 100644
--- a/ipatests/test_integration/test_installation.py
+++ b/ipatests/test_integration/test_installation.py
@@ -9,7 +9,7 @@ installed.
 
 import pytest
 from ipalib.constants import DOMAIN_LEVEL_0
-from ipatests.test_integration.env_config import get_global_config
+from ipatests.pytest_plugins.integration.env_config import get_global_config
 from ipatests.test_integration.base import IntegrationTest
 from ipatests.test_integration import tasks
 
diff --git a/ipatests/test_integration/test_replication_layouts.py b/ipatests/test_integration/test_replication_layouts.py
index 53cae7d3d..f50e98fac 100644
--- a/ipatests/test_integration/test_replication_layouts.py
+++ b/ipatests/test_integration/test_replication_layouts.py
@@ -5,7 +5,7 @@
 import time
 import pytest
 from ipalib.constants import DOMAIN_LEVEL_0
-from ipatests.test_integration.env_config import get_global_config
+from ipatests.pytest_plugins.integration.env_config import get_global_config
 from ipatests.test_integration.base import IntegrationTest
 from ipatests.test_integration import tasks
 
diff --git a/ipatests/test_integration/test_topology.py b/ipatests/test_integration/test_topology.py
index 634660e5b..8cf81656e 100644
--- a/ipatests/test_integration/test_topology.py
+++ b/ipatests/test_integration/test_topology.py
@@ -8,7 +8,7 @@ import pytest
 
 from ipatests.test_integration.base import IntegrationTest
 from ipatests.test_integration import tasks
-from ipatests.test_integration.env_config import get_global_config
+from ipatests.pytest_plugins.integration.env_config import get_global_config
 from ipalib.constants import DOMAIN_SUFFIX_NAME
 from ipatests.util import assert_deepequal