summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuxiang Zhu <vfreex@gmail.com>2023-01-07 17:15:33 +0800
committerYuxiang Zhu <vfreex@gmail.com>2023-01-07 20:02:27 +0800
commitd281cf5a26a5bb73eff432307dde3d5a263f5045 (patch)
tree2331e4eaf311cdf99b0d247479d014ad1b7e9168
parent662bae181cdff07a2472d7121d18ae37d380e062 (diff)
downloadvyos-1x-d281cf5a26a5bb73eff432307dde3d5a263f5045.tar.gz
vyos-1x-d281cf5a26a5bb73eff432307dde3d5a263f5045.zip
T4920: ospf: Fix `passive-interface default` option
`passive_interface` is a leaf node. Also adds a smoketest.
-rw-r--r--data/templates/frr/ospfd.frr.j22
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_ospf.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/data/templates/frr/ospfd.frr.j2 b/data/templates/frr/ospfd.frr.j2
index 882ec8f97..0baff2d72 100644
--- a/data/templates/frr/ospfd.frr.j2
+++ b/data/templates/frr/ospfd.frr.j2
@@ -170,7 +170,7 @@ router ospf {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
{% if parameters.router_id is vyos_defined %}
ospf router-id {{ parameters.router_id }}
{% endif %}
-{% if passive_interface.default is vyos_defined %}
+{% if passive_interface is vyos_defined('default') %}
passive-interface default
{% endif %}
{% if redistribute is vyos_defined %}
diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py
index 339713bf6..7ffe642f2 100755
--- a/smoketest/scripts/cli/test_protocols_ospf.py
+++ b/smoketest/scripts/cli/test_protocols_ospf.py
@@ -74,6 +74,7 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
self.cli_set(base_path + ['parameters', 'rfc1583-compatibility'])
self.cli_set(base_path + ['log-adjacency-changes', 'detail'])
self.cli_set(base_path + ['default-metric', metric])
+ self.cli_set(base_path + ['passive-interface', 'default'])
# commit changes
self.cli_commit()
@@ -88,6 +89,7 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults
self.assertIn(f' capability opaque', frrconfig)
self.assertIn(f' default-metric {metric}', frrconfig)
+ self.assertIn(f' passive-interface default', frrconfig)
def test_ospf_03_access_list(self):