diff options
| author | Christian Breunig <christian@poessinger.com> | 2023-01-07 17:49:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-07 17:49:40 +0100 |
| commit | 47216bbe29e0af8004040b5f1c9dc8450c0e8865 (patch) | |
| tree | eac9fb791a8b85d15c4f46cc857f5af251e2757d | |
| parent | 873240f6c8783d62f5f7431843f3a689bb1eea1c (diff) | |
| parent | d281cf5a26a5bb73eff432307dde3d5a263f5045 (diff) | |
| download | vyos-1x-47216bbe29e0af8004040b5f1c9dc8450c0e8865.tar.gz vyos-1x-47216bbe29e0af8004040b5f1c9dc8450c0e8865.zip | |
Merge pull request #1741 from vfreex/ospf-fix-passive-interface
T4920: ospf: Fix `passive-interface default` option
| -rw-r--r-- | data/templates/frr/ospfd.frr.j2 | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_protocols_ospf.py | 2 |
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 62e5f2134..8dd0160d3 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): |