openstack
/
kuryr-tempest-plugin
Code Issues Proposed changes

Merge "Test recreate namespace and pod"

This commit is contained in:
Zuul 2019-09-09 13:45:39 +00:00 committed by Gerrit Code Review
parent 26af39d563 3d82e55050
commit 55c980d4e4
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kuryr_tempest_plugin/tests/scenario/base.py
View File

@ -546,7 +546,7 @@ class BaseKuryrScenarioTest(manager.NetworkScenarioTest):
namespace=namespace)
@classmethod
def create_namespace(cls, name=None):
def create_namespace(cls, name=None, wait_for_crd_annotation=True):
if not name:
name = data_utils.rand_name(prefix='kuryr-namespace')
kuryr_crd_annotation = K8S_ANNOTATION_PREFIX + "-net-crd"
@ -561,7 +561,8 @@ class BaseKuryrScenarioTest(manager.NetworkScenarioTest):
time.sleep(1)
ns = cls.k8s_client.CoreV1Api().read_namespace_status(name)
if (ns.metadata.annotations and
ns.metadata.annotations.get(kuryr_crd_annotation)):
(not wait_for_crd_annotation or
ns.metadata.annotations.get(kuryr_crd_annotation))):
break
return name, namespace_obj

34
kuryr_tempest_plugin/tests/scenario/test_namespace.py
View File

@ -19,6 +19,7 @@ import time
from oslo_log import log as logging
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
from kuryr_tempest_plugin.tests.scenario import base
@ -339,3 +340,36 @@ class TestNamespaceScenario(base.BaseKuryrScenarioTest):
group, version, plural,
crd_manifest['metadata']['name'], body)
raise Exception('{} for Kuryr Net CRD'.format(error_msg))
@decorators.idempotent_id('9e3ddb2d-d765-4ac5-8ab0-6a404adddd49')
def test_recreate_pod_in_namespace(self):
ns_name = data_utils.rand_name(prefix='kuryr-ns')
ns_name, ns = self.create_namespace(
name=ns_name, wait_for_crd_annotation=False)
self.addCleanup(self.delete_namespace, ns_name)
pod_name, pod = self.create_pod(
namespace=ns_name, wait_for_status=False)
self.delete_namespace(ns_name)
# wait for namespace to be deleted
retries = 120
while True:
try:
self.k8s_client.CoreV1Api().read_namespace(ns_name)
retries -= 1
self.assertNotEqual(0, retries,
"Timed out waiting for namespace %s to"
" be deleted" % ns_name)
time.sleep(1)
except kubernetes.client.rest.ApiException as e:
if e.status == 404:
break
ns_name, ns = self.create_namespace(
name=ns_name, wait_for_crd_annotation=False)
pod_name, pod = self.create_pod(
namespace=ns_name, wait_for_status=False)
self.wait_for_pod_status(pod_name, namespace=ns_name,
pod_status='Running', retries=60)