Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ikev2: support responder hostname
[vpp.git]
/
test
/
template_bd.py
diff --git
a/test/template_bd.py
b/test/template_bd.py
index
39f7143
..
bebe76d
100644
(file)
--- a/
test/template_bd.py
+++ b/
test/template_bd.py
@@
-1,16
+1,13
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
3
import abc
import abc
-import six
-from scapy.layers.l2 import Ether, Raw
+from scapy.layers.l2 import Ether
+from scapy.packet import Raw
from scapy.layers.inet import IP, UDP
from scapy.layers.inet import IP, UDP
-from util import ip4_range
-
-@six.add_metaclass(abc.ABCMeta)
-class BridgeDomain(object):
+class BridgeDomain(metaclass=abc.ABCMeta):
""" Bridge domain abstraction """
@property
""" Bridge domain abstraction """
@property
@@
-73,7
+70,7
@@
class BridgeDomain(object):
"""
encapsulated_pkt = self.encapsulate(self.frame_request,
"""
encapsulated_pkt = self.encapsulate(self.frame_request,
- self.single_tunnel_
bd
)
+ self.single_tunnel_
vni
)
self.pg0.add_stream([encapsulated_pkt, ])
self.pg0.add_stream([encapsulated_pkt, ])
@@
-101,7
+98,7
@@
class BridgeDomain(object):
# Pick first received frame and check if it's correctly encapsulated.
out = self.pg0.get_capture(1)
pkt = out[0]
# Pick first received frame and check if it's correctly encapsulated.
out = self.pg0.get_capture(1)
pkt = out[0]
- self.check_encapsulation(pkt, self.single_tunnel_
bd
)
+ self.check_encapsulation(pkt, self.single_tunnel_
vni
)
payload = self.decapsulate(pkt)
self.assert_eq_pkts(payload, self.frame_reply)
payload = self.decapsulate(pkt)
self.assert_eq_pkts(payload, self.frame_reply)