X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_p2p_ethernet.py;h=97cd7b4f0bd752934c28b30b1b207cb9c4c34be4;hb=c119e796f535046c33430a92949addcf11dbf684;hp=5295d1c0c6eeb346ae95fda38b3b7e81817d86fe;hpb=7e665d64eb172f8ff42009a0d412ad05ffae7432;p=vpp.git diff --git a/test/test_p2p_ethernet.py b/test/test_p2p_ethernet.py index 5295d1c0c6e..97cd7b4f0bd 100644 --- a/test/test_p2p_ethernet.py +++ b/test/test_p2p_ethernet.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import random import unittest import datetime @@ -11,8 +11,9 @@ from scapy.layers.inet6 import IPv6 from framework import VppTestCase, VppTestRunner from vpp_sub_interface import VppP2PSubint -from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto -from util import mactobinary +from vpp_ip import DpoProto +from vpp_ip_route import VppIpRoute, VppRoutePath +from vpp_papi import mac_pton class P2PEthernetAPI(VppTestCase): @@ -31,13 +32,16 @@ class P2PEthernetAPI(VppTestCase): for i in cls.pg_interfaces: i.admin_up() + @classmethod + def tearDownClass(cls): + super(P2PEthernetAPI, cls).tearDownClass() + def create_p2p_ethernet(self, parent_if, sub_id, remote_mac): - p2p = VppP2PSubint(self, parent_if, sub_id, mactobinary(remote_mac)) + p2p = VppP2PSubint(self, parent_if, sub_id, mac_pton(remote_mac)) self.p2p_sub_ifs.append(p2p) def delete_p2p_ethernet(self, parent_if, remote_mac): - self.vapi.delete_p2pethernet_subif(parent_if.sw_if_index, - mactobinary(remote_mac)) + self.vapi.p2p_ethernet_del(parent_if.sw_if_index, mac_pton(remote_mac)) def test_api(self): """delete/create p2p subif""" @@ -47,22 +51,22 @@ class P2PEthernetAPI(VppTestCase): self.create_p2p_ethernet(self.pg0, 2, "de:ad:00:00:00:02") intfs = self.vapi.cli("show interface") - self.assertNotEqual(intfs.find('pg0.1'), -1) - self.assertNotEqual(intfs.find('pg0.2'), -1) - self.assertEqual(intfs.find('pg0.5'), -1) + self.assertIn("pg0.1", intfs) + self.assertIn("pg0.2", intfs) + self.assertNotIn("pg0.5", intfs) # create pg2.5 subif self.create_p2p_ethernet(self.pg0, 5, "de:ad:00:00:00:ff") intfs = self.vapi.cli("show interface") - self.assertNotEqual(intfs.find('pg0.5'), -1) + self.assertIn("pg0.5", intfs) # delete pg2.5 subif self.delete_p2p_ethernet(self.pg0, "de:ad:00:00:00:ff") intfs = self.vapi.cli("show interface") - self.assertNotEqual(intfs.find('pg0.1'), -1) - self.assertNotEqual(intfs.find('pg0.2'), -1) - self.assertEqual(intfs.find('pg0.5'), -1) + self.assertIn("pg0.1", intfs) + self.assertIn("pg0.2", intfs) + self.assertNotIn("pg0.5", intfs) self.logger.info("FFP_TEST_FINISH_0000") @@ -74,20 +78,20 @@ class P2PEthernetAPI(VppTestCase): clients = 1000 mac = int("dead00000000", 16) - for i in range(1, clients+1): + for i in range(1, clients + 1): try: - macs.append(':'.join(re.findall('..', '{:02x}'.format(mac+i)))) - self.vapi.create_p2pethernet_subif(self.pg2.sw_if_index, - mactobinary(macs[i-1]), - i) + macs.append(":".join(re.findall("..", "{:02x}".format(mac + i)))) + self.vapi.p2p_ethernet_add( + self.pg2.sw_if_index, mac_pton(macs[i - 1]), i + ) except Exception: - print "Failed to create subif %d %s" % (i, macs[i-1]) + self.logger.info("Failed to create subif %d %s" % (i, macs[i - 1])) raise intfs = self.vapi.cli("show interface").split("\n") count = 0 for intf in intfs: - if intf.startswith('pg2.'): + if intf.startswith("pg2."): count += 1 self.assertEqual(count, clients) @@ -122,40 +126,50 @@ class P2PEthernetIPV6(VppTestCase): cls.pg1.configure_ipv6_neighbors() cls.pg1.disable_ipv6_ra() + @classmethod + def tearDownClass(cls): + super(P2PEthernetIPV6, cls).tearDownClass() + def setUp(self): super(P2PEthernetIPV6, self).setUp() for p in self.packets: self.packets.remove(p) - self.create_p2p_ethernet(self.pg0, 1, self.pg0._remote_hosts[0].mac) - self.create_p2p_ethernet(self.pg0, 2, self.pg0._remote_hosts[1].mac) - self.p2p_sub_ifs[0].config_ip6() - self.p2p_sub_ifs[1].config_ip6() + self.p2p_sub_ifs.append( + self.create_p2p_ethernet(self.pg0, 1, self.pg0._remote_hosts[0].mac) + ) + self.p2p_sub_ifs.append( + self.create_p2p_ethernet(self.pg0, 2, self.pg0._remote_hosts[1].mac) + ) self.vapi.cli("trace add p2p-ethernet-input 50") def tearDown(self): - self.delete_p2p_ethernet(self.pg0, self.pg0._remote_hosts[0].mac) - self.delete_p2p_ethernet(self.pg0, self.pg0._remote_hosts[1].mac) + while len(self.p2p_sub_ifs): + p2p = self.p2p_sub_ifs.pop() + self.delete_p2p_ethernet(p2p) + super(P2PEthernetIPV6, self).tearDown() def create_p2p_ethernet(self, parent_if, sub_id, remote_mac): - p2p = VppP2PSubint(self, parent_if, sub_id, mactobinary(remote_mac)) + p2p = VppP2PSubint(self, parent_if, sub_id, mac_pton(remote_mac)) p2p.admin_up() p2p.config_ip6() p2p.disable_ipv6_ra() - self.p2p_sub_ifs.append(p2p) + return p2p - def delete_p2p_ethernet(self, parent_if, remote_mac): - self.vapi.delete_p2pethernet_subif(parent_if.sw_if_index, - mactobinary(remote_mac)) + def delete_p2p_ethernet(self, p2p): + p2p.unconfig_ip6() + p2p.admin_down() + self.vapi.p2p_ethernet_del(p2p.parent.sw_if_index, p2p.p2p_remote_mac) - def create_stream(self, src_mac=None, dst_mac=None, - src_ip=None, dst_ip=None, size=None): + def create_stream( + self, src_mac=None, dst_mac=None, src_ip=None, dst_ip=None, size=None + ): pkt_size = size if size is None: pkt_size = random.choice(self.pg_if_packet_sizes) p = Ether(src=src_mac, dst=dst_mac) p /= IPv6(src=src_ip, dst=dst_ip) - p /= (UDP(sport=1234, dport=4321) / Raw('\xa5' * 20)) + p /= UDP(sport=1234, dport=4321) / Raw(b"\xa5" * 20) self.extend_packet(p, pkt_size) return p @@ -169,55 +183,55 @@ class P2PEthernetIPV6(VppTestCase): count = len(packets) return dst_if.get_capture(count) - def verify_counters(self, counter_id, expected_value): - counters = self.vapi.cli("sh errors").split('\n') - counter_value = -1 - for i in range(1, len(counters)-1): - results = counters[i].split() - if results[1] == counter_id: - counter_value = int(results[0]) - break - self.assertEqual(counter_value, expected_value) - def test_no_p2p_subif(self): """standard routing without p2p subinterfaces""" self.logger.info("FFP_TEST_START_0001") - route_8000 = VppIpRoute(self, "8000::", 64, - [VppRoutePath(self.pg0.remote_ip6, - self.pg0.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + self.pg0.config_ip6() + route_8000 = VppIpRoute( + self, + "8000::", + 64, + [VppRoutePath(self.pg0.remote_ip6, self.pg0.sw_if_index)], + ) route_8000.add_vpp_config() - self.packets = [(Ether(dst=self.pg1.local_mac, - src=self.pg1.remote_mac) / - IPv6(src="3001::1", dst="8000::100") / - UDP(sport=1234, dport=1234) / - Raw('\xa5' * 100))] + self.packets = [ + ( + Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) + / IPv6(src="3001::1", dst="8000::100") + / UDP(sport=1234, dport=1234) + / Raw(b"\xa5" * 100) + ) + ] self.send_packets(self.pg1, self.pg0) + self.pg0.unconfig_ip6() self.logger.info("FFP_TEST_FINISH_0001") def test_ip6_rx_p2p_subif(self): """receive ipv6 packet via p2p subinterface""" self.logger.info("FFP_TEST_START_0002") - route_9001 = VppIpRoute(self, "9001::", 64, - [VppRoutePath(self.pg1.remote_ip6, - self.pg1.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + route_9001 = VppIpRoute( + self, + "9001::", + 64, + [VppRoutePath(self.pg1.remote_ip6, self.pg1.sw_if_index)], + ) route_9001.add_vpp_config() self.packets.append( - self.create_stream(src_mac=self.pg0._remote_hosts[0].mac, - dst_mac=self.pg0.local_mac, - src_ip=self.p2p_sub_ifs[0].remote_ip6, - dst_ip="9001::100")) + self.create_stream( + src_mac=self.pg0._remote_hosts[0].mac, + dst_mac=self.pg0.local_mac, + src_ip=self.p2p_sub_ifs[0].remote_ip6, + dst_ip="9001::100", + ) + ) self.send_packets(self.pg0, self.pg1, self.packets) - self.verify_counters('p2p-ethernet-input', 1) + self.assert_packet_counter_equal("p2p-ethernet-input", 1) route_9001.remove_vpp_config() self.logger.info("FFP_TEST_FINISH_0002") @@ -228,18 +242,22 @@ class P2PEthernetIPV6(VppTestCase): self.pg0.config_ip6() - route_3 = VppIpRoute(self, "9000::", 64, - [VppRoutePath(self.pg1._remote_hosts[0].ip6, - self.pg1.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + route_3 = VppIpRoute( + self, + "9000::", + 64, + [VppRoutePath(self.pg1._remote_hosts[0].ip6, self.pg1.sw_if_index)], + ) route_3.add_vpp_config() self.packets.append( - self.create_stream(src_mac="02:03:00:00:ff:ff", - dst_mac=self.pg0.local_mac, - src_ip="a000::100", - dst_ip="9000::100")) + self.create_stream( + src_mac="02:03:00:00:ff:ff", + dst_mac=self.pg0.local_mac, + src_ip="a000::100", + dst_ip="9000::100", + ) + ) self.send_packets(self.pg0, self.pg1) @@ -253,18 +271,22 @@ class P2PEthernetIPV6(VppTestCase): """drop rx packet not matching p2p subinterface""" self.logger.info("FFP_TEST_START_0004") - route_9001 = VppIpRoute(self, "9000::", 64, - [VppRoutePath(self.pg1._remote_hosts[0].ip6, - self.pg1.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + route_9001 = VppIpRoute( + self, + "9000::", + 64, + [VppRoutePath(self.pg1._remote_hosts[0].ip6, self.pg1.sw_if_index)], + ) route_9001.add_vpp_config() self.packets.append( - self.create_stream(src_mac="02:03:00:00:ff:ff", - dst_mac=self.pg0.local_mac, - src_ip="a000::100", - dst_ip="9000::100")) + self.create_stream( + src_mac="02:03:00:00:ff:ff", + dst_mac=self.pg0.local_mac, + src_ip="a000::100", + dst_ip="9000::100", + ) + ) # no packet received self.send_packets(self.pg0, self.pg1, count=0) @@ -274,31 +296,47 @@ class P2PEthernetIPV6(VppTestCase): """send packet via p2p subinterface""" self.logger.info("FFP_TEST_START_0005") - route_8000 = VppIpRoute(self, "8000::", 64, - [VppRoutePath(self.pg0.remote_ip6, - self.pg0.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + self.pg0.config_ip6() + + route_8000 = VppIpRoute( + self, + "8000::", + 64, + [VppRoutePath(self.pg0.remote_hosts[0].ip6, self.pg0.sw_if_index)], + ) route_8000.add_vpp_config() - route_8001 = VppIpRoute(self, "8001::", 64, - [VppRoutePath(self.p2p_sub_ifs[0].remote_ip6, - self.p2p_sub_ifs[0].sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + route_8001 = VppIpRoute( + self, + "8001::", + 64, + [ + VppRoutePath( + self.p2p_sub_ifs[0].remote_ip6, self.p2p_sub_ifs[0].sw_if_index + ) + ], + ) route_8001.add_vpp_config() - route_8002 = VppIpRoute(self, "8002::", 64, - [VppRoutePath(self.p2p_sub_ifs[1].remote_ip6, - self.p2p_sub_ifs[1].sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + route_8002 = VppIpRoute( + self, + "8002::", + 64, + [ + VppRoutePath( + self.p2p_sub_ifs[1].remote_ip6, self.p2p_sub_ifs[1].sw_if_index + ) + ], + ) route_8002.add_vpp_config() for i in range(0, 3): self.packets.append( - self.create_stream(src_mac=self.pg1.remote_mac, - dst_mac=self.pg1.local_mac, - src_ip=self.pg1.remote_ip6, - dst_ip="800%d::100" % i)) + self.create_stream( + src_mac=self.pg1.remote_mac, + dst_mac=self.pg1.local_mac, + src_ip=self.pg1.remote_ip6, + dst_ip="800%d::100" % i, + ) + ) self.send_packets(self.pg1, self.pg0, count=3) @@ -306,6 +344,7 @@ class P2PEthernetIPV6(VppTestCase): route_8001.remove_vpp_config() route_8002.remove_vpp_config() + self.pg0.unconfig_ip6() self.logger.info("FFP_TEST_FINISH_0005") def test_ip6_tx_p2p_subif_drop(self): @@ -313,10 +352,13 @@ class P2PEthernetIPV6(VppTestCase): self.logger.info("FFP_TEST_START_0006") self.packets.append( - self.create_stream(src_mac="02:03:00:00:ff:ff", - dst_mac=self.pg0.local_mac, - src_ip="a000::100", - dst_ip="9000::100")) + self.create_stream( + src_mac="02:03:00:00:ff:ff", + dst_mac=self.pg0.local_mac, + src_ip="a000::100", + dst_ip="9000::100", + ) + ) # no packet received self.send_packets(self.pg0, self.pg1, count=0) @@ -351,29 +393,37 @@ class P2PEthernetIPV4(VppTestCase): cls.pg1.generate_remote_hosts(5) cls.pg1.configure_ipv4_neighbors() + @classmethod + def tearDownClass(cls): + super(P2PEthernetIPV4, cls).tearDownClass() + def setUp(self): super(P2PEthernetIPV4, self).setUp() for p in self.packets: self.packets.remove(p) - self.create_p2p_ethernet(self.pg0, 1, self.pg0._remote_hosts[0].mac) - self.create_p2p_ethernet(self.pg0, 2, self.pg0._remote_hosts[1].mac) - self.p2p_sub_ifs[0].config_ip4() - self.p2p_sub_ifs[1].config_ip4() + self.p2p_sub_ifs.append( + self.create_p2p_ethernet(self.pg0, 1, self.pg0._remote_hosts[0].mac) + ) + self.p2p_sub_ifs.append( + self.create_p2p_ethernet(self.pg0, 2, self.pg0._remote_hosts[1].mac) + ) self.vapi.cli("trace add p2p-ethernet-input 50") def tearDown(self): - self.delete_p2p_ethernet(self.pg0, self.pg0._remote_hosts[0].mac) - self.delete_p2p_ethernet(self.pg0, self.pg0._remote_hosts[1].mac) + while len(self.p2p_sub_ifs): + p2p = self.p2p_sub_ifs.pop() + self.delete_p2p_ethernet(p2p) super(P2PEthernetIPV4, self).tearDown() - def create_stream(self, src_mac=None, dst_mac=None, - src_ip=None, dst_ip=None, size=None): + def create_stream( + self, src_mac=None, dst_mac=None, src_ip=None, dst_ip=None, size=None + ): pkt_size = size if size is None: pkt_size = random.choice(self.pg_if_packet_sizes) p = Ether(src=src_mac, dst=dst_mac) p /= IP(src=src_ip, dst=dst_ip) - p /= (UDP(sport=1234, dport=4321) / Raw('\xa5' * 20)) + p /= UDP(sport=1234, dport=4321) / Raw(b"\xa5" * 20) self.extend_packet(p, pkt_size) return p @@ -387,44 +437,41 @@ class P2PEthernetIPV4(VppTestCase): count = len(packets) return dst_if.get_capture(count) - def verify_counters(self, counter_id, expected_value): - counters = self.vapi.cli("sh errors").split('\n') - counter_value = -1 - for i in range(1, len(counters)-1): - results = counters[i].split() - if results[1] == counter_id: - counter_value = int(results[0]) - break - self.assertEqual(counter_value, expected_value) - def create_p2p_ethernet(self, parent_if, sub_id, remote_mac): - p2p = VppP2PSubint(self, parent_if, sub_id, mactobinary(remote_mac)) + p2p = VppP2PSubint(self, parent_if, sub_id, mac_pton(remote_mac)) p2p.admin_up() p2p.config_ip4() - self.p2p_sub_ifs.append(p2p) + return p2p - def delete_p2p_ethernet(self, parent_if, remote_mac): - self.vapi.delete_p2pethernet_subif(parent_if.sw_if_index, - mactobinary(remote_mac)) + def delete_p2p_ethernet(self, p2p): + p2p.unconfig_ip4() + p2p.admin_down() + self.vapi.p2p_ethernet_del(p2p.parent.sw_if_index, p2p.p2p_remote_mac) def test_ip4_rx_p2p_subif(self): """receive ipv4 packet via p2p subinterface""" self.logger.info("FFP_TEST_START_0002") - route_9000 = VppIpRoute(self, "9.0.0.0", 16, - [VppRoutePath(self.pg1.remote_ip4, - self.pg1.sw_if_index)]) + route_9000 = VppIpRoute( + self, + "9.0.0.0", + 16, + [VppRoutePath(self.pg1.remote_ip4, self.pg1.sw_if_index)], + ) route_9000.add_vpp_config() self.packets.append( - self.create_stream(src_mac=self.pg0._remote_hosts[0].mac, - dst_mac=self.pg0.local_mac, - src_ip=self.p2p_sub_ifs[0].remote_ip4, - dst_ip="9.0.0.100")) + self.create_stream( + src_mac=self.pg0._remote_hosts[0].mac, + dst_mac=self.pg0.local_mac, + src_ip=self.p2p_sub_ifs[0].remote_ip4, + dst_ip="9.0.0.100", + ) + ) self.send_packets(self.pg0, self.pg1, self.packets) - self.verify_counters('p2p-ethernet-input', 1) + self.assert_packet_counter_equal("p2p-ethernet-input", 1) route_9000.remove_vpp_config() self.logger.info("FFP_TEST_FINISH_0002") @@ -433,16 +480,22 @@ class P2PEthernetIPV4(VppTestCase): """route rx packet not matching p2p subinterface""" self.logger.info("FFP_TEST_START_0003") - route_9001 = VppIpRoute(self, "9.0.0.0", 24, - [VppRoutePath(self.pg1.remote_ip4, - self.pg1.sw_if_index)]) + route_9001 = VppIpRoute( + self, + "9.0.0.0", + 24, + [VppRoutePath(self.pg1.remote_ip4, self.pg1.sw_if_index)], + ) route_9001.add_vpp_config() self.packets.append( - self.create_stream(src_mac="02:01:00:00:ff:ff", - dst_mac=self.pg0.local_mac, - src_ip="8.0.0.100", - dst_ip="9.0.0.100")) + self.create_stream( + src_mac="02:01:00:00:ff:ff", + dst_mac=self.pg0.local_mac, + src_ip="8.0.0.100", + dst_ip="9.0.0.100", + ) + ) self.send_packets(self.pg0, self.pg1) @@ -454,28 +507,51 @@ class P2PEthernetIPV4(VppTestCase): """send ip4 packet via p2p subinterface""" self.logger.info("FFP_TEST_START_0005") - route_9100 = VppIpRoute(self, "9.1.0.100", 24, - [VppRoutePath(self.pg0.remote_ip4, - self.pg0.sw_if_index, - )]) + route_9100 = VppIpRoute( + self, + "9.1.0.100", + 24, + [ + VppRoutePath( + self.pg0.remote_ip4, + self.pg0.sw_if_index, + ) + ], + ) route_9100.add_vpp_config() - route_9200 = VppIpRoute(self, "9.2.0.100", 24, - [VppRoutePath(self.p2p_sub_ifs[0].remote_ip4, - self.p2p_sub_ifs[0].sw_if_index, - )]) + route_9200 = VppIpRoute( + self, + "9.2.0.100", + 24, + [ + VppRoutePath( + self.p2p_sub_ifs[0].remote_ip4, + self.p2p_sub_ifs[0].sw_if_index, + ) + ], + ) route_9200.add_vpp_config() - route_9300 = VppIpRoute(self, "9.3.0.100", 24, - [VppRoutePath(self.p2p_sub_ifs[1].remote_ip4, - self.p2p_sub_ifs[1].sw_if_index - )]) + route_9300 = VppIpRoute( + self, + "9.3.0.100", + 24, + [ + VppRoutePath( + self.p2p_sub_ifs[1].remote_ip4, self.p2p_sub_ifs[1].sw_if_index + ) + ], + ) route_9300.add_vpp_config() for i in range(0, 3): self.packets.append( - self.create_stream(src_mac=self.pg1.remote_mac, - dst_mac=self.pg1.local_mac, - src_ip=self.pg1.remote_ip4, - dst_ip="9.%d.0.100" % (i+1))) + self.create_stream( + src_mac=self.pg1.remote_mac, + dst_mac=self.pg1.local_mac, + src_ip=self.pg1.remote_ip4, + dst_ip="9.%d.0.100" % (i + 1), + ) + ) self.send_packets(self.pg1, self.pg0) @@ -491,15 +567,18 @@ class P2PEthernetIPV4(VppTestCase): self.logger.info("FFP_TEST_START_0006") self.packets.append( - self.create_stream(src_mac="02:01:00:00:ff:ff", - dst_mac=self.pg0.local_mac, - src_ip="8.0.0.100", - dst_ip="9.0.0.100")) + self.create_stream( + src_mac="02:01:00:00:ff:ff", + dst_mac=self.pg0.local_mac, + src_ip="8.0.0.100", + dst_ip="9.0.0.100", + ) + ) # no packet received self.send_packets(self.pg0, self.pg1, count=0) self.logger.info("FFP_TEST_FINISH_0006") -if __name__ == '__main__': +if __name__ == "__main__": unittest.main(testRunner=VppTestRunner)