Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vppinfra: fix coverity warning in mpcap.c
[vpp.git]
/
test
/
test_bond.py
diff --git
a/test/test_bond.py
b/test/test_bond.py
index
9926d23
..
d1ae77a
100644
(file)
--- a/
test/test_bond.py
+++ b/
test/test_bond.py
@@
-31,13
+31,18
@@
class TestBondInterface(VppTestCase):
for i in cls.pg_interfaces:
i.admin_up()
for i in cls.pg_interfaces:
i.admin_up()
+ @classmethod
+ def tearDownClass(cls):
+ super(TestBondInterface, cls).tearDownClass()
+
def setUp(self):
super(TestBondInterface, self).setUp()
def tearDown(self):
super(TestBondInterface, self).tearDown()
def setUp(self):
super(TestBondInterface, self).setUp()
def tearDown(self):
super(TestBondInterface, self).tearDown()
- if not self.vpp_dead:
- self.logger.info(self.vapi.ppcli("show interface"))
+
+ def show_commands_at_teardown(self):
+ self.logger.info(self.vapi.ppcli("show interface"))
def test_bond_traffic(self):
""" Bond traffic test """
def test_bond_traffic(self):
""" Bond traffic test """
@@
-60,14
+65,15
@@
class TestBondInterface(VppTestCase):
bond0 = VppBondInterface(self,
mode=3,
lb=1,
bond0 = VppBondInterface(self,
mode=3,
lb=1,
+ numa_only=0,
use_custom_mac=1,
mac_address=mac)
bond0.add_vpp_config()
bond0.admin_up()
bond0_addr = socket.inet_pton(socket.AF_INET, "10.10.10.1")
use_custom_mac=1,
mac_address=mac)
bond0.add_vpp_config()
bond0.admin_up()
bond0_addr = socket.inet_pton(socket.AF_INET, "10.10.10.1")
- self.vapi.sw_interface_add_del_address(bond0.sw_if_index,
- bond0_addr,
- 24)
+ self.vapi.sw_interface_add_del_address(
sw_if_index=
bond0.sw_if_index,
+
address=
bond0_addr,
+
address_length=
24)
self.pg2.config_ip4()
self.pg2.resolve_arp()
self.pg2.config_ip4()
self.pg2.resolve_arp()
@@
-228,8
+234,8
@@
class TestBondInterface(VppTestCase):
# verify both interfaces in the show
ifs = self.vapi.cli("show interface")
# verify both interfaces in the show
ifs = self.vapi.cli("show interface")
- self.assert
NotEqual(ifs.find('BondEthernet0'), -1
)
- self.assert
NotEqual(ifs.find('BondEthernet1'), -1
)
+ self.assert
In('BondEthernet0', ifs
)
+ self.assert
In('BondEthernet1', ifs
)
# verify they are in the dump also
if_dump = self.vapi.sw_interface_bond_dump()
# verify they are in the dump also
if_dump = self.vapi.sw_interface_bond_dump()
@@
-244,10
+250,10
@@
class TestBondInterface(VppTestCase):
ifs = self.vapi.cli("show interface")
# verify BondEthernet0 still in the show
ifs = self.vapi.cli("show interface")
# verify BondEthernet0 still in the show
- self.assert
NotEqual(ifs.find('BondEthernet0'), -1
)
+ self.assert
In('BondEthernet0', ifs
)
# verify BondEthernet1 not in the show
# verify BondEthernet1 not in the show
- self.assert
Equal(ifs.find('BondEthernet1'), -1
)
+ self.assert
NotIn('BondEthernet1', ifs
)
# verify BondEthernet1 is not in the dump
if_dump = self.vapi.sw_interface_bond_dump()
# verify BondEthernet1 is not in the dump
if_dump = self.vapi.sw_interface_bond_dump()
@@
-264,7
+270,7
@@
class TestBondInterface(VppTestCase):
# verify BondEthernet0 not in the show
ifs = self.vapi.cli("show interface")
# verify BondEthernet0 not in the show
ifs = self.vapi.cli("show interface")
- self.assert
Equal(ifs.find('BondEthernet0'), -1
)
+ self.assert
NotIn('BondEthernet0', ifs
)
# verify BondEthernet0 is not in the dump
if_dump = self.vapi.sw_interface_bond_dump()
# verify BondEthernet0 is not in the dump
if_dump = self.vapi.sw_interface_bond_dump()