diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2016-11-08 08:48:30 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2016-11-09 11:44:59 +0000 |
| commit | d72fdf5712200d615d7137911f9177d691ab28f0 (patch) | |
| tree | b1f5d5948d264e38ae7ea10b24d30fc12686a513 | |
| parent | b7e2f3d312927f2a8f1b2c8030b2e8ffe3288bab (diff) | |
Disable non-working checks in load-balancer test and rename ip->ip4
Change-Id: If62011e29e912bf0c47625b0d3b3624ef6375013
Signed-off-by: Klement Sekera <ksekera@cisco.com>
| -rw-r--r-- | test/test_ip4.py (renamed from test/test_ip.py) | 0 | ||||
| -rw-r--r-- | test/test_lb.py | 19 |
2 files changed, 11 insertions, 8 deletions
diff --git a/test/test_ip.py b/test/test_ip4.py index 48155a5a025..48155a5a025 100644 --- a/test/test_ip.py +++ b/test/test_ip4.py diff --git a/test/test_lb.py b/test/test_lb.py index 76fdd693397..9ba3b7f1042 100644 --- a/test/test_lb.py +++ b/test/test_lb.py @@ -1,5 +1,4 @@ import socket -import unittest from logging import * from scapy.layers.inet import IP, UDP @@ -90,10 +89,8 @@ class TestLB(VppTestCase): self.assertEqual(gre.version, 0) inner = IPver(str(gre.payload)) payload_info = self.payload_to_info(str(inner[Raw])) - packet_index = payload_info.index - self.info = self.get_next_packet_info_for_interface2(self.pg0.sw_if_index, - payload_info.dst, - self.info) + self.info = self.get_next_packet_info_for_interface2( + self.pg0.sw_if_index, payload_info.dst, self.info) self.assertEqual(str(inner), str(self.info.data[IPver])) def checkCapture(self, gre4, isv4): @@ -182,7 +179,10 @@ class TestLB(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - self.checkCapture(gre4=True, isv4=False) + # Scapy fails parsing GRE over IPv6. + # This check is therefore disabled for now. + # One can easily patch layers/inet6.py to fix the issue. + # self.checkCapture(gre4=True, isv4=False) finally: for asid in self.ass: self.vapi.cli("lb as 2001::/16 10.0.0.%u del" % (asid)) @@ -202,7 +202,7 @@ class TestLB(VppTestCase): # Scapy fails parsing GRE over IPv6. # This check is therefore disabled for now. # One can easily patch layers/inet6.py to fix the issue. - self.checkCapture(gre4=False, isv4=True) + # self.checkCapture(gre4=False, isv4=True) finally: for asid in self.ass: self.vapi.cli("lb as 90.0.0.0/8 2002::%u" % (asid)) @@ -219,7 +219,10 @@ class TestLB(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - self.checkCapture(gre4=False, isv4=False) + # Scapy fails parsing GRE over IPv6. + # This check is therefore disabled for now. + # One can easily patch layers/inet6.py to fix the issue. + # self.checkCapture(gre4=False, isv4=False) finally: for asid in self.ass: self.vapi.cli("lb as 2001::/16 2002::%u del" % (asid)) |