X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ip6_vrf_multi_instance.py;h=c2964b6c6c002de5b7508cacb14a5ba085d06f27;hb=d170681b24724c522adaf1e2f4f0e1f3289dbf82;hp=4b4a9e47a7be6b5292b17b94a2a75b6becf0c80b;hpb=eaea421e1fefedc47325f970475c5d48c899433c;p=vpp.git diff --git a/test/test_ip6_vrf_multi_instance.py b/test/test_ip6_vrf_multi_instance.py old mode 100644 new mode 100755 index 4b4a9e47a7b..c2964b6c6c0 --- a/test/test_ip6_vrf_multi_instance.py +++ b/test/test_ip6_vrf_multi_instance.py @@ -1,11 +1,11 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """IP6 VRF Multi-instance Test Case HLD: **NOTES:** - higher number of pg-ip6 interfaces causes problems => only 15 pg-ip6 \ - interfaces in 5 VRFs are tested + interfaces in 5 VRFs are tested - jumbo packets in configuration with 15 pg-ip6 interfaces leads to \ - problems too + problems too **config 1** - add 15 pg-ip6 interfaces @@ -17,9 +17,9 @@ - send IP6 packets between all pg-ip6 interfaces in all VRF groups **verify 1** - - check VRF data by parsing output of ip6_fib_dump API command - - all packets received correctly in case of pg-ip6 interfaces in the same - VRF + - check VRF data by parsing output of ip_route_dump API command + - all packets received correctly in case of pg-ip6 interfaces in the + same VRF - no packet received in case of pg-ip6 interfaces not in VRF - no packet received in case of pg-ip6 interfaces in different VRFs @@ -30,9 +30,9 @@ - send IP6 packets between all pg-ip6 interfaces in all VRF groups **verify 2** - - check VRF data by parsing output of ip6_fib_dump API command - - all packets received correctly in case of pg-ip6 interfaces in the same - VRF + - check VRF data by parsing output of ip_route_dump API command + - all packets received correctly in case of pg-ip6 interfaces in the + same VRF - no packet received in case of pg-ip6 interfaces not in VRF - no packet received in case of pg-ip6 interfaces in different VRFs @@ -43,9 +43,9 @@ - send IP6 packets between all pg-ip6 interfaces in all VRF groups **verify 3** - - check VRF data by parsing output of ip6_fib_dump API command - - all packets received correctly in case of pg-ip6 interfaces in the same - VRF + - check VRF data by parsing output of ip_route_dump API command + - all packets received correctly in case of pg-ip6 interfaces in the + same VRF - no packet received in case of pg-ip6 interfaces not in VRF - no packet received in case of pg-ip6 interfaces in different VRFs @@ -56,9 +56,9 @@ - send IP6 packets between all pg-ip6 interfaces in all VRF groups **verify 4** - - check VRF data by parsing output of ip6_fib_dump API command - - all packets received correctly in case of pg-ip6 interfaces in the same - VRF + - check VRF data by parsing output of ip_route_dump API command + - all packets received correctly in case of pg-ip6 interfaces in the + same VRF - no packet received in case of pg-ip6 interfaces not in VRF - no packet received in case of pg-ip6 interfaces in different VRFs """ @@ -120,7 +120,7 @@ class TestIP6VrfMultiInst(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) @@ -160,6 +160,10 @@ class TestIP6VrfMultiInst(VppTestCase): super(TestIP6VrfMultiInst, cls).tearDownClass() raise + @classmethod + def tearDownClass(cls): + super(TestIP6VrfMultiInst, cls).tearDownClass() + def setUp(self): """ Clear trace and packet infos before running each test. @@ -172,9 +176,10 @@ class TestIP6VrfMultiInst(VppTestCase): Show various debug prints after each test. """ super(TestIP6VrfMultiInst, self).tearDown() - if not self.vpp_dead: - self.logger.info(self.vapi.ppcli("show ip6 fib")) - self.logger.info(self.vapi.ppcli("show ip6 neighbors")) + + def show_commands_at_teardown(self): + self.logger.info(self.vapi.ppcli("show ip6 fib")) + self.logger.info(self.vapi.ppcli("show ip6 neighbors")) def create_vrf_and_assign_interfaces(self, count, start=1): """ @@ -188,9 +193,8 @@ class TestIP6VrfMultiInst(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_ip6n - dest_addr_len = 64 - self.vapi.ip_table_add_del(is_ipv6=1, is_add=1, table_id=vrf_id) + self.vapi.ip_table_add_del(is_add=1, + table={'table_id': vrf_id, 'is_ip6': 1}) self.logger.info("IPv6 VRF ID %d created" % vrf_id) if vrf_id not in self.vrf_list: self.vrf_list.append(vrf_id) @@ -217,8 +221,7 @@ class TestIP6VrfMultiInst(VppTestCase): :param int vrf_id: The FIB table / VRF ID to be reset. """ - # self.vapi.reset_vrf(vrf_id, is_ipv6=1) - self.vapi.reset_fib(vrf_id, is_ipv6=1) + self.vapi.ip_table_flush(table={'table_id': vrf_id, 'is_ip6': 1}) if vrf_id in self.vrf_list: self.vrf_list.remove(vrf_id) if vrf_id not in self.vrf_reset_list: @@ -233,7 +236,8 @@ class TestIP6VrfMultiInst(VppTestCase): self.logger.info("IPv6 VRF ID %d reset finished" % vrf_id) self.logger.debug(self.vapi.ppcli("show ip6 fib")) self.logger.debug(self.vapi.ppcli("show ip6 neighbors")) - self.vapi.ip_table_add_del(is_ipv6=1, is_add=0, table_id=vrf_id) + self.vapi.ip_table_add_del(is_add=0, + table={'table_id': vrf_id, 'is_ip6': 1}) def create_stream(self, src_if, packet_sizes): """ @@ -344,23 +348,20 @@ class TestIP6VrfMultiInst(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. """ - ip6_fib_dump = self.vapi.ip6_fib_dump() - vrf_exist = False + ip6_fib_dump = self.vapi.ip_route_dump(vrf_id, True) + vrf_exist = len(ip6_fib_dump) vrf_count = 0 for ip6_fib_details in ip6_fib_dump: - if ip6_fib_details.table_id == vrf_id: - if not vrf_exist: - vrf_exist = True - addr = inet_ntop(socket.AF_INET6, ip6_fib_details.address) - found = False - for pg_if in self.pg_if_by_vrf_id[vrf_id]: - if found: + addr = ip6_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.ip6: + vrf_count += 1 + found = True break - for host in pg_if.remote_hosts: - if str(addr) == str(host.ip6): - vrf_count += 1 - found = True - break if not vrf_exist and vrf_count == 0: self.logger.info("IPv6 VRF ID %d is not configured" % vrf_id) return VRFState.not_configured @@ -409,9 +410,10 @@ class TestIP6VrfMultiInst(VppTestCase): def run_crosswise_vrf_test(self): """ Create packet streams for every pg-ip6 interface in VRF towards all - pg-ip6 interfaces in other VRFs, send all prepared packet streams and \ + pg-ip6 interfaces in other VRFs, send all prepared packet streams and verify that: - - no packet received on all configured pg-ip6 interfaces + + - no packet received on all configured pg-ip6 interfaces :raise RuntimeError: If any packet is captured on any pg-ip6 interface. """