X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ip4.py;h=c8c0a71d171f276fd23aeb178f9aae19fa094632;hb=3b0d7e42f;hp=bd44a0a7fc9f4ab89edb13fb9f637ffbc5d896bd;hpb=3d2df215bf1de516ffbd8ee3815091ca3c3a492f;p=vpp.git diff --git a/test/test_ip4.py b/test/test_ip4.py index bd44a0a7fc9..c8c0a71d171 100644 --- a/test/test_ip4.py +++ b/test/test_ip4.py @@ -1,19 +1,22 @@ #!/usr/bin/env python +import binascii import random import socket import unittest +import scapy.compat +from scapy.contrib.mpls import MPLS +from scapy.layers.inet import IP, UDP, TCP, ICMP, icmptypes, icmpcodes +from scapy.layers.l2 import Ether, Dot1Q, ARP +from scapy.packet import Raw +from six import moves + from framework import VppTestCase, VppTestRunner -from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint +from util import ppp from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpMRoute, \ VppMRoutePath, MRouteItfFlags, MRouteEntryFlags, VppMplsIpBind, \ VppMplsTable, VppIpTable - -from scapy.packet import Raw -from scapy.layers.l2 import Ether, Dot1Q, ARP -from scapy.layers.inet import IP, UDP, TCP, ICMP, icmptypes, icmpcodes -from util import ppp -from scapy.contrib.mpls import MPLS +from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint class TestIPv4(VppTestCase): @@ -93,8 +96,9 @@ class TestIPv4(VppTestCase): for i in self.interfaces: next_hop_address = i.local_ip4n for j in range(count / n_int): - self.vapi.ip_add_del_route( - dest_addr, dest_addr_len, next_hop_address) + self.vapi.ip_add_del_route(dst_address=dest_addr, + dst_address_length=dest_addr_len, + next_hop_address=next_hop_address) counter += 1 if counter / count * 100 > percent: self.logger.info("Configure %d FIB entries .. %d%% done" % @@ -133,11 +137,12 @@ class TestIPv4(VppTestCase): UDP(sport=1234, dport=1234)) pkts = [self.modify_packet(src_if, i, pkt_tmpl) - for i in xrange(self.pg_if_packet_sizes[0], - self.pg_if_packet_sizes[1], 10)] + for i in moves.range(self.pg_if_packet_sizes[0], + self.pg_if_packet_sizes[1], 10)] pkts_b = [self.modify_packet(src_if, i, pkt_tmpl) - for i in xrange(self.pg_if_packet_sizes[1] + hdr_ext, - self.pg_if_packet_sizes[2] + hdr_ext, 50)] + for i in moves.range(self.pg_if_packet_sizes[1] + hdr_ext, + self.pg_if_packet_sizes[2] + hdr_ext, + 50)] pkts.extend(pkts_b) return pkts @@ -165,7 +170,7 @@ class TestIPv4(VppTestCase): try: ip = packet[IP] udp = packet[UDP] - payload_info = self.payload_to_info(str(packet[Raw])) + payload_info = self.payload_to_info(packet[Raw]) packet_index = payload_info.index self.assertEqual(payload_info.dst, dst_sw_if_index) self.logger.debug( @@ -302,15 +307,15 @@ class TestIPv4FibCrud(VppTestCase): :return list: added ips with 32 prefix """ added_ips = [] - dest_addr = int(socket.inet_pton(socket.AF_INET, - start_dest_addr).encode('hex'), - 16) + dest_addr = int(binascii.hexlify(socket.inet_pton(socket.AF_INET, + start_dest_addr)), 16) dest_addr_len = 32 n_next_hop_addr = socket.inet_pton(socket.AF_INET, next_hop_addr) for _ in range(count): - n_dest_addr = '{:08x}'.format(dest_addr).decode('hex') - self.vapi.ip_add_del_route(n_dest_addr, dest_addr_len, - n_next_hop_addr) + n_dest_addr = binascii.unhexlify('{:08x}'.format(dest_addr)) + self.vapi.ip_add_del_route(dst_address=n_dest_addr, + dst_address_length=dest_addr_len, + next_hop_address=n_next_hop_addr) added_ips.append(socket.inet_ntoa(n_dest_addr)) dest_addr += 1 return added_ips @@ -318,15 +323,16 @@ class TestIPv4FibCrud(VppTestCase): def unconfig_fib_many_to_one(self, start_dest_addr, next_hop_addr, count): removed_ips = [] - dest_addr = int(socket.inet_pton(socket.AF_INET, - start_dest_addr).encode('hex'), - 16) + dest_addr = int(binascii.hexlify(socket.inet_pton(socket.AF_INET, + start_dest_addr)), 16) dest_addr_len = 32 n_next_hop_addr = socket.inet_pton(socket.AF_INET, next_hop_addr) for _ in range(count): - n_dest_addr = '{:08x}'.format(dest_addr).decode('hex') - self.vapi.ip_add_del_route(n_dest_addr, dest_addr_len, - n_next_hop_addr, is_add=0) + n_dest_addr = binascii.unhexlify('{:08x}'.format(dest_addr)) + self.vapi.ip_add_del_route(dst_address=n_dest_addr, + dst_address_length=dest_addr_len, + next_hop_address=n_next_hop_addr, + is_add=0) removed_ips.append(socket.inet_ntoa(n_dest_addr)) dest_addr += 1 return removed_ips @@ -350,8 +356,8 @@ class TestIPv4FibCrud(VppTestCase): def _find_ip_match(self, find_in, pkt): for p in find_in: - if self.payload_to_info(str(p[Raw])) == \ - self.payload_to_info(str(pkt[Raw])): + if self.payload_to_info(p[Raw]) == \ + self.payload_to_info(pkt[Raw]): if p[IP].src != pkt[IP].src: break if p[IP].dst != pkt[IP].dst: @@ -394,7 +400,7 @@ class TestIPv4FibCrud(VppTestCase): for ip in ips: self.assertTrue(_ip_in_route_dump(ip, fib_dump), - 'IP {} is not in fib dump.'.format(ip)) + 'IP {!s} is not in fib dump.'.format(ip)) def verify_not_in_route_dump(self, fib_dump, ips): @@ -405,7 +411,7 @@ class TestIPv4FibCrud(VppTestCase): for ip in ips: self.assertFalse(_ip_in_route_dump(ip, fib_dump), - 'IP {} is in fib dump.'.format(ip)) + 'IP {!s} is in fib dump.'.format(ip)) @classmethod def setUpClass(cls): @@ -440,6 +446,9 @@ class TestIPv4FibCrud(VppTestCase): super(TestIPv4FibCrud, self).setUp() self.reset_packet_infos() + self.configured_routes = [] + self.deleted_routes = [] + def test_1_add_routes(self): """ Add 1k routes @@ -470,6 +479,9 @@ class TestIPv4FibCrud(VppTestCase): - delete 10 routes check with traffic script. """ + # config 1M FIB entries + self.configured_routes.extend(self.config_fib_many_to_one( + "10.0.0.0", self.pg0.remote_ip4, 100)) self.deleted_routes.extend(self.unconfig_fib_many_to_one( "10.0.0.10", self.pg0.remote_ip4, 10)) for x in self.deleted_routes: @@ -500,6 +512,14 @@ class TestIPv4FibCrud(VppTestCase): - re-add 5 routes check with traffic script. - add 100 routes check with traffic script. """ + # config 1M FIB entries + self.configured_routes.extend(self.config_fib_many_to_one( + "10.0.0.0", self.pg0.remote_ip4, 100)) + self.deleted_routes.extend(self.unconfig_fib_many_to_one( + "10.0.0.10", self.pg0.remote_ip4, 10)) + for x in self.deleted_routes: + self.configured_routes.remove(x) + tmp = self.config_fib_many_to_one( "10.0.0.10", self.pg0.remote_ip4, 5) self.configured_routes.extend(tmp) @@ -789,9 +809,9 @@ class TestIPSubNets(VppTestCase): # ip_addr_n = socket.inet_pton(socket.AF_INET, "10.10.10.10") - self.vapi.sw_interface_add_del_address(self.pg0.sw_if_index, - ip_addr_n, - 16) + self.vapi.sw_interface_add_del_address( + sw_if_index=self.pg0.sw_if_index, address=ip_addr_n, + address_length=16) pn = (Ether(src=self.pg1.remote_mac, dst=self.pg1.local_mac) / @@ -808,10 +828,9 @@ class TestIPSubNets(VppTestCase): self.send_and_assert_no_replies(self.pg1, pb, "IP Broadcast address") # remove the sub-net and we are forwarding via the cover again - self.vapi.sw_interface_add_del_address(self.pg0.sw_if_index, - ip_addr_n, - 16, - is_add=0) + self.vapi.sw_interface_add_del_address( + sw_if_index=self.pg0.sw_if_index, address=ip_addr_n, + address_length=16, is_add=0) self.pg1.add_stream(pn) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -827,9 +846,9 @@ class TestIPSubNets(VppTestCase): # ip_addr_n = socket.inet_pton(socket.AF_INET, "10.10.10.10") - self.vapi.sw_interface_add_del_address(self.pg0.sw_if_index, - ip_addr_n, - 31) + self.vapi.sw_interface_add_del_address( + sw_if_index=self.pg0.sw_if_index, address=ip_addr_n, + address_length=31) pn = (Ether(src=self.pg1.remote_mac, dst=self.pg1.local_mac) / @@ -844,10 +863,9 @@ class TestIPSubNets(VppTestCase): rx[ARP] # remove the sub-net and we are forwarding via the cover again - self.vapi.sw_interface_add_del_address(self.pg0.sw_if_index, - ip_addr_n, - 31, - is_add=0) + self.vapi.sw_interface_add_del_address( + sw_if_index=self.pg0.sw_if_index, address=ip_addr_n, + address_length=31, is_add=0) self.pg1.add_stream(pn) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -881,9 +899,13 @@ class TestIPLoadBalance(VppTestCase): input.add_stream(pkts) self.pg_enable_capture(self.pg_interfaces) self.pg_start() + rxs = [] for oo in outputs: rx = oo._get_capture(1) self.assertNotEqual(0, len(rx)) + for r in rx: + rxs.append(r) + return rxs def send_and_expect_one_itf(self, input, pkts, itf): input.add_stream(pkts) @@ -962,7 +984,7 @@ class TestIPLoadBalance(VppTestCase): # - now only the stream with differing source address will # load-balance # - self.vapi.set_ip_flow_hash(0, src=1, dst=1, sport=0, dport=0) + self.vapi.set_ip_flow_hash(vrf_id=0, src=1, dst=1, sport=0, dport=0) self.send_and_expect_load_balancing(self.pg0, src_ip_pkts, [self.pg1, self.pg2]) @@ -974,7 +996,7 @@ class TestIPLoadBalance(VppTestCase): # # change the flow hash config back to defaults # - self.vapi.set_ip_flow_hash(0, src=1, dst=1, sport=1, dport=1) + self.vapi.set_ip_flow_hash(vrf_id=0, src=1, dst=1, sport=1, dport=1) # # Recursive prefixes @@ -1019,6 +1041,53 @@ class TestIPLoadBalance(VppTestCase): [self.pg1, self.pg2, self.pg3, self.pg4]) + # + # bring down pg1 expect LB to adjust to use only those that are pu + # + self.pg1.link_down() + + rx = self.send_and_expect_load_balancing(self.pg0, src_pkts, + [self.pg2, self.pg3, + self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + + # + # bring down pg2 expect LB to adjust to use only those that are pu + # + self.pg2.link_down() + + rx = self.send_and_expect_load_balancing(self.pg0, src_pkts, + [self.pg3, self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + + # + # bring the links back up - expect LB over all again + # + self.pg1.link_up() + self.pg2.link_up() + + rx = self.send_and_expect_load_balancing(self.pg0, src_pkts, + [self.pg1, self.pg2, + self.pg3, self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + + # + # The same link-up/down but this time admin state + # + self.pg1.admin_down() + self.pg2.admin_down() + rx = self.send_and_expect_load_balancing(self.pg0, src_pkts, + [self.pg3, self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + self.pg1.admin_up() + self.pg2.admin_up() + self.pg1.resolve_arp() + self.pg2.resolve_arp() + rx = self.send_and_expect_load_balancing(self.pg0, src_pkts, + [self.pg1, self.pg2, + self.pg3, self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + # # Recursive prefixes # - testing that 2 stages of load-balancing, no choices @@ -1042,11 +1111,41 @@ class TestIPLoadBalance(VppTestCase): route_1_1_1_2.add_vpp_config() # - # inject the packet on pg0 - expect load-balancing across all 4 paths + # inject the packet on pg0 - rx only on via routes output interface # self.vapi.cli("clear trace") self.send_and_expect_one_itf(self.pg0, port_pkts, self.pg3) + # + # Add a LB route in the presence of a down link - expect no + # packets over the down link + # + self.pg3.link_down() + + route_10_0_0_3 = VppIpRoute(self, "10.0.0.3", 32, + [VppRoutePath(self.pg3.remote_ip4, + self.pg3.sw_if_index), + VppRoutePath(self.pg4.remote_ip4, + self.pg4.sw_if_index)]) + route_10_0_0_3.add_vpp_config() + + port_pkts = [] + for ii in range(257): + port_pkts.append(Ether(src=self.pg0.remote_mac, + dst=self.pg0.local_mac) / + IP(dst="10.0.0.3", src="20.0.0.2") / + UDP(sport=1234, dport=1234 + ii) / + Raw('\xa5' * 100)) + + self.send_and_expect_one_itf(self.pg0, port_pkts, self.pg4) + + # bring the link back up + self.pg3.link_up() + + rx = self.send_and_expect_load_balancing(self.pg0, port_pkts, + [self.pg3, self.pg4]) + self.assertEqual(len(src_pkts), len(rx)) + class TestIPVlan0(VppTestCase): """ IPv4 VLAN-0 """ @@ -1095,7 +1194,7 @@ class TestIPPunt(VppTestCase): def setUp(self): super(TestIPPunt, self).setUp() - self.create_pg_interfaces(range(2)) + self.create_pg_interfaces(range(4)) for i in self.pg_interfaces: i.admin_up() @@ -1122,8 +1221,7 @@ class TestIPPunt(VppTestCase): # # Configure a punt redirect via pg1. # - nh_addr = socket.inet_pton(socket.AF_INET, - self.pg1.remote_ip4) + nh_addr = self.pg1.remote_ip4 self.vapi.ip_punt_redirect(self.pg0.sw_if_index, self.pg1.sw_if_index, nh_addr) @@ -1133,7 +1231,7 @@ class TestIPPunt(VppTestCase): # # add a policer # - policer = self.vapi.policer_add_del("ip4-punt", 400, 0, 10, 0, + policer = self.vapi.policer_add_del(b"ip4-punt", 400, 0, 10, 0, rate_type=1) self.vapi.ip_punt_police(policer.policer_index) @@ -1154,7 +1252,7 @@ class TestIPPunt(VppTestCase): # remove the poilcer. back to full rx # self.vapi.ip_punt_police(policer.policer_index, is_add=0) - self.vapi.policer_add_del("ip4-punt", 400, 0, 10, 0, + self.vapi.policer_add_del(b"ip4-punt", 400, 0, 10, 0, rate_type=1, is_add=0) self.send_and_expect(self.pg0, pkts, self.pg1) @@ -1181,6 +1279,40 @@ class TestIPPunt(VppTestCase): nh_addr, is_add=0) + def test_ip_punt_dump(self): + """ IP4 punt redirect dump""" + + # + # Configure a punt redirects + # + nh_address = self.pg3.remote_ip4 + self.vapi.ip_punt_redirect(self.pg0.sw_if_index, + self.pg3.sw_if_index, + nh_address) + self.vapi.ip_punt_redirect(self.pg1.sw_if_index, + self.pg3.sw_if_index, + nh_address) + self.vapi.ip_punt_redirect(self.pg2.sw_if_index, + self.pg3.sw_if_index, + '0.0.0.0') + + # + # Dump pg0 punt redirects + # + punts = self.vapi.ip_punt_redirect_dump(self.pg0.sw_if_index) + for p in punts: + self.assertEqual(p.punt.rx_sw_if_index, self.pg0.sw_if_index) + + # + # Dump punt redirects for all interfaces + # + punts = self.vapi.ip_punt_redirect_dump(0xffffffff) + self.assertEqual(len(punts), 3) + for p in punts: + self.assertEqual(p.punt.tx_sw_if_index, self.pg3.sw_if_index) + self.assertNotEqual(punts[1].punt.nh, self.pg3.remote_ip4) + self.assertEqual(str(punts[2].punt.nh), '0.0.0.0') + class TestIPDeag(VppTestCase): """ IPv4 Deaggregate Routes """ @@ -1436,6 +1568,25 @@ class TestIPInput(VppTestCase): # Reset MTU for subsequent tests self.vapi.sw_interface_set_mtu(self.pg1.sw_if_index, [9000, 0, 0, 0]) + # + # source address 0.0.0.0 and 25.255.255.255 and for-us + # + p_s0 = (Ether(src=self.pg0.remote_mac, + dst=self.pg0.local_mac) / + IP(src="0.0.0.0", + dst=self.pg0.local_ip4) / + ICMP(id=4, seq=4) / + Raw(load='\x0a' * 18)) + rx = self.send_and_assert_no_replies(self.pg0, p_s0 * 17) + + p_s0 = (Ether(src=self.pg0.remote_mac, + dst=self.pg0.local_mac) / + IP(src="255.255.255.255", + dst=self.pg0.local_ip4) / + ICMP(id=4, seq=4) / + Raw(load='\x0a' * 18)) + rx = self.send_and_assert_no_replies(self.pg0, p_s0 * 17) + class TestIPDirectedBroadcast(VppTestCase): """ IPv4 Directed Broadcast """