Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Tests: Raise exception, don't raise string.
[vpp.git]
/
test
/
test_vxlan_gpe.py
diff --git
a/test/test_vxlan_gpe.py
b/test/test_vxlan_gpe.py
index
61d86fe
..
36661a9
100644
(file)
--- a/
test/test_vxlan_gpe.py
+++ b/
test/test_vxlan_gpe.py
@@
-1,7
+1,7
@@
#!/usr/bin/env python
import socket
#!/usr/bin/env python
import socket
-from util import ip4n_range
+from util import ip4n_range
, ip4_range
import unittest
from framework import VppTestCase, VppTestRunner, running_extended_tests
from template_bd import BridgeDomain
import unittest
from framework import VppTestCase, VppTestRunner, running_extended_tests
from template_bd import BridgeDomain
@@
-12,7
+12,7
@@
from scapy.layers.vxlan import VXLAN
from scapy.utils import atol
from scapy.utils import atol
-@unittest.skipUnless(running_extended_tests
()
, "part of extended tests")
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
class TestVxlanGpe(BridgeDomain, VppTestCase):
""" VXLAN-GPE Test Case """
class TestVxlanGpe(BridgeDomain, VppTestCase):
""" VXLAN-GPE Test Case """
@@
-31,6
+31,10
@@
class TestVxlanGpe(BridgeDomain, VppTestCase):
VXLAN(vni=vni, flags=self.flags) /
pkt)
VXLAN(vni=vni, flags=self.flags) /
pkt)
+ def ip_range(self, start, end):
+ """ range of remote ip's """
+ return ip4_range(self.pg0.remote_ip4, start, end)
+
def encap_mcast(self, pkt, src_ip, src_mac, vni):
"""
Encapsulate the original payload frame by adding VXLAN-GPE header
def encap_mcast(self, pkt, src_ip, src_mac, vni):
"""
Encapsulate the original payload frame by adding VXLAN-GPE header
@@
-83,12
+87,15
@@
class TestVxlanGpe(BridgeDomain, VppTestCase):
for dest_ip4n in ip4n_range(next_hop_address, ip_range_start,
ip_range_end):
# add host route so dest_ip4n will not be resolved
for dest_ip4n in ip4n_range(next_hop_address, ip_range_start,
ip_range_end):
# add host route so dest_ip4n will not be resolved
- cls.vapi.ip_add_del_route(dest_ip4n, 32, next_hop_address)
+ cls.vapi.ip_add_del_route(dst_address=dest_ip4n,
+ dst_address_length=32,
+ next_hop_address=next_hop_address)
r = cls.vapi.vxlan_gpe_add_del_tunnel(
src_addr=cls.pg0.local_ip4n,
dst_addr=dest_ip4n,
vni=vni)
r = cls.vapi.vxlan_gpe_add_del_tunnel(
src_addr=cls.pg0.local_ip4n,
dst_addr=dest_ip4n,
vni=vni)
- cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index, bd_id=vni)
+ cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index,
+ bd_id=vni)
@classmethod
def add_del_shared_mcast_dst_load(cls, is_add):
@classmethod
def add_del_shared_mcast_dst_load(cls, is_add):
@@
-107,7
+114,7
@@
class TestVxlanGpe(BridgeDomain, VppTestCase):
vni=vni,
is_add=is_add)
if r.sw_if_index == 0xffffffff:
vni=vni,
is_add=is_add)
if r.sw_if_index == 0xffffffff:
- raise
"bad sw_if_index"
+ raise
ValueError("bad sw_if_index: ~0")
@classmethod
def add_shared_mcast_dst_load(cls):
@classmethod
def add_shared_mcast_dst_load(cls):
@@
-181,10
+188,10
@@
class TestVxlanGpe(BridgeDomain, VppTestCase):
src_addr=cls.pg0.local_ip4n,
dst_addr=cls.pg0.remote_ip4n,
vni=cls.single_tunnel_bd)
src_addr=cls.pg0.local_ip4n,
dst_addr=cls.pg0.remote_ip4n,
vni=cls.single_tunnel_bd)
- cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index,
- bd_id=cls.single_tunnel_bd)
- cls.vapi.sw_interface_set_l2_bridge(cls.pg1.sw_if_index,
+ cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index,
bd_id=cls.single_tunnel_bd)
bd_id=cls.single_tunnel_bd)
+ cls.vapi.sw_interface_set_l2_bridge(
+ rx_sw_if_index=cls.pg1.sw_if_index, bd_id=cls.single_tunnel_bd)
# Setup vni 2 to test multicast flooding
cls.n_ucast_tunnels = 10
# Setup vni 2 to test multicast flooding
cls.n_ucast_tunnels = 10
@@
-196,10
+203,10
@@
class TestVxlanGpe(BridgeDomain, VppTestCase):
dst_addr=cls.mcast_ip4n,
mcast_sw_if_index=1,
vni=cls.mcast_flood_bd)
dst_addr=cls.mcast_ip4n,
mcast_sw_if_index=1,
vni=cls.mcast_flood_bd)
- cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index,
- bd_id=cls.mcast_flood_bd)
- cls.vapi.sw_interface_set_l2_bridge(cls.pg2.sw_if_index,
+ cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index,
bd_id=cls.mcast_flood_bd)
bd_id=cls.mcast_flood_bd)
+ cls.vapi.sw_interface_set_l2_bridge(
+ rx_sw_if_index=cls.pg2.sw_if_index, bd_id=cls.mcast_flood_bd)
# Add and delete mcast tunnels to check stability
cls.add_shared_mcast_dst_load()
# Add and delete mcast tunnels to check stability
cls.add_shared_mcast_dst_load()
@@
-211,12
+218,16
@@
class TestVxlanGpe(BridgeDomain, VppTestCase):
cls.ucast_flood_bd = 13
cls.create_vxlan_gpe_flood_test_bd(cls.ucast_flood_bd,
cls.n_ucast_tunnels)
cls.ucast_flood_bd = 13
cls.create_vxlan_gpe_flood_test_bd(cls.ucast_flood_bd,
cls.n_ucast_tunnels)
- cls.vapi.sw_interface_set_l2_bridge(
cls.pg3.sw_if_index,
-
bd_id=cls.ucast_flood_bd)
+ cls.vapi.sw_interface_set_l2_bridge(
+
rx_sw_if_index=cls.pg3.sw_if_index,
bd_id=cls.ucast_flood_bd)
except Exception:
super(TestVxlanGpe, cls).tearDownClass()
raise
except Exception:
super(TestVxlanGpe, cls).tearDownClass()
raise
+ @classmethod
+ def tearDownClass(cls):
+ super(TestVxlanGpe, cls).tearDownClass()
+
@unittest.skip("test disabled for vxlan-gpe")
def test_mcast_flood(self):
""" inherited from BridgeDomain """
@unittest.skip("test disabled for vxlan-gpe")
def test_mcast_flood(self):
""" inherited from BridgeDomain """