X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_lb.py;h=731790bce72e821cd9b00ab5f0834bb28dcf11d7;hb=e877d68407d316adb64baa855985b746dcb2e102;hp=9ba3b7f1042430460d5013d3622c19083e872613;hpb=d72fdf5712200d615d7137911f9177d691ab28f0;p=vpp.git diff --git a/test/test_lb.py b/test/test_lb.py index 9ba3b7f1042..731790bce72 100644 --- a/test/test_lb.py +++ b/test/test_lb.py @@ -1,5 +1,4 @@ import socket -from logging import * from scapy.layers.inet import IP, UDP from scapy.layers.inet6 import IPv6 @@ -7,6 +6,7 @@ from scapy.layers.l2 import Ether, GRE from scapy.packet import Raw from framework import VppTestCase +from util import ppp """ TestLB is a subclass of VPPTestCase classes. @@ -15,6 +15,7 @@ from framework import VppTestCase - IP4 to GRE6 encap - IP6 to GRE4 encap - IP6 to GRE6 encap + - IP4 to L3DSR encap As stated in comments below, GRE has issues with IPv6. All test cases involving IPv6 are executed, but @@ -57,7 +58,7 @@ class TestLB(VppTestCase): def tearDown(self): super(TestLB, self).tearDown() if not self.vpp_dead: - info(self.vapi.cli("show lb vip verbose")) + self.logger.info(self.vapi.cli("show lb vip verbose")) def getIPv4Flow(self, id): return (IP(dst="90.0.%u.%u" % (id / 255, id % 255), @@ -69,9 +70,10 @@ class TestLB(VppTestCase): UDP(sport=10000 + id, dport=20000 + id)) def generatePackets(self, src_if, isv4): + self.reset_packet_infos() pkts = [] for pktid in self.packets: - info = self.create_packet_info(src_if.sw_if_index, pktid) + info = self.create_packet_info(src_if, self.pg1) payload = self.info_to_payload(info) ip = self.getIPv4Flow(pktid) if isv4 else self.getIPv6Flow(pktid) packet = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) / @@ -89,17 +91,13 @@ class TestLB(VppTestCase): self.assertEqual(gre.version, 0) inner = IPver(str(gre.payload)) payload_info = self.payload_to_info(str(inner[Raw])) - self.info = self.get_next_packet_info_for_interface2( - self.pg0.sw_if_index, payload_info.dst, self.info) + self.info = self.packet_infos[payload_info.index] + self.assertEqual(payload_info.src, self.pg0.sw_if_index) self.assertEqual(str(inner), str(self.info.data[IPver])) - def checkCapture(self, gre4, isv4): - out = self.pg0.get_capture() - # This check is edited because RA appears in output, maybe disable RA? - # self.assertEqual(len(out), 0) - self.assertLess(len(out), 20) - out = self.pg1.get_capture() - self.assertEqual(len(out), len(self.packets)) + def checkCapture(self, encap, isv4): + self.pg0.assert_nothing_captured() + out = self.pg1.get_capture(len(self.packets)) load = [0] * len(self.ass) self.info = None @@ -107,7 +105,7 @@ class TestLB(VppTestCase): try: asid = 0 gre = None - if gre4: + if (encap == 'gre4'): ip = p[IP] asid = int(ip.dst.split(".")[3]) self.assertEqual(ip.version, 4) @@ -118,7 +116,8 @@ class TestLB(VppTestCase): self.assertEqual(len(ip.options), 0) self.assertGreaterEqual(ip.ttl, 64) gre = p[GRE] - else: + self.checkInner(gre, isv4) + elif (encap == 'gre6'): ip = p[IPv6] asid = ip.dst.split(":") asid = asid[len(asid) - 1] @@ -135,18 +134,25 @@ class TestLB(VppTestCase): self.assertGreaterEqual(ip.hlim, 64) # self.assertEqual(len(ip.options), 0) gre = GRE(str(p[IPv6].payload)) - self.checkInner(gre, isv4) + self.checkInner(gre, isv4) + if (encap == 'l3dsr'): + ip = p[IP] + asid = int(ip.dst.split(".")[3]) + self.assertEqual(ip.version, 4) + self.assertEqual(ip.flags, 0) + self.assertEqual(ip.dst, "10.0.0.%u" % asid) + self.assertEqual(ip.tos, 0x1c) + self.assertEqual(len(ip.options), 0) load[asid] += 1 except: - error("Unexpected or invalid packet:") - p.show() + self.logger.error(ppp("Unexpected or invalid packet:", p)) raise # This is just to roughly check that the balancing algorithm # is not completly biased. for asid in self.ass: if load[asid] < len(self.packets) / (len(self.ass) * 2): - self.log( + self.logger.error( "ASS is not balanced: load[%d] = %d" % (asid, load[asid])) raise Exception("Load Balancer algorithm is biased") @@ -160,12 +166,13 @@ class TestLB(VppTestCase): self.pg0.add_stream(self.generatePackets(self.pg0, isv4=True)) self.pg_enable_capture(self.pg_interfaces) self.pg_start() - self.checkCapture(gre4=True, isv4=True) + self.checkCapture(encap='gre4', isv4=True) finally: for asid in self.ass: self.vapi.cli("lb as 90.0.0.0/8 10.0.0.%u del" % (asid)) self.vapi.cli("lb vip 90.0.0.0/8 encap gre4 del") + self.vapi.cli("test lb flowtable flush") def test_lb_ip6_gre4(self): """ Load Balancer IP6 GRE4 """ @@ -179,14 +186,12 @@ class TestLB(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - # 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) + self.checkCapture(encap='gre4', isv4=False) finally: for asid in self.ass: self.vapi.cli("lb as 2001::/16 10.0.0.%u del" % (asid)) self.vapi.cli("lb vip 2001::/16 encap gre4 del") + self.vapi.cli("test lb flowtable flush") def test_lb_ip4_gre6(self): """ Load Balancer IP4 GRE6 """ @@ -199,14 +204,12 @@ class TestLB(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - # 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(encap='gre6', isv4=True) finally: for asid in self.ass: - self.vapi.cli("lb as 90.0.0.0/8 2002::%u" % (asid)) + self.vapi.cli("lb as 90.0.0.0/8 2002::%u del" % (asid)) self.vapi.cli("lb vip 90.0.0.0/8 encap gre6 del") + self.vapi.cli("test lb flowtable flush") def test_lb_ip6_gre6(self): """ Load Balancer IP6 GRE6 """ @@ -219,11 +222,27 @@ class TestLB(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - # 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) + self.checkCapture(encap='gre6', isv4=False) finally: for asid in self.ass: self.vapi.cli("lb as 2001::/16 2002::%u del" % (asid)) self.vapi.cli("lb vip 2001::/16 encap gre6 del") + self.vapi.cli("test lb flowtable flush") + + def test_lb_ip4_l3dsr(self): + """ Load Balancer IP4 L3DSR """ + try: + self.vapi.cli("lb vip 90.0.0.0/8 encap l3dsr dscp 7") + for asid in self.ass: + self.vapi.cli("lb as 90.0.0.0/8 10.0.0.%u" % (asid)) + + self.pg0.add_stream(self.generatePackets(self.pg0, isv4=True)) + self.pg_enable_capture(self.pg_interfaces) + self.pg_start() + self.checkCapture(encap='l3dsr', isv4=True) + + finally: + for asid in self.ass: + self.vapi.cli("lb as 90.0.0.0/8 10.0.0.%u del" % (asid)) + self.vapi.cli("lb vip 90.0.0.0/8 encap l3dsr dscp 7 del") + self.vapi.cli("test lb flowtable flush")