From 03c254ec70917290b2fde27de1e7b37abe508ade Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 17 Mar 2020 14:25:10 +0000 Subject: fib: Always install all routers mcast addresses Type: improvement Signed-off-by: Neale Ranns Change-Id: Ia8dff15855a81cf29729bdaa3ff28fbe3254fa97 --- src/plugins/igmp/test/test_igmp.py | 6 +++--- src/plugins/unittest/fib_test.c | 8 ++++---- src/plugins/unittest/mfib_test.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/igmp/test/test_igmp.py b/src/plugins/igmp/test/test_igmp.py index 1974794f058..01f59bae024 100644 --- a/src/plugins/igmp/test/test_igmp.py +++ b/src/plugins/igmp/test/test_igmp.py @@ -90,10 +90,10 @@ class TestIgmp(VppTestCase): self.vapi.igmp_enable_disable(self.pg2.sw_if_index, 0, IGMP_MODE.HOST) self.vapi.igmp_enable_disable(self.pg3.sw_if_index, 0, IGMP_MODE.HOST) - self.assertFalse(find_mroute(self, "224.0.0.1", "0.0.0.0", 32)) + self.assertTrue(find_mroute(self, "224.0.0.1", "0.0.0.0", 32)) self.assertFalse(find_mroute(self, "224.0.0.22", "0.0.0.0", 32)) - self.assertFalse(find_mroute(self, "224.0.0.1", "0.0.0.0", 32, - table_id=1)) + self.assertTrue(find_mroute(self, "224.0.0.1", "0.0.0.0", 32, + table_id=1)) self.assertFalse(find_mroute(self, "224.0.0.22", "0.0.0.0", 32, table_id=1)) diff --git a/src/plugins/unittest/fib_test.c b/src/plugins/unittest/fib_test.c index 2d75f28a8ca..d86ccb173dc 100644 --- a/src/plugins/unittest/fib_test.c +++ b/src/plugins/unittest/fib_test.c @@ -845,11 +845,11 @@ fib_test_v4 (void) * at this stage there are 5 entries in the test FIB (plus 5 in the default), * all of which are special sourced and so none of which share path-lists. * There are also 2 entries, and 2 non-shared path-lists, in the v6 default - * table, and 4 path-lists in the v6 MFIB table + * table, and 4 path-lists in the v6 MFIB table and 2 in v4. */ #define ENBR (5+5+2) - u32 PNBR = 5+5+2+4; + u32 PNBR = 5+5+2+4+2; /* * if the IGMP plugin is loaded this adds two more entries to the v4 MFIB @@ -4441,11 +4441,11 @@ fib_test_v6 (void) /* * At this stage there is one v4 FIB with 5 routes and two v6 FIBs - * each with 2 entries and a v6 mfib with 4 path-lists. + * each with 2 entries and a v6 mfib with 4 path-lists and v4 mfib with 2. * All entries are special so no path-list sharing. */ #define ENPS (5+4) - u32 PNPS = (5+4+4); + u32 PNPS = (5+4+4+2); /* * if the IGMP plugin is loaded this adds two more entries to the v4 MFIB */ diff --git a/src/plugins/unittest/mfib_test.c b/src/plugins/unittest/mfib_test.c index 2497a299c50..764e1837653 100644 --- a/src/plugins/unittest/mfib_test.c +++ b/src/plugins/unittest/mfib_test.c @@ -1279,7 +1279,7 @@ mfib_test_i (fib_protocol_t PROTO, /* * Unlock the table - it's the last lock so should be gone thereafter */ - MFIB_TEST(((PROTO == FIB_PROTOCOL_IP4 ? 1 : 5) == + MFIB_TEST(((PROTO == FIB_PROTOCOL_IP4 ? 3 : 5) == mfib_table_get_n_routes(fib_index, PROTO)), "1 = %d route left in the FIB", mfib_table_get_n_routes(fib_index, PROTO)); -- cgit 1.2.3-korg