kubernetes-client/python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update continue the watch with resource_version

Browse Source
This commit is contained in:
Chen Li 2017-10-26 03:15:50 -05:00
parent 8f7b490086
commit aec1c5259a
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
watch/watch.py
View File

@ -63,6 +63,7 @@ class Watch(object):
self._raw_return_type = return_type self._raw_return_type = return_type
self._stop = False self._stop = False
self._api_client = client.ApiClient() self._api_client = client.ApiClient()
self.resource_version = 0
def stop(self): def stop(self):
self._stop = True self._stop = True
@ -81,16 +82,16 @@ class Watch(object):
if return_type: if return_type:
obj = SimpleNamespace(data=json.dumps(js['raw_object'])) obj = SimpleNamespace(data=json.dumps(js['raw_object']))
js['object'] = self._api_client.deserialize(obj, return_type) js['object'] = self._api_client.deserialize(obj, return_type)
if hasattr(js['object'], 'metadata'):
self.resource_version = js['object'].metadata.resource_version
return js return js
def stream(self, func, keep=False, *args, **kwargs): def stream(self, func, *args, **kwargs):
"""Watch an API resource and stream the result back via a generator. """Watch an API resource and stream the result back via a generator.
:param func: The API function pointer. Any parameter to the function :param func: The API function pointer. Any parameter to the function
can be passed after this parameter. can be passed after this parameter.
:param keep: Flag to keep the watch work all the time.
:return: Event object with these keys: :return: Event object with these keys:
'type': The type of event such as "ADDED", "DELETED", etc. 'type': The type of event such as "ADDED", "DELETED", etc.
'raw_object': a dict representing the watched object. 'raw_object': a dict representing the watched object.
@ -116,6 +117,7 @@ class Watch(object):
kwargs['watch'] = True kwargs['watch'] = True
kwargs['_preload_content'] = False kwargs['_preload_content'] = False
timeouts = ('timeout_seconds' in kwargs)
while True: while True:
resp = func(*args, **kwargs) resp = func(*args, **kwargs)
try: try:
@ -124,8 +126,9 @@ class Watch(object):
if self._stop: if self._stop:
break break
finally: finally:
kwargs['resource_version'] = self.resource_version
resp.close() resp.close()
resp.release_conn() resp.release_conn()
if not keep or self._stop: if timeouts or self._stop:
break break

10
watch/watch_test.py
View File

@ -85,7 +85,7 @@ class WatchTests(unittest.TestCase):
fake_resp.close.assert_called_once() fake_resp.close.assert_called_once()
fake_resp.release_conn.assert_called_once() fake_resp.release_conn.assert_called_once()
def test_watch_stream_keep(self): def test_watch_stream_loop(self):
w = Watch(float) w = Watch(float)
fake_resp = Mock() fake_resp = Mock()
@ -99,12 +99,14 @@ class WatchTests(unittest.TestCase):
fake_api.get_namespaces.__doc__ = ':return: V1NamespaceList' fake_api.get_namespaces.__doc__ = ':return: V1NamespaceList'
count = 0 count = 0
for e in w.stream(fake_api.get_namespaces):
count = count + 1
# when timeout_seconds is set, auto-exist when timeout reaches
for e in w.stream(fake_api.get_namespaces, timeout_seconds=1):
count = count + 1
self.assertEqual(count, 1) self.assertEqual(count, 1)
for e in w.stream(fake_api.get_namespaces, True): # when no timeout_seconds, only exist when w.stop() is called
for e in w.stream(fake_api.get_namespaces):
count = count + 1 count = count + 1
if count == 2: if count == 2:
w.stop() w.stop()