summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-03-03 21:31:46 +0100
committerChristian Breunig <christian@breunig.cc>2024-03-03 21:31:46 +0100
commit6a97fdfa1ba9b4135a51498ea5acabb804256b2c (patch)
tree09aa59ac6e2f33dc5142a3e628e15c39a358c607
parent256e939b2cd308e1e8be9dd72ccec6e87d58504b (diff)
downloadvyos-1x-6a97fdfa1ba9b4135a51498ea5acabb804256b2c.tar.gz
vyos-1x-6a97fdfa1ba9b4135a51498ea5acabb804256b2c.zip
ospfv3: T6087: add support to redistribute IS-IS routes
-rw-r--r--interface-definitions/include/ospfv3/protocol-common-config.xml.i10
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_ospfv3.py2
-rwxr-xr-xsrc/conf_mode/protocols_ospfv3.py2
3 files changed, 12 insertions, 2 deletions
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 <include/route-map.xml.i>
</children>
</node>
+ <node name="isis">
+ <properties>
+ <help>Redistribute IS-IS routes</help>
+ </properties>
+ <children>
+ #include <include/ospf/metric.xml.i>
+ #include <include/ospf/metric-type.xml.i>
+ #include <include/route-map.xml.i>
+ </children>
+ </node>
<node name="kernel">
<properties>
<help>Redistribute kernel routes</help>
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']):