From d0de10282b3bd445bbb8236be1ee1ca6418595a0 Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Mon, 31 Oct 2022 19:35:35 +0800 Subject: [PATCH] [test]Fix getting minio ip error when milvus is installed by operator (#20207) Signed-off-by: zhuwenxing Signed-off-by: zhuwenxing --- .../python_client/bulk_insert/test_bulk_insert.py | 15 +++++++++++---- .../bulk_insert/test_bulk_insert_task_clean.py | 13 ++++++++++--- tests/python_client/chaos/conftest.py | 4 ---- tests/python_client/conftest.py | 6 ++++++ 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/tests/python_client/bulk_insert/test_bulk_insert.py b/tests/python_client/bulk_insert/test_bulk_insert.py index df21fb1819..40dea22639 100644 --- a/tests/python_client/bulk_insert/test_bulk_insert.py +++ b/tests/python_client/bulk_insert/test_bulk_insert.py @@ -12,6 +12,7 @@ from common.common_type import CaseLabel, CheckTasks from utils.util_k8s import ( get_pod_ip_name_pairs, get_milvus_instance_name, + get_milvus_deploy_tool ) from utils.util_log import test_log as log from bulk_insert_data import ( @@ -33,7 +34,7 @@ default_multi_fields = [ default_vec_n_int_fields = [df.vec_field, df.int_field] -milvus_ns = "chaos-testing" +# milvus_ns = "chaos-testing" base_dir = "/tmp/bulk_insert_data" @@ -50,12 +51,18 @@ def entity_suffix(entities): class TestcaseBaseBulkInsert(TestcaseBase): @pytest.fixture(scope="function", autouse=True) - def init_minio_client(self, host): + def init_minio_client(self, host, milvus_ns): Path("/tmp/bulk_insert_data").mkdir(parents=True, exist_ok=True) self._connect() - self.instance_name = get_milvus_instance_name(milvus_ns, host) + self.milvus_ns = milvus_ns + self.milvus_sys = MilvusSys(alias='default') + self.instance_name = get_milvus_instance_name(self.milvus_ns, host) + self.deploy_tool = get_milvus_deploy_tool(self.milvus_ns, self.milvus_sys) + minio_label = f"release={self.instance_name}, app=minio" + if self.deploy_tool == "milvus-operator": + minio_label = f"release={self.instance_name}-minio, app=minio" minio_ip_pod_pair = get_pod_ip_name_pairs( - milvus_ns, f"release={self.instance_name}, app=minio" + self.milvus_ns, minio_label ) ms = MilvusSys() minio_ip = list(minio_ip_pod_pair.keys())[0] diff --git a/tests/python_client/bulk_insert/test_bulk_insert_task_clean.py b/tests/python_client/bulk_insert/test_bulk_insert_task_clean.py index 006c3b8730..7eb09e853e 100644 --- a/tests/python_client/bulk_insert/test_bulk_insert_task_clean.py +++ b/tests/python_client/bulk_insert/test_bulk_insert_task_clean.py @@ -12,6 +12,7 @@ from common.common_type import CaseLabel, CheckTasks from utils.util_k8s import ( get_pod_ip_name_pairs, get_milvus_instance_name, + get_milvus_deploy_tool ) from utils.util_log import test_log as log from bulk_insert_data import ( @@ -50,12 +51,18 @@ def entity_suffix(entities): class TestcaseBaseBulkInsert(TestcaseBase): @pytest.fixture(scope="function", autouse=True) - def init_minio_client(self, host): + def init_minio_client(self, host, milvus_ns): Path("/tmp/bulk_insert_data").mkdir(parents=True, exist_ok=True) self._connect() - self.instance_name = get_milvus_instance_name(milvus_ns, host) + self.milvus_ns = milvus_ns + self.milvus_sys = MilvusSys(alias='default') + self.instance_name = get_milvus_instance_name(self.milvus_ns, host) + self.deploy_tool = get_milvus_deploy_tool(self.milvus_ns, self.milvus_sys) + minio_label = f"release={self.instance_name}, app=minio" + if self.deploy_tool == "milvus-operator": + minio_label = f"release={self.instance_name}-minio, app=minio" minio_ip_pod_pair = get_pod_ip_name_pairs( - milvus_ns, f"release={self.instance_name}, app=minio" + self.milvus_ns, minio_label ) ms = MilvusSys() minio_ip = list(minio_ip_pod_pair.keys())[0] diff --git a/tests/python_client/chaos/conftest.py b/tests/python_client/chaos/conftest.py index dc29e3c4d6..a62372b10e 100644 --- a/tests/python_client/chaos/conftest.py +++ b/tests/python_client/chaos/conftest.py @@ -2,7 +2,6 @@ import pytest def pytest_addoption(parser): - parser.addoption("--milvus_ns", action="store", default="chaos-testing", help="milvus_ns") parser.addoption("--chaos_type", action="store", default="pod_kill", help="chaos_type") parser.addoption("--target_component", action="store", default="querynode", help="target_component") parser.addoption("--chaos_duration", action="store", default="1m", help="chaos_duration") @@ -10,9 +9,6 @@ def pytest_addoption(parser): parser.addoption("--request_duration", action="store", default="3m", help="request_duration") parser.addoption("--is_check", action="store", type=bool, default=False, help="is_check") -@pytest.fixture -def milvus_ns(request): - return request.config.getoption("--milvus_ns") @pytest.fixture def chaos_type(request): diff --git a/tests/python_client/conftest.py b/tests/python_client/conftest.py index 7cb160094a..540f039045 100644 --- a/tests/python_client/conftest.py +++ b/tests/python_client/conftest.py @@ -25,6 +25,7 @@ def pytest_addoption(parser): parser.addoption("--user", action="store", default="", help="user name for connection") parser.addoption("--password", action="store", default="", help="password for connection") parser.addoption("--secure", type=bool, action="store", default=True, help="secure for connection") + parser.addoption("--milvus_ns", action="store", default="chaos-testing", help="milvus_ns") parser.addoption("--http_port", action="store", default=19121, help="http's port") parser.addoption("--handler", action="store", default="GRPC", help="handler of request") parser.addoption("--tag", action="store", default="all", help="only run tests matching the tag.") @@ -75,6 +76,11 @@ def secure(request): return request.config.getoption("--secure") +@pytest.fixture +def milvus_ns(request): + return request.config.getoption("--milvus_ns") + + @pytest.fixture def http_port(request): return request.config.getoption("--http_port")