From 3ddd181dd2225c1166d3989249d984ae7677538a Mon Sep 17 00:00:00 2001
From: "peng.xu" <peng.xu@zilliz.com>
Date: Sat, 19 Oct 2019 14:02:48 +0800
Subject: [PATCH] update for better test

---
 conftest.py               | 2 +-
 mishards/server.py        | 2 +-
 mishards/settings.py      | 7 +++++--
 sd/kubernetes_provider.py | 6 ++++--
 sd/static_provider.py     | 6 ++++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/conftest.py b/conftest.py
index ebe8276cea..34e22af693 100644
--- a/conftest.py
+++ b/conftest.py
@@ -20,7 +20,7 @@ def app(request):
 @pytest.fixture
 def started_app(app):
     app.on_pre_run()
-    app.start(app.port)
+    app.start(settings.SERVER_TEST_PORT)
 
     yield app
 
diff --git a/mishards/server.py b/mishards/server.py
index 6eb0e92582..599a00e455 100644
--- a/mishards/server.py
+++ b/mishards/server.py
@@ -91,7 +91,7 @@ class Server:
             handler_class(tracer=self.tracer,
                           router=self.router), self.server_impl)
         self.server_impl.add_insecure_port("[::]:{}".format(
-            str(port or self._port)))
+            str(port or self.port)))
         self.server_impl.start()
 
     def run(self, port):
diff --git a/mishards/settings.py b/mishards/settings.py
index 773c04f083..21a3bb7a65 100644
--- a/mishards/settings.py
+++ b/mishards/settings.py
@@ -25,6 +25,7 @@ TIMEOUT = env.int('TIMEOUT', 60)
 MAX_RETRY = env.int('MAX_RETRY', 3)
 
 SERVER_PORT = env.int('SERVER_PORT', 19530)
+SERVER_TEST_PORT = env.int('SERVER_TEST_PORT', 19530)
 WOSERVER = env.str('WOSERVER')
 
 SD_PROVIDER_SETTINGS = None
@@ -36,11 +37,13 @@ if SD_PROVIDER == 'Kubernetes':
         in_cluster=env.bool('SD_IN_CLUSTER', False),
         poll_interval=env.int('SD_POLL_INTERVAL', 5),
         pod_patt=env.str('SD_ROSERVER_POD_PATT', ''),
-        label_selector=env.str('SD_LABEL_SELECTOR', ''))
+        label_selector=env.str('SD_LABEL_SELECTOR', ''),
+        port=env.int('SD_PORT', 19530))
 elif SD_PROVIDER == 'Static':
     from sd.static_provider import StaticProviderSettings
     SD_PROVIDER_SETTINGS = StaticProviderSettings(
-        hosts=env.list('SD_STATIC_HOSTS', []))
+        hosts=env.list('SD_STATIC_HOSTS', []),
+        port=env.int('SD_STATIC_PORT', 19530))
 
 # TESTING_WOSERVER = env.str('TESTING_WOSERVER', 'tcp://127.0.0.1:19530')
 
diff --git a/sd/kubernetes_provider.py b/sd/kubernetes_provider.py
index ca593a3682..eb113db007 100644
--- a/sd/kubernetes_provider.py
+++ b/sd/kubernetes_provider.py
@@ -226,12 +226,13 @@ class EventHandler(threading.Thread):
 
 class KubernetesProviderSettings:
     def __init__(self, namespace, pod_patt, label_selector, in_cluster,
-                 poll_interval, **kwargs):
+                 poll_interval, port=None, **kwargs):
         self.namespace = namespace
         self.pod_patt = pod_patt
         self.label_selector = label_selector
         self.in_cluster = in_cluster
         self.poll_interval = poll_interval
+        self.port = int(port) if port else 19530
 
 
 @singleton
@@ -245,6 +246,7 @@ class KubernetesProvider(object):
         self.label_selector = settings.label_selector
         self.in_cluster = settings.in_cluster
         self.poll_interval = settings.poll_interval
+        self.port = settings.port
         self.kwargs = kwargs
         self.queue = queue.Queue()
 
@@ -279,7 +281,7 @@ class KubernetesProvider(object):
                                           **kwargs)
 
     def add_pod(self, name, ip):
-        self.conn_mgr.register(name, 'tcp://{}:19530'.format(ip))
+        self.conn_mgr.register(name, 'tcp://{}:{}'.format(ip, self.port))
 
     def delete_pod(self, name):
         self.conn_mgr.unregister(name)
diff --git a/sd/static_provider.py b/sd/static_provider.py
index 5c97c4efd0..e88780740f 100644
--- a/sd/static_provider.py
+++ b/sd/static_provider.py
@@ -9,8 +9,9 @@ from sd import ProviderManager
 
 
 class StaticProviderSettings:
-    def __init__(self, hosts):
+    def __init__(self, hosts, port=None):
         self.hosts = hosts
+        self.port = int(port) if port else 19530
 
 
 @singleton
@@ -21,6 +22,7 @@ class KubernetesProvider(object):
     def __init__(self, settings, conn_mgr, **kwargs):
         self.conn_mgr = conn_mgr
         self.hosts = [socket.gethostbyname(host) for host in settings.hosts]
+        self.port = settings.port
 
     def start(self):
         for host in self.hosts:
@@ -31,7 +33,7 @@ class KubernetesProvider(object):
             self.delete_pod(host)
 
     def add_pod(self, name, ip):
-        self.conn_mgr.register(name, 'tcp://{}:19530'.format(ip))
+        self.conn_mgr.register(name, 'tcp://{}:{}'.format(ip, self.port))
 
     def delete_pod(self, name):
         self.conn_mgr.unregister(name)