move env to conftest

Signed-off-by: Andre Kurait <[email protected]>

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/cluster_tools/tests/change_shards_test.py

@@ -2,7 +2,6 @@
 from tests.utils import target_cluster_refresh, get_target_index_info
 from src.tools.create_index import main as create_index
 from src.cluster_tools.utils import console_curl
-from .utils import env as env  # noqa: F401 - used via pytest fixtures
 import argparse
 import logging
 import pytest

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/cluster_tools/tests/conftest.py

@@ -0,0 +1,35 @@
+import os
+import tempfile
+import yaml
+import pytest
+from testcontainers.opensearch import OpenSearchContainer
+from testcontainers.core.waiting_utils import wait_for_logs
+from console_link.environment import Environment
+
+
+@pytest.fixture(scope="function")
+def env():
+    # Spin up the OpenSearch container and wait until it's healthy
+    container = OpenSearchContainer()
+    container.start()
+    wait_for_logs(container, ".*recovered .* indices into cluster_state.*")
+
+    base_url = f"http://{container.get_container_host_ip()}:{container.get_exposed_port(9200)}"
+    # Create a temporary services.yaml file based on the services.yaml spec
+    services_config = {
+        'target_cluster': {
+            'endpoint': base_url,
+            'allow_insecure': True,
+            'no_auth': {}
+        }
+    }
+
+    with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_config:
+        yaml.dump(services_config, temp_config)
+        temp_config_path = temp_config.name
+
+    yield Environment(temp_config_path)
+
+    # Stop the container and clean up the temporary services.yaml file after tests complete
+    container.stop()
+    os.remove(temp_config_path)

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/cluster_tools/tests/create_index_test.py

@@ -1,7 +1,6 @@
 from src.tools.create_index import main as create_index
 from tests.utils import get_target_index_info
 import argparse
-from .utils import env as env  # noqa: F401 - used via pytest fixtures
 import logging
 
 logger = logging.getLogger(__name__)

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/cluster_tools/tests/disable_compatibility_mode_test.py

@@ -1,6 +1,5 @@
 from src.tools.disable_compatibility_mode import main as disable_compatibility_mode
 from src.cluster_tools.utils import console_curl
-from .utils import env as env  # noqa: F401 - used via pytest fixtures
 import logging
 
 logger = logging.getLogger(__name__)

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/cluster_tools/tests/enable_compatibility_mode_test.py

@@ -1,6 +1,5 @@
 from src.tools.enable_compatibility_mode import main as enable_compatibility_mode
 from src.cluster_tools.utils import console_curl
-from .utils import env as env  # noqa: F401 - used via pytest fixtures
 import logging
 
 logger = logging.getLogger(__name__)

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/cluster_tools/tests/main_test.py

@@ -2,7 +2,6 @@
 import argparse
 from tests.utils import get_target_index_info
 import src.tools.create_index as create_index
-from .utils import env as env  # noqa: F401 - used via pytest fixtures
 import logging
 
 logger = logging.getLogger(__name__)

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/cluster_tools/tests/utils.py

@@ -1,44 +1,10 @@
-import pytest
-from testcontainers.opensearch import OpenSearchContainer
-from testcontainers.core.waiting_utils import wait_for_logs
-import tempfile
-import os
-import yaml
 from console_link.environment import Environment
 from src.cluster_tools.utils import console_curl
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-@pytest.fixture(scope="function")
-def env():
-    # Spin up the OpenSearch container and wait until it's healthy
-    container = OpenSearchContainer()
-    container.start()
-    wait_for_logs(container, ".*recovered .* indices into cluster_state.*")
-
-    base_url = f"http://{container.get_container_host_ip()}:{container.get_exposed_port(9200)}"
-    # Create a temporary services.yaml file based on the services.yaml spec
-    services_config = {
-        'target_cluster': {
-            'endpoint': base_url,
-            'allow_insecure': True,
-            'no_auth': {}
-        }
-    }
-
-    with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_config:
-        yaml.dump(services_config, temp_config)
-        temp_config_path = temp_config.name
-
-    yield Environment(temp_config_path)
-
-    # Stop the container and clean up the temporary services.yaml file after tests complete
-    container.stop()
-    os.remove(temp_config_path)
-
-
 def target_cluster_refresh(env: Environment) -> None:
     """Refreshes the target cluster's indices."""
     console_curl(