From 6ec16458fe430368e2479cf312bbe8a5a448e502 Mon Sep 17 00:00:00 2001 From: Andreas Scheuring Date: Fri, 4 Dec 2015 08:35:28 +0100 Subject: [PATCH] Cleanup veth-pairs in default netns for functional tests Today, veth-pairs created by the VethFixture of the net_helpers class are not cleanup on teardown. This is solved by this patch. Change-Id: I0a969e31e6694d74a9af6ada4e4e707c6332ffeb Closes-Bug: #1522710 --- neutron/tests/common/net_helpers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neutron/tests/common/net_helpers.py b/neutron/tests/common/net_helpers.py index 21ae7d9c9..36316c217 100644 --- a/neutron/tests/common/net_helpers.py +++ b/neutron/tests/common/net_helpers.py @@ -419,7 +419,8 @@ class VethFixture(fixtures.Fixture): def destroy(self): for port in self.ports: ip_wrapper = ip_lib.IPWrapper(port.namespace) - if ip_wrapper.netns.exists(port.namespace): + if (ip_wrapper.netns.exists(port.namespace) or + port.namespace is None): try: ip_wrapper.del_veth(port.name) break -- 2.45.2