From 35b3e7b3cf24f88ea58a8743225f7ba61e77f356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Kap=C5=82o=C5=84ski?= Date: Thu, 24 Aug 2017 19:51:22 +0000 Subject: [PATCH] Tempest: Fix cleaning of networks after API tests In case when network was created with different than default client (like admin_client) network wasn't properly removed in cleanup_resources method because default client was used to delete function and 'NotFound' error returned from Neutron was silently ignored in such case. Now networks created by different than default client are added to "admin_networks" list and are cleaned by admin_client. Change-Id: I52428262276c16dbe077fcf77b1890f12dccc97d --- neutron/tests/tempest/api/base.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neutron/tests/tempest/api/base.py b/neutron/tests/tempest/api/base.py index 207a30ff666..afcbe9c8be5 100644 --- a/neutron/tests/tempest/api/base.py +++ b/neutron/tests/tempest/api/base.py @@ -224,7 +224,10 @@ class BaseNetworkTest(test.BaseTestCase): client = client or cls.client body = client.create_network(name=network_name, **kwargs) network = body['network'] - cls.networks.append(network) + if client is cls.client: + cls.networks.append(network) + else: + cls.admin_networks.append(network) return network @classmethod