X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ip4_vrf_multi_instance.py;h=c0e2ff31c469cedad3f9dc5c3583023adbbbc633;hb=266929f2e498a8748edd8fc6ba5ef4e28226d04c;hp=76a32adf690e1955d1c94723b68c508843c90626;hpb=9a475373ed9b1ff9952acc06353ddaa50c2c96bd;p=vpp.git diff --git a/test/test_ip4_vrf_multi_instance.py b/test/test_ip4_vrf_multi_instance.py old mode 100644 new mode 100755 index 76a32adf690..c0e2ff31c46 --- a/test/test_ip4_vrf_multi_instance.py +++ b/test/test_ip4_vrf_multi_instance.py @@ -1,11 +1,11 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """IP4 VRF Multi-instance Test Case HLD: **NOTES:** - higher number of pg-ip4 interfaces causes problems => only 15 pg-ip4 \ - interfaces in 5 VRFs are tested + interfaces in 5 VRFs are tested - jumbo packets in configuration with 15 pg-ip4 interfaces leads to \ - problems too + problems too **config 1** - add 15 pg-ip4 interfaces @@ -18,8 +18,8 @@ **verify 1** - check VRF data by parsing output of ip_fib_dump API command - - all packets received correctly in case of pg-ip4 interfaces in the same - VRF + - all packets received correctly in case of pg-ip4 interfaces in the + same VRF - no packet received in case of pg-ip4 interfaces not in VRF - no packet received in case of pg-ip4 interfaces in different VRFs @@ -30,8 +30,8 @@ - send IP4 packets between all pg-ip4 interfaces in all VRF groups **verify 2** - - all packets received correctly in case of pg-ip4 interfaces in the same - VRF + - all packets received correctly in case of pg-ip4 interfaces in the + same VRF - no packet received in case of pg-ip4 interfaces not in VRF - no packet received in case of pg-ip4 interfaces in different VRFs @@ -43,8 +43,8 @@ **verify 3** - check VRF data by parsing output of ip_fib_dump API command - - all packets received correctly in case of pg-ip4 interfaces in the same - VRF + - all packets received correctly in case of pg-ip4 interfaces in the + same VRF - no packet received in case of pg-ip4 interfaces not in VRF - no packet received in case of pg-ip4 interfaces in different VRFs @@ -56,8 +56,8 @@ **verify 4** - check VRF data by parsing output of ip_fib_dump API command - - all packets received correctly in case of pg-ip4 interfaces in the same - VRF + - all packets received correctly in case of pg-ip4 interfaces in the + same VRF - no packet received in case of pg-ip4 interfaces not in VRF - no packet received in case of pg-ip4 interfaces in different VRFs """ @@ -66,9 +66,10 @@ import unittest import random import socket +import scapy.compat from scapy.packet import Raw -from scapy.layers.l2 import Ether -from scapy.layers.inet import IP, UDP, ARP +from scapy.layers.l2 import Ether, ARP +from scapy.layers.inet import IP, UDP from framework import VppTestCase, VppTestRunner from util import ppp @@ -107,7 +108,7 @@ class TestIp4VrfMultiInst(VppTestCase): # Packet flows mapping pg0 -> pg1, pg2 etc. cls.flows = dict() for i in range(len(cls.pg_interfaces)): - multiplicand = i / cls.pg_ifs_per_vrf + multiplicand = i // cls.pg_ifs_per_vrf pg_list = [ cls.pg_interfaces[multiplicand * cls.pg_ifs_per_vrf + j] for j in range(cls.pg_ifs_per_vrf) @@ -147,6 +148,10 @@ class TestIp4VrfMultiInst(VppTestCase): super(TestIp4VrfMultiInst, cls).tearDownClass() raise + @classmethod + def tearDownClass(cls): + super(TestIp4VrfMultiInst, cls).tearDownClass() + def setUp(self): """ Clear trace and packet infos before running each test. @@ -159,9 +164,10 @@ class TestIp4VrfMultiInst(VppTestCase): Show various debug prints after each test. """ super(TestIp4VrfMultiInst, self).tearDown() - if not self.vpp_dead: - self.logger.info(self.vapi.ppcli("show ip fib")) - self.logger.info(self.vapi.ppcli("show ip arp")) + + def show_commands_at_teardown(self): + self.logger.info(self.vapi.ppcli("show ip fib")) + self.logger.info(self.vapi.ppcli("show ip4 neighbors")) def create_vrf_and_assign_interfaces(self, count, start=1): """ @@ -176,9 +182,7 @@ class TestIp4VrfMultiInst(VppTestCase): for i in range(count): vrf_id = i + start pg_if = self.pg_if_by_vrf_id[vrf_id][0] - dest_addr = pg_if.local_ip4n - dest_addr_len = 24 - self.vapi.ip_table_add_del(is_add=1, table_id=vrf_id) + self.vapi.ip_table_add_del(is_add=1, table={'table_id': vrf_id}) self.logger.info("IPv4 VRF ID %d created" % vrf_id) if vrf_id not in self.vrf_list: self.vrf_list.append(vrf_id) @@ -196,7 +200,7 @@ class TestIp4VrfMultiInst(VppTestCase): pg_if.config_ip4() pg_if.configure_ipv4_neighbors() self.logger.debug(self.vapi.ppcli("show ip fib")) - self.logger.debug(self.vapi.ppcli("show ip arp")) + self.logger.debug(self.vapi.ppcli("show ip4 neighbors")) def reset_vrf_and_remove_from_vrf_list(self, vrf_id): """ @@ -204,8 +208,7 @@ class TestIp4VrfMultiInst(VppTestCase): :param int vrf_id: The FIB table / VRF ID to be reset. """ - # self.vapi.reset_vrf(vrf_id, is_ipv6=0) - self.vapi.reset_fib(vrf_id, is_ipv6=0) + self.vapi.ip_table_flush(table={'table_id': vrf_id}) if vrf_id in self.vrf_list: self.vrf_list.remove(vrf_id) if vrf_id not in self.vrf_reset_list: @@ -219,8 +222,8 @@ class TestIp4VrfMultiInst(VppTestCase): self.pg_not_in_vrf.append(pg_if) self.logger.info("IPv4 VRF ID %d reset finished" % vrf_id) self.logger.debug(self.vapi.ppcli("show ip fib")) - self.logger.debug(self.vapi.ppcli("show ip arp")) - self.vapi.ip_table_add_del(is_add=0, table_id=vrf_id) + self.logger.debug(self.vapi.ppcli("show ip neighbors")) + self.vapi.ip_table_add_del(is_add=0, table={'table_id': vrf_id}) def create_stream(self, src_if, packet_sizes): """ @@ -296,7 +299,7 @@ class TestIp4VrfMultiInst(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("Got packet on port %s: src=%u (id=%u)" % @@ -331,23 +334,20 @@ class TestIp4VrfMultiInst(VppTestCase): :param int vrf_id: The FIB table / VRF ID to be verified. :return: 1 if the FIB table / VRF ID is configured, otherwise return 0. """ - ip_fib_dump = self.vapi.ip_fib_dump() - vrf_exist = False + ip_fib_dump = self.vapi.ip_route_dump(vrf_id) + vrf_exist = len(ip_fib_dump) vrf_count = 0 for ip_fib_details in ip_fib_dump: - if ip_fib_details.table_id == vrf_id: - if not vrf_exist: - vrf_exist = True - addr = socket.inet_ntoa(ip_fib_details.address) - found = False - for pg_if in self.pg_if_by_vrf_id[vrf_id]: - if found: + addr = ip_fib_details.route.prefix.network_address + found = False + for pg_if in self.pg_if_by_vrf_id[vrf_id]: + if found: + break + for host in pg_if.remote_hosts: + if str(addr) == host.ip4: + vrf_count += 1 + found = True break - for host in pg_if.remote_hosts: - if str(addr) == str(host.ip4): - vrf_count += 1 - found = True - break if not vrf_exist and vrf_count == 0: self.logger.info("IPv4 VRF ID %d is not configured" % vrf_id) return VRFState.not_configured @@ -396,9 +396,10 @@ class TestIp4VrfMultiInst(VppTestCase): def run_crosswise_vrf_test(self): """ Create packet streams for every pg-ip4 interface in VRF towards all - pg-ip4 interfaces in other VRFs, send all prepared packet streams and \ + pg-ip4 interfaces in other VRFs, send all prepared packet streams and verify that: - - no packet received on all configured pg-ip4 interfaces + + - no packet received on all configured pg-ip4 interfaces :raise RuntimeError: If any packet is captured on any pg-ip4 interface. """