From 67573f503722e59e0aae1962f0c5551465d422a0 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 3 Mar 2024 21:31:08 +0100 Subject: smoketest: T4977: ospf: include babel in redistribution tests (cherry picked from commit 256e939b2cd308e1e8be9dd72ccec6e87d58504b) --- smoketest/scripts/cli/test_protocols_ospf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'smoketest/scripts') diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py index 6bffc7c45..82fb96754 100755 --- a/smoketest/scripts/cli/test_protocols_ospf.py +++ b/smoketest/scripts/cli/test_protocols_ospf.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2021-2023 VyOS maintainers and contributors +# Copyright (C) 2021-2024 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -240,7 +240,7 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase): def test_ospf_07_redistribute(self): metric = '15' metric_type = '1' - redistribute = ['bgp', 'connected', 'isis', 'kernel', 'rip', 'static'] + redistribute = ['babel', 'bgp', 'connected', 'isis', 'kernel', 'rip', 'static'] for protocol in redistribute: self.cli_set(base_path + ['redistribute', protocol, 'metric', metric]) -- cgit v1.2.3 From e2afe33855022d165445038b811075bae128c01a Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 3 Mar 2024 21:31:46 +0100 Subject: ospfv3: T6087: add support to redistribute IS-IS routes (cherry picked from commit 6a97fdfa1ba9b4135a51498ea5acabb804256b2c) --- .../include/ospfv3/protocol-common-config.xml.i | 10 ++++++++++ smoketest/scripts/cli/test_protocols_ospfv3.py | 2 +- src/conf_mode/protocols_ospfv3.py | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'smoketest/scripts') diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i index 1462b9c15..72fb86d3d 100644 --- a/interface-definitions/include/ospfv3/protocol-common-config.xml.i +++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i @@ -251,6 +251,16 @@ #include + + + Redistribute IS-IS routes + + + #include + #include + #include + + Redistribute kernel routes diff --git a/smoketest/scripts/cli/test_protocols_ospfv3.py b/smoketest/scripts/cli/test_protocols_ospfv3.py index a9894009d..989e1552d 100755 --- a/smoketest/scripts/cli/test_protocols_ospfv3.py +++ b/smoketest/scripts/cli/test_protocols_ospfv3.py @@ -118,7 +118,7 @@ class TestProtocolsOSPFv3(VyOSUnitTestSHIM.TestCase): metric_type = '1' route_map = 'foo-bar' route_map_seq = '10' - redistribute = ['bgp', 'connected', 'kernel', 'ripng', 'static'] + redistribute = ['babel', 'bgp', 'connected', 'isis', 'kernel', 'ripng', 'static'] self.cli_set(['policy', 'route-map', route_map, 'rule', route_map_seq, 'action', 'permit']) diff --git a/src/conf_mode/protocols_ospfv3.py b/src/conf_mode/protocols_ospfv3.py index 2c1cbfecd..afd767dbf 100755 --- a/src/conf_mode/protocols_ospfv3.py +++ b/src/conf_mode/protocols_ospfv3.py @@ -85,7 +85,7 @@ def get_config(config=None): if 'graceful_restart' not in ospfv3: del default_values['graceful_restart'] - for protocol in ['babel', 'bgp', 'connected', 'kernel', 'ripng', 'static']: + for protocol in ['babel', 'bgp', 'connected', 'isis', 'kernel', 'ripng', 'static']: if dict_search(f'redistribute.{protocol}', ospfv3) is None: del default_values['redistribute'][protocol] if not bool(default_values['redistribute']): -- cgit v1.2.3