Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VPP-1508: Tests: Fix vpp_api struct.error under py3.
[vpp.git]
/
test
/
test_lisp.py
diff --git
a/test/test_lisp.py
b/test/test_lisp.py
index
f66fcf7
..
561e589
100644
(file)
--- a/
test/test_lisp.py
+++ b/
test/test_lisp.py
@@
-10,7
+10,8
@@
from scapy.layers.inet import IP, UDP, Ether
from scapy.layers.inet6 import IPv6
from framework import VppTestCase, VppTestRunner
from scapy.layers.inet6 import IPv6
from framework import VppTestCase, VppTestRunner
-from lisp import *
+from lisp import VppLocalMapping, VppLispAdjacency, VppLispLocator, \
+ VppLispLocatorSet, VppRemoteMapping
from util import ppp, ForeignAddressFactory
# From py_lispnetworking.lisp.py: # GNU General Public License v2.0
from util import ppp, ForeignAddressFactory
# From py_lispnetworking.lisp.py: # GNU General Public License v2.0
@@
-153,18
+154,18
@@
class TestLisp(VppTestCase):
self.deid_ip4_net = self.faf.net
self.deid_ip4 = self.faf.get_ip4()
self.deid_ip4_net = self.faf.net
self.deid_ip4 = self.faf.get_ip4()
- self.seid_ip4 = '{
}/{
}'.format(self.pg0.local_ip4, 32)
+ self.seid_ip4 = '{
!s}/{!s
}'.format(self.pg0.local_ip4, 32)
self.rloc_ip4 = self.pg1.remote_ip4n
test_cases = [
{
'name': 'basic ip4 over ip4',
self.rloc_ip4 = self.pg1.remote_ip4n
test_cases = [
{
'name': 'basic ip4 over ip4',
- 'locator-sets': [VppLispLocatorSet(self, 'ls-4o4')],
+ 'locator-sets': [VppLispLocatorSet(self,
b
'ls-4o4')],
'locators': [
'locators': [
- VppLispLocator(self, self.pg1.sw_if_index, 'ls-4o4')
+ VppLispLocator(self, self.pg1.sw_if_index,
b
'ls-4o4')
],
'local-mappings': [
],
'local-mappings': [
- VppLocalMapping(self, self.seid_ip4, 'ls-4o4')
+ VppLocalMapping(self, self.seid_ip4,
b
'ls-4o4')
],
'remote-mappings': [
VppRemoteMapping(self, self.deid_ip4_net,
],
'remote-mappings': [
VppRemoteMapping(self, self.deid_ip4_net,