X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ip_mcast.py;h=b753f9a335423992e2cf76f87f550913cfe5eadf;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=017f0629cd25e10abc62bdcf8a6b31f8185e4422;hpb=c8efa29b6f9a91381897b54f1147daf922ed7164;p=vpp.git diff --git a/test/test_ip_mcast.py b/test/test_ip_mcast.py index 017f0629cd2..b753f9a3354 100644 --- a/test/test_ip_mcast.py +++ b/test/test_ip_mcast.py @@ -3,15 +3,14 @@ import unittest from framework import VppTestCase, VppTestRunner -from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint +from vpp_ip import DpoProto from vpp_ip_route import VppIpMRoute, VppMRoutePath, VppMFibSignal, \ - MRouteItfFlags, MRouteEntryFlags, VppIpTable, DpoProto + MRouteItfFlags, MRouteEntryFlags, VppIpTable, FibPathProto from scapy.packet import Raw from scapy.layers.l2 import Ether -from scapy.layers.inet import IP, UDP, getmacbyip, ICMP +from scapy.layers.inet import IP, UDP, getmacbyip from scapy.layers.inet6 import IPv6, getmacbyip6 -from util import ppp # # The number of packets sent is set to 91 so that when we replicate more than 3 @@ -26,6 +25,14 @@ N_PKTS_IN_STREAM = 91 class TestMFIB(VppTestCase): """ MFIB Test Case """ + @classmethod + def setUpClass(cls): + super(TestMFIB, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(TestMFIB, cls).tearDownClass() + def setUp(self): super(TestMFIB, self).setUp() @@ -35,12 +42,20 @@ class TestMFIB(VppTestCase): if error: self.logger.critical(error) - self.assertEqual(error.find("Failed"), -1) + self.assertNotIn("Failed", error) class TestIPMcast(VppTestCase): """ IP Multicast Test Case """ + @classmethod + def setUpClass(cls): + super(TestIPMcast, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(TestIPMcast, cls).tearDownClass() + def setUp(self): super(TestIPMcast, self).setUp() @@ -105,7 +120,7 @@ class TestIPMcast(VppTestCase): def verify_filter(self, capture, sent): if not len(capture) == len(sent): - # filter out any IPv6 RAs from the captur + # filter out any IPv6 RAs from the capture for p in capture: if (p.haslayer(IPv6)): capture.remove(p) @@ -185,7 +200,7 @@ class TestIPMcast(VppTestCase): # # A (*,G). # one accepting interface, pg0, 7 forwarding interfaces - # many forwarding interfaces test the case where the replicare DPO + # many forwarding interfaces test the case where the replicate DPO # needs to use extra cache lines for the buckets. # route_232_1_1_1 = VppIpMRoute( @@ -218,7 +233,7 @@ class TestIPMcast(VppTestCase): route_1_1_1_1_232_1_1_1 = VppIpMRoute( self, "1.1.1.1", - "232.1.1.1", 64, + "232.1.1.1", 27, # any grp-len is ok when src is set MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE, [VppMRoutePath(self.pg0.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT), @@ -274,6 +289,9 @@ class TestIPMcast(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() + self.assertEqual(route_1_1_1_1_232_1_1_1.get_stats()['packets'], + len(tx)) + # We expect replications on Pg1->7 self.verify_capture_ip4(self.pg1, tx) self.verify_capture_ip4(self.pg2, tx) @@ -300,6 +318,9 @@ class TestIPMcast(VppTestCase): self.verify_capture_ip4(self.pg1, tx) self.verify_capture_ip4(self.pg2, tx) + self.assertEqual(route_1_1_1_1_232_1_1_1.get_stats()['packets'], + 2*len(tx)) + # no replications on Pg0 self.pg0.assert_nothing_captured( remark="IP multicast packets forwarded on PG0") @@ -340,6 +361,7 @@ class TestIPMcast(VppTestCase): # We expect replications on Pg1 only self.verify_capture_ip4(self.pg1, tx) + self.assertEqual(route_232.get_stats()['packets'], len(tx)) # no replications on Pg0, Pg2 not Pg3 self.pg0.assert_nothing_captured( @@ -399,17 +421,16 @@ class TestIPMcast(VppTestCase): MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE, [VppMRoutePath(self.pg0.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT, - proto=DpoProto.DPO_PROTO_IP6), + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6), VppMRoutePath(self.pg1.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_FORWARD, - proto=DpoProto.DPO_PROTO_IP6), + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6), VppMRoutePath(self.pg2.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_FORWARD, - proto=DpoProto.DPO_PROTO_IP6), + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6), VppMRoutePath(self.pg3.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_FORWARD, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6)]) route_ff01_1.add_vpp_config() # @@ -419,18 +440,17 @@ class TestIPMcast(VppTestCase): route_2001_ff01_1 = VppIpMRoute( self, "2001::1", - "ff01::1", 256, + "ff01::1", 0, # any grp-len is ok when src is set MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE, [VppMRoutePath(self.pg0.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT, - proto=DpoProto.DPO_PROTO_IP6), + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6), VppMRoutePath(self.pg1.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_FORWARD, - proto=DpoProto.DPO_PROTO_IP6), + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6), VppMRoutePath(self.pg2.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_FORWARD, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6)]) route_2001_ff01_1.add_vpp_config() # @@ -444,11 +464,10 @@ class TestIPMcast(VppTestCase): MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE, [VppMRoutePath(self.pg0.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT, - proto=DpoProto.DPO_PROTO_IP6), + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6), VppMRoutePath(self.pg1.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_FORWARD, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6)]) route_ff01.add_vpp_config() # @@ -665,6 +684,7 @@ class TestIPMcast(VppTestCase): MRouteItfFlags.MFIB_ITF_FLAG_FORWARD)]) route_232_1_1_1.add_vpp_config() + route_232_1_1_1.update_entry_flags( MRouteEntryFlags.MFIB_ENTRY_FLAG_SIGNAL) @@ -789,15 +809,14 @@ class TestIPMcast(VppTestCase): MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE, [VppMRoutePath(self.pg8.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT, - proto=DpoProto.DPO_PROTO_IP6), + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6), VppMRoutePath(self.pg1.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_FORWARD, - proto=DpoProto.DPO_PROTO_IP6), + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6), VppMRoutePath(self.pg2.sw_if_index, MRouteItfFlags.MFIB_ITF_FLAG_FORWARD, - proto=DpoProto.DPO_PROTO_IP6)], - table_id=10, - is_ip6=1) + proto=FibPathProto.FIB_PATH_NH_PROTO_IP6)], + table_id=10) route_2001_ff01_1.add_vpp_config() #