X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_p2p_ethernet.py;h=fb55a365bee6d60f13be26d131f51d03828b417f;hb=9d91e0271f416819f8a6d712d5475593ea37d794;hp=b0d546e4d1f8251c212a5d5cd6722c777c922d61;hpb=ea2450fa2d1e8ba0295ea9861a404796100dad1e;p=vpp.git diff --git a/test/test_p2p_ethernet.py b/test/test_p2p_ethernet.py index b0d546e4d1f..fb55a365bee 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 @@ -32,6 +32,10 @@ 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, mac_pton(remote_mac)) self.p2p_sub_ifs.append(p2p) @@ -48,22 +52,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") @@ -125,6 +129,10 @@ 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: @@ -164,7 +172,7 @@ class P2PEthernetIPV6(VppTestCase): 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 @@ -182,20 +190,20 @@ class P2PEthernetIPV6(VppTestCase): """standard routing without p2p subinterfaces""" self.logger.info("FFP_TEST_START_0001") + self.pg0.config_ip6() 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.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))] + 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): @@ -204,9 +212,7 @@ class P2PEthernetIPV6(VppTestCase): route_9001 = VppIpRoute(self, "9001::", 64, [VppRoutePath(self.pg1.remote_ip6, - self.pg1.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + self.pg1.sw_if_index)]) route_9001.add_vpp_config() self.packets.append( @@ -229,9 +235,7 @@ class P2PEthernetIPV6(VppTestCase): 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) + self.pg1.sw_if_index)]) route_3.add_vpp_config() self.packets.append( @@ -254,9 +258,7 @@ class P2PEthernetIPV6(VppTestCase): 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) + self.pg1.sw_if_index)]) route_9001.add_vpp_config() self.packets.append( @@ -273,23 +275,21 @@ class P2PEthernetIPV6(VppTestCase): """send packet via p2p subinterface""" self.logger.info("FFP_TEST_START_0005") + self.pg0.config_ip6() + route_8000 = VppIpRoute(self, "8000::", 64, - [VppRoutePath(self.pg0.remote_ip6, - self.pg0.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + [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) + [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) + [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): @@ -305,6 +305,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): @@ -350,6 +351,10 @@ 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: @@ -375,7 +380,7 @@ class P2PEthernetIPV4(VppTestCase): 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