Force deletion of interfaces to create in "FdbInterfaceTestCase"
In the no-namespace test cases, sometimes the interfaces to be created exist in the kernel namespace. To avoid this possible problem, we first force the deletion of those interfaces. Change-Id: I9eba21d872263665481303fbab1ee3ec9bdaa044 Closes-Bug: #1841253
This commit is contained in:
parent
30c4b7c0d6
commit
d3359a2bc6
|
@ -108,14 +108,15 @@ class FdbInterfaceTestCase(testscenarios.WithScenarios, base.BaseSudoTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(FdbInterfaceTestCase, self).setUp()
|
super(FdbInterfaceTestCase, self).setUp()
|
||||||
self.device = ('int_' + uuidutils.generate_uuid())[
|
_uuid = uuidutils.generate_uuid()
|
||||||
:constants.DEVICE_NAME_MAX_LEN]
|
self.device = ('int_' + _uuid)[:constants.DEVICE_NAME_MAX_LEN]
|
||||||
self.device_vxlan = ('vxlan_' + uuidutils.generate_uuid())[
|
self.device_vxlan = ('vxlan_' + _uuid)[:constants.DEVICE_NAME_MAX_LEN]
|
||||||
:constants.DEVICE_NAME_MAX_LEN]
|
|
||||||
self.ip = '10.220.0.1/24'
|
self.ip = '10.220.0.1/24'
|
||||||
self.ip_vxlan = '10.221.0.1/24'
|
self.ip_vxlan = '10.221.0.1/24'
|
||||||
if self.namespace:
|
if self.namespace:
|
||||||
priv_ip_lib.create_netns(self.namespace)
|
priv_ip_lib.create_netns(self.namespace)
|
||||||
|
else:
|
||||||
|
self._cleanup()
|
||||||
self.addCleanup(self._cleanup)
|
self.addCleanup(self._cleanup)
|
||||||
ip_wrapper = ip_lib.IPWrapper(self.namespace)
|
ip_wrapper = ip_lib.IPWrapper(self.namespace)
|
||||||
ip_wrapper.add_dummy(self.device)
|
ip_wrapper.add_dummy(self.device)
|
||||||
|
@ -131,8 +132,11 @@ class FdbInterfaceTestCase(testscenarios.WithScenarios, base.BaseSudoTestCase):
|
||||||
if self.namespace:
|
if self.namespace:
|
||||||
priv_ip_lib.remove_netns(self.namespace)
|
priv_ip_lib.remove_netns(self.namespace)
|
||||||
else:
|
else:
|
||||||
priv_ip_lib.delete_interface(self.device_vxlan, None)
|
for device in (self.device_vxlan, self.device):
|
||||||
priv_ip_lib.delete_interface(self.device, None)
|
try:
|
||||||
|
priv_ip_lib.delete_interface(device, None)
|
||||||
|
except priv_ip_lib.NetworkInterfaceNotFound:
|
||||||
|
pass
|
||||||
|
|
||||||
def _list_fdb_rules(self, device):
|
def _list_fdb_rules(self, device):
|
||||||
output = bridge_lib.FdbInterface.show(dev=device,
|
output = bridge_lib.FdbInterface.show(dev=device,
|
||||||
|
|
Loading…
Reference in New Issue