From 591de90d592e3aef32230bcb1187b82f8c2519b3 Mon Sep 17 00:00:00 2001 From: Luis Tomas Bolivar Date: Wed, 8 Aug 2018 13:03:26 +0200 Subject: [PATCH] Ensure create_namespace function waits for CRD annotation Change-Id: I5d12d6be2b89b6301d7f2509513a558b33ef5898 --- kuryr_tempest_plugin/tests/scenario/base.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kuryr_tempest_plugin/tests/scenario/base.py b/kuryr_tempest_plugin/tests/scenario/base.py index b35d6b05..5febd198 100644 --- a/kuryr_tempest_plugin/tests/scenario/base.py +++ b/kuryr_tempest_plugin/tests/scenario/base.py @@ -268,6 +268,8 @@ class BaseKuryrScenarioTest(manager.NetworkScenarioTest): def create_namespace(cls, name=None): if not name: name = data_utils.rand_name(prefix='kuryr-namespace') + kuryr_crd_annotation = K8S_ANNOTATION_PREFIX + "-net-crd" + namespace = cls.k8s_client.V1Namespace() namespace.metadata = cls.k8s_client.V1ObjectMeta(name=name) namespace_obj = cls.k8s_client.CoreV1Api().create_namespace( @@ -277,7 +279,8 @@ class BaseKuryrScenarioTest(manager.NetworkScenarioTest): while True: time.sleep(1) ns = cls.k8s_client.CoreV1Api().read_namespace_status(name) - if ns.metadata.annotations is not None: + if (ns.metadata.annotations and + ns.metadata.annotations.get(kuryr_crd_annotation)): break return name, namespace_obj