From e09755b8f8f6051c3ff2eb7af7ea5b6e3cc05545 Mon Sep 17 00:00:00 2001 From: Christian Hopps Date: Wed, 28 Jul 2021 10:31:13 +0000 Subject: [PATCH] tests: reduce multicast timer values - completes change made in #9190 - also lowers other pim and igmp timer values to speed things up. Signed-off-by: Christian Hopps --- .../multicast_pim_sm_topo1.json | 6 +++ .../multicast_pim_sm_topo2.json | 6 +++ .../multicast_pim_sm_topo3.json | 6 +++ .../multicast_pim_sm_topo4.json | 6 +++ .../test_multicast_pim_sm_topo3.py | 2 +- .../multicast_pim_static_rp.json | 38 ++++++++++++++++--- 6 files changed, 57 insertions(+), 7 deletions(-) diff --git a/tests/topotests/multicast_pim_sm_topo1/multicast_pim_sm_topo1.json b/tests/topotests/multicast_pim_sm_topo1/multicast_pim_sm_topo1.json index 71454c2ab2..cc20abbe6a 100644 --- a/tests/topotests/multicast_pim_sm_topo1/multicast_pim_sm_topo1.json +++ b/tests/topotests/multicast_pim_sm_topo1/multicast_pim_sm_topo1.json @@ -13,10 +13,12 @@ "r2": {"ipv4": "auto", "pim": "enable"}, "c1": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "igmp": { "interfaces": { "l1-i1-eth1" :{ "igmp":{ + "query": {"query-max-response-time": 40, "query-interval": 5}, "version": "2" } } @@ -38,6 +40,7 @@ "f1": {"ipv4": "auto", "pim": "enable"}, "i3": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["10.0.5.0/24", "10.0.6.0/24", "1.0.2.2/32", "10.0.1.0/24"], "next_hop": "10.0.7.1" @@ -55,6 +58,7 @@ "i2": {"ipv4": "auto", "pim": "enable"}, "i8": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["1.0.5.17/32", "10.0.8.0/24", "10.0.9.0/24", "10.0.10.0/24", "10.0.12.0/24", "10.0.11.0/24"], "next_hop": "10.0.7.2" @@ -71,6 +75,7 @@ "l1": {"ipv4": "auto", "pim": "enable"}, "i4": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["1.0.5.17/32", "10.0.6.0/24", "10.0.3.0/24", "10.0.8.0/24", "10.0.9.0/24", "10.0.12.0/24", "10.0.10.0/24", "10.0.11.0/24"], "next_hop": "10.0.2.2" @@ -87,6 +92,7 @@ "f1": {"ipv4": "auto", "pim": "enable"}, "i5": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["1.0.5.17/32", "10.0.5.0/24", "10.0.6.0/24", "10.0.7.0/24", "10.0.8.0/24", "10.0.9.0/24", "10.0.7.0/24", "10.0.10.0/24", "10.0.11.0/24"], "next_hop": "10.0.3.2" diff --git a/tests/topotests/multicast_pim_sm_topo2/multicast_pim_sm_topo2.json b/tests/topotests/multicast_pim_sm_topo2/multicast_pim_sm_topo2.json index 71454c2ab2..cc20abbe6a 100644 --- a/tests/topotests/multicast_pim_sm_topo2/multicast_pim_sm_topo2.json +++ b/tests/topotests/multicast_pim_sm_topo2/multicast_pim_sm_topo2.json @@ -13,10 +13,12 @@ "r2": {"ipv4": "auto", "pim": "enable"}, "c1": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "igmp": { "interfaces": { "l1-i1-eth1" :{ "igmp":{ + "query": {"query-max-response-time": 40, "query-interval": 5}, "version": "2" } } @@ -38,6 +40,7 @@ "f1": {"ipv4": "auto", "pim": "enable"}, "i3": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["10.0.5.0/24", "10.0.6.0/24", "1.0.2.2/32", "10.0.1.0/24"], "next_hop": "10.0.7.1" @@ -55,6 +58,7 @@ "i2": {"ipv4": "auto", "pim": "enable"}, "i8": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["1.0.5.17/32", "10.0.8.0/24", "10.0.9.0/24", "10.0.10.0/24", "10.0.12.0/24", "10.0.11.0/24"], "next_hop": "10.0.7.2" @@ -71,6 +75,7 @@ "l1": {"ipv4": "auto", "pim": "enable"}, "i4": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["1.0.5.17/32", "10.0.6.0/24", "10.0.3.0/24", "10.0.8.0/24", "10.0.9.0/24", "10.0.12.0/24", "10.0.10.0/24", "10.0.11.0/24"], "next_hop": "10.0.2.2" @@ -87,6 +92,7 @@ "f1": {"ipv4": "auto", "pim": "enable"}, "i5": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["1.0.5.17/32", "10.0.5.0/24", "10.0.6.0/24", "10.0.7.0/24", "10.0.8.0/24", "10.0.9.0/24", "10.0.7.0/24", "10.0.10.0/24", "10.0.11.0/24"], "next_hop": "10.0.3.2" diff --git a/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo3.json b/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo3.json index f582f4929d..89c54a41d6 100644 --- a/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo3.json +++ b/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo3.json @@ -13,10 +13,12 @@ "r2": {"ipv4": "auto", "pim": "enable"}, "c1": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "igmp": { "interfaces": { "l1-i1-eth1" :{ "igmp":{ + "query": {"query-max-response-time": 40, "query-interval": 5}, "version": "2" } } @@ -38,6 +40,7 @@ "f1": {"ipv4": "auto", "pim": "enable"}, "i3": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["10.0.5.0/24", "10.0.6.0/24", "1.0.2.2/32", "10.0.1.0/24", "1.0.3.5/32"], "next_hop": "10.0.7.1" @@ -55,6 +58,7 @@ "i2": {"ipv4": "auto", "pim": "enable"}, "i8": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["1.0.5.17/32", "10.0.8.0/24", "10.0.9.0/24", "10.0.10.0/24", "10.0.11.0/24", "10.0.12.0/24"], "next_hop": "10.0.7.2" @@ -71,6 +75,7 @@ "l1": {"ipv4": "auto", "pim": "enable"}, "i4": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["1.0.5.17/32", "10.0.6.0/24", "10.0.8.0/24", "10.0.9.0/24", "10.0.10.0/24", "10.0.11.0/24"], "next_hop": "10.0.2.2" @@ -87,6 +92,7 @@ "f1": {"ipv4": "auto", "pim": "enable"}, "i5": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["1.0.5.17/32", "10.0.5.0/24", "10.0.6.0/24", "10.0.7.0/24", "10.0.8.0/24", "10.0.9.0/24", "10.0.10.0/24", "10.0.11.0/24"], "next_hop": "10.0.3.2" diff --git a/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo4.json b/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo4.json index 4635dac7d2..afb55994a7 100644 --- a/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo4.json +++ b/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo4.json @@ -13,10 +13,12 @@ "r2": {"ipv4": "auto", "pim": "enable"}, "c1": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "igmp": { "interfaces": { "l1-i1-eth1" :{ "igmp":{ + "query": {"query-max-response-time": 40, "query-interval": 5}, "version": "2" } } @@ -40,6 +42,7 @@ "f1": {"ipv4": "auto", "pim": "enable"}, "i3": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["10.0.4.0/24","10.0.3.1/24"], "next_hop": "10.0.7.1" @@ -57,6 +60,7 @@ "i2": {"ipv4": "auto", "pim": "enable"}, "i8": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["10.0.4.0/24","10.0.3.1/24"], "next_hop": "10.0.3.1" @@ -73,6 +77,7 @@ "l1": {"ipv4": "auto", "pim": "enable"}, "i4": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [{ "network": ["1.0.4.11/32","10.0.4.2/24", "10.0.3.1/24"], "next_hop": "10.0.2.2" @@ -87,6 +92,7 @@ "f1": {"ipv4": "auto", "pim": "enable"}, "i5": {"ipv4": "auto", "pim": "enable"} }, + "pim": { "join-prune-interval": "5", "keep-alive-timer": 15, "register-suppress-time": 12 }, "static_routes": [ { "network": ["1.0.4.11/32", "10.0.2.1/24", "10.0.1.2/24"], diff --git a/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py b/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py index f0d6ac5ccc..033c76081a 100755 --- a/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py +++ b/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py @@ -2014,7 +2014,7 @@ def test_verify_remove_add_igmp_commands_when_pim_configured_p0(request): intf_l1_i1 = topo["routers"]["l1"]["links"]["i1"]["interface"] input_dict_1 = { - "l1": {"igmp": {"interfaces": {intf_l1_i1: {"igmp": {"version": "2"}}}}} + "l1": {"igmp": {"interfaces": {intf_l1_i1: {"igmp": {"version": "2", "query": {"query-max-response-time": 40, "query-interval": 5}}}}}} } result = verify_igmp_config(tgen, input_dict_1) diff --git a/tests/topotests/multicast_pim_static_rp_topo1/multicast_pim_static_rp.json b/tests/topotests/multicast_pim_static_rp_topo1/multicast_pim_static_rp.json index 6d6c047b00..39c68408b4 100644 --- a/tests/topotests/multicast_pim_static_rp_topo1/multicast_pim_static_rp.json +++ b/tests/topotests/multicast_pim_static_rp_topo1/multicast_pim_static_rp.json @@ -4,7 +4,11 @@ "link_ip_start": {"ipv4": "10.0.0.0", "v4mask": 24}, "lo_prefix": {"ipv4": "1.0.", "v4mask": 32}, "routers": { - "r0": {"links": {"r1": {"ipv4": "auto"}}}, + "r0": { + "links": { + "r1": {"ipv4": "auto"} + } + }, "r1": { "links": { "lo": {"ipv4": "auto", "type": "loopback", "pim": "enable"}, @@ -14,9 +18,20 @@ "r4": {"ipv4": "auto", "pim": "enable"} }, "pim": { - "rp": [{"rp_addr": "1.0.2.17", "group_addr_range": ["224.0.0.0/4"]}] + "join-prune-interval": "5", + "keep-alive-timer": 15, + "register-suppress-time": 12 + }, + "igmp": { + "interfaces": { + "r1-r0-eth0": { + "igmp": { + "query": {"query-max-response-time": 40, "query-interval": 5}, + "version": "2" + } + } + } }, - "igmp": {"interfaces": {"r1-r0-eth0": {"igmp": {"version": "2"}}}}, "static_routes": [ {"network": "10.0.4.0/24", "next_hop": "10.0.2.2"}, {"network": "10.0.5.0/24", "next_hop": "10.0.2.2"}, @@ -35,6 +50,9 @@ "r3": {"ipv4": "auto", "pim": "enable"} }, "pim": { + "join-prune-interval": "5", + "keep-alive-timer": 15, + "register-suppress-time": 12, "rp": [{"rp_addr": "1.0.2.17", "group_addr_range": ["224.0.0.0/4"]}] }, "static_routes": [ @@ -57,7 +75,9 @@ "r5": {"ipv4": "auto", "pim": "enable"} }, "pim": { - "rp": [{"rp_addr": "1.0.2.17", "group_addr_range": ["224.0.0.0/4"]}] + "join-prune-interval": "5", + "keep-alive-timer": 15, + "register-suppress-time": 12 }, "static_routes": [ {"network": "10.0.0.0/24", "next_hop": "10.0.2.1"}, @@ -75,7 +95,9 @@ "r3": {"ipv4": "auto", "pim": "enable"} }, "pim": { - "rp": [{"rp_addr": "1.0.2.17", "group_addr_range": ["224.0.0.0/4"]}] + "join-prune-interval": "5", + "keep-alive-timer": 15, + "register-suppress-time": 12 }, "static_routes": [ {"network": "10.0.0.0/24", "next_hop": "10.0.3.1"}, @@ -88,6 +110,10 @@ {"network": "1.0.3.17/32", "next_hop": "10.0.5.1"} ] }, - "r5": {"links": {"r3": {"ipv4": "auto"}}} + "r5": { + "links": { + "r3": {"ipv4": "auto"} + } + } } } -- 2.39.5