Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "API: Cleanup APIs interface.api"
[vpp.git]
/
test
/
test_p2p_ethernet.py
diff --git
a/test/test_p2p_ethernet.py
b/test/test_p2p_ethernet.py
index
75c3901
..
5200e48
100644
(file)
--- a/
test/test_p2p_ethernet.py
+++ b/
test/test_p2p_ethernet.py
@@
-48,22
+48,22
@@
class P2PEthernetAPI(VppTestCase):
self.create_p2p_ethernet(self.pg0, 2, "de:ad:00:00:00:02")
intfs = self.vapi.cli("show interface")
self.create_p2p_ethernet(self.pg0, 2, "de:ad:00:00:00:02")
intfs = self.vapi.cli("show interface")
- self.assert
NotEqual(intfs.find('pg0.1'), -1
)
- self.assert
NotEqual(intfs.find('pg0.2'), -1
)
- self.assert
Equal(intfs.find('pg0.5'), -1
)
+ self.assert
In('pg0.1', intfs
)
+ self.assert
In('pg0.2', intfs
)
+ self.assert
NotIn('pg0.5', intfs
)
# create pg2.5 subif
self.create_p2p_ethernet(self.pg0, 5, "de:ad:00:00:00:ff")
intfs = self.vapi.cli("show interface")
# create pg2.5 subif
self.create_p2p_ethernet(self.pg0, 5, "de:ad:00:00:00:ff")
intfs = self.vapi.cli("show interface")
- self.assert
NotEqual(intfs.find('pg0.5'), -1
)
+ self.assert
In('pg0.5', intfs
)
# delete pg2.5 subif
self.delete_p2p_ethernet(self.pg0, "de:ad:00:00:00:ff")
intfs = self.vapi.cli("show interface")
# delete pg2.5 subif
self.delete_p2p_ethernet(self.pg0, "de:ad:00:00:00:ff")
intfs = self.vapi.cli("show interface")
- self.assert
NotEqual(intfs.find('pg0.1'), -1
)
- self.assert
NotEqual(intfs.find('pg0.2'), -1
)
- self.assert
Equal(intfs.find('pg0.5'), -1
)
+ self.assert
In('pg0.1', intfs
)
+ self.assert
In('pg0.2', intfs
)
+ self.assert
NotIn('pg0.5', intfs
)
self.logger.info("FFP_TEST_FINISH_0000")
self.logger.info("FFP_TEST_FINISH_0000")
@@
-77,7
+77,8
@@
class P2PEthernetAPI(VppTestCase):
for i in range(1, clients+1):
try:
for i in range(1, clients+1):
try:
- macs.append(':'.join(re.findall('..', '{:02x}'.format(mac+i))))
+ macs.append(':'.join(re.findall('..', '{:02x}'.format(
+ mac+i))))
self.vapi.p2p_ethernet_add(self.pg2.sw_if_index,
mac_pton(macs[i-1]),
i)
self.vapi.p2p_ethernet_add(self.pg2.sw_if_index,
mac_pton(macs[i-1]),
i)