Refactoring of k8s manager and tests
Changes:
- Official kubernetes python lib
- Rewrite k8s api wrapper in OOP manner
- Use api where its possible instead of cli
- Remove virtlet code because its can be replaced with pod api
- Remove unused/oudated manager code
- Remove bug workaround in k8s upgrade template
- Remove netchecker obsolete code
- Remove unfinished test_rbd_flexvolume_driver
Change-Id: I446a240123282196a6ba54f588aea84791f175ba
Related-PROD: PROD-21700
diff --git a/tcp_tests/managers/k8s/pods.py b/tcp_tests/managers/k8s/pods.py
index 94abc20..98192a6 100644
--- a/tcp_tests/managers/k8s/pods.py
+++ b/tcp_tests/managers/k8s/pods.py
@@ -11,6 +11,9 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
+
+from kubernetes import client
+
from devops.helpers import helpers
from tcp_tests.managers.k8s.base import K8sBaseResource
@@ -18,91 +21,51 @@
class K8sPod(K8sBaseResource):
- """docstring for K8sPod"""
+ resource_type = 'pod'
- def __repr__(self):
- return "<K8sPod: %s>" % self.name
+ def _read(self, **kwargs):
+ return self._manager.api.read_namespaced_pod(
+ self.name, self.namespace, **kwargs)
- @property
- def name(self):
- return self.metadata.name
+ def _create(self, body, **kwargs):
+ return self._manager.api.create_namespaced_pod(
+ self.namespace, body, **kwargs)
- @property
- def phase(self):
- return self.status.phase
+ def _patch(self, body, **kwargs):
+ return self._manager.api.patch_namespaced_pod(
+ self.name, self.namespace, body, **kwargs)
- @property
- def namespace(self):
- return self.metadata.namespace
+ def _replace(self, body, **kwargs):
+ return self._manager.api.replace_namespaced_pod(
+ self.name, self.namespace, body, **kwargs)
- def wait_phase(self, phase, timeout=60, interval=5):
- """Wait phase of pod_name from namespace while timeout
+ def _delete(self, **kwargs):
+ self._manager.api.delete_namespaced_pod(
+ self.name, self.namespace, client.V1DeleteOptions(), **kwargs)
- :param list or str: phase
- :param int: timeout
+ def wait_phase(self, phases, timeout=60, interval=3):
+ if isinstance(phases, str):
+ phases = [phases]
- :rtype: None
- """
- if isinstance(phase, str):
- phase = [phase]
+ helpers.wait(lambda: self.read().status.phase in phases,
+ timeout=timeout, interval=interval,
+ timeout_msg='Timeout waiting, pod {0} phase is not in '
+ '"{1}"'.format(self.name, phases))
+ return self
- def check():
- self._add_details(self._manager.get(name=self.name,
- namespace=self.namespace))
- return self.phase in phase
-
- helpers.wait(check, timeout=timeout, interval=interval,
- timeout_msg='Timeout waiting({timeout}s), pod {pod_name} '
- 'is not in "{phase}" phase'.format(
- timeout=timeout,
- pod_name=self.name,
- phase=phase))
-
- def wait_running(self, timeout=60, interval=5):
- self.wait_phase(['Running'], timeout=timeout, interval=interval)
+ def wait_running(self, timeout=240, interval=3):
+ return self.wait_phase('Running', timeout=timeout, interval=interval)
class K8sPodManager(K8sBaseManager):
- """docstring for ClassName"""
-
resource_class = K8sPod
- def _get(self, name, namespace=None, **kwargs):
- namespace = namespace or self.namespace
- return self.api.read_namespaced_pod(
- name=name, namespace=namespace, **kwargs)
+ @property
+ def api(self):
+ return self._cluster.api_core
- def _list(self, namespace=None, **kwargs):
- namespace = namespace or self.namespace
- return self.api.list_namespaced_pod(namespace=namespace, **kwargs)
+ def _list(self, namespace, **kwargs):
+ return self.api.list_namespaced_pod(namespace, **kwargs)
- def _create(self, body, namespace=None, **kwargs):
- namespace = namespace or self.namespace
- return self.api.create_namespaced_pod(
- body=body, namespace=namespace, **kwargs)
-
- def _replace(self, body, name, namespace=None, **kwargs):
- namespace = namespace or self.namespace
- return self.api.replace_namespaced_pod(
- body=body, name=name, namespace=namespace, **kwargs)
-
- def _delete(self, body, name, namespace=None, **kwargs):
- namespace = namespace or self.namespace
- # NOTE: the following two lines should be deleted after
- # serialization is fixed in python-k8sclient
- if isinstance(body, self.resource_class):
- body = body.swagger_types
- return self.api.delete_namespaced_pod(
- body=body, name=name, namespace=namespace, **kwargs)
-
- def _deletecollection(self, namespace=None, **kwargs):
- namespace = namespace or self.namespace
- return self.api.deletecollection_namespaced_pod(
- namespace=namespace, **kwargs)
-
- def full_list(self, *args, **kwargs):
- lst = self._full_list(*args, **kwargs)
- return [self.resource_class(self, item) for item in lst.items]
-
- def _full_list(self, **kwargs):
- return self.api.list_pod(**kwargs)
+ def _list_all(self, **kwargs):
+ return self.api.list_pod_for_all_namespaces(**kwargs)