Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
acl: revert acl: api cleanup
[vpp.git]
/
test
/
test_vxlan_gbp.py
diff --git
a/test/test_vxlan_gbp.py
b/test/test_vxlan_gbp.py
index
64e51b0
..
19790df
100644
(file)
--- a/
test/test_vxlan_gbp.py
+++ b/
test/test_vxlan_gbp.py
@@
-5,9
+5,9
@@
from util import ip4_range, reassemble4_ether
import unittest
from framework import VppTestCase, VppTestRunner
from template_bd import BridgeDomain
import unittest
from framework import VppTestCase, VppTestRunner
from template_bd import BridgeDomain
-from vpp_ip import VppIpAddress
-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.vxlan import VXLAN
from scapy.utils import atol
from scapy.layers.inet import IP, UDP
from scapy.layers.vxlan import VXLAN
from scapy.utils import atol
@@
-104,8
+104,8
@@
class TestVxlanGbp(VppTestCase):
rip.add_vpp_config()
r = cls.vapi.vxlan_gbp_tunnel_add_del(
tunnel={
rip.add_vpp_config()
r = cls.vapi.vxlan_gbp_tunnel_add_del(
tunnel={
- 'src':
VppIpAddress(cls.pg0.local_ip4).encode()
,
- 'dst':
VppIpAddress(dest_ip4).encode()
,
+ 'src':
cls.pg0.local_ip4
,
+ 'dst':
dest_ip4
,
'vni': vni,
'instance': INVALID_INDEX,
'mcast_sw_if_index': INVALID_INDEX,
'vni': vni,
'instance': INVALID_INDEX,
'mcast_sw_if_index': INVALID_INDEX,
@@
-147,8
+147,8
@@
class TestVxlanGbp(VppTestCase):
cls.single_tunnel_bd = 1
r = cls.vapi.vxlan_gbp_tunnel_add_del(
tunnel={
cls.single_tunnel_bd = 1
r = cls.vapi.vxlan_gbp_tunnel_add_del(
tunnel={
- 'src':
VppIpAddress(cls.pg0.local_ip4).encode()
,
- 'dst':
VppIpAddress(cls.pg0.remote_ip4).encode()
,
+ 'src':
cls.pg0.local_ip4
,
+ 'dst':
cls.pg0.remote_ip4
,
'vni': cls.single_tunnel_bd,
'instance': INVALID_INDEX,
'mcast_sw_if_index': INVALID_INDEX,
'vni': cls.single_tunnel_bd,
'instance': INVALID_INDEX,
'mcast_sw_if_index': INVALID_INDEX,