diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-11-27 01:20:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 01:20:17 +0100 |
| commit | e4e81b3d7f9689a4c5ba843d9b0022b624eb36e5 (patch) | |
| tree | 4f0bcb337ffa1c45de47389804065e32c0a080b5 | |
| parent | a1d5124fa73a7ec6850326e8d306fa4a05f2bdf1 (diff) | |
| parent | a835da15e0f2e2d8f6168c561b678e65cf130d18 (diff) | |
| download | vyos-1x-e4e81b3d7f9689a4c5ba843d9b0022b624eb36e5.tar.gz vyos-1x-e4e81b3d7f9689a4c5ba843d9b0022b624eb36e5.zip | |
Merge pull request #1679 from Cheeze-It/current
ospf: T4739: Adding missing OSPF FRR template
| -rw-r--r-- | data/templates/frr/ospfd.frr.j2 | 6 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_protocols_ospf.py | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/data/templates/frr/ospfd.frr.j2 b/data/templates/frr/ospfd.frr.j2 index 2a8afefbc..882ec8f97 100644 --- a/data/templates/frr/ospfd.frr.j2 +++ b/data/templates/frr/ospfd.frr.j2 @@ -161,6 +161,12 @@ router ospf {{ 'vrf ' ~ vrf if vrf is vyos_defined }} {% if parameters.abr_type is vyos_defined %} ospf abr-type {{ parameters.abr_type }} {% endif %} +{% if parameters.opaque_lsa is vyos_defined %} + ospf opaque-lsa +{% endif %} +{% if parameters.rfc1583_compatibility is vyos_defined %} + ospf rfc1583compatibility +{% endif %} {% if parameters.router_id is vyos_defined %} ospf router-id {{ parameters.router_id }} {% endif %} diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py index 51c947537..339713bf6 100755 --- a/smoketest/scripts/cli/test_protocols_ospf.py +++ b/smoketest/scripts/cli/test_protocols_ospf.py @@ -70,6 +70,8 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase): self.cli_set(base_path + ['auto-cost', 'reference-bandwidth', bandwidth]) self.cli_set(base_path + ['parameters', 'router-id', router_id]) self.cli_set(base_path + ['parameters', 'abr-type', abr_type]) + self.cli_set(base_path + ['parameters', 'opaque-lsa']) + 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]) @@ -79,10 +81,12 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase): # Verify FRR ospfd configuration frrconfig = self.getFRRconfig('router ospf') self.assertIn(f'router ospf', frrconfig) + self.assertIn(f' compatible rfc1583', frrconfig) self.assertIn(f' auto-cost reference-bandwidth {bandwidth}', frrconfig) self.assertIn(f' ospf router-id {router_id}', frrconfig) self.assertIn(f' ospf abr-type {abr_type}', frrconfig) self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults + self.assertIn(f' capability opaque', frrconfig) self.assertIn(f' default-metric {metric}', frrconfig) |