diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-01-12 19:40:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-12 19:40:00 +0100 |
| commit | 0b59afbb9fd06abf87ed340f05b977e52e516266 (patch) | |
| tree | 8c5730e78b032dde890b8fbfbc8432dc86359ff0 | |
| parent | 9804a878aa929946b280ded9ae6d1379f94044ad (diff) | |
| parent | 20f448d16c31088ccdcd76d11d11de5f1ac96ce0 (diff) | |
| download | vyos-1x-0b59afbb9fd06abf87ed340f05b977e52e516266.tar.gz vyos-1x-0b59afbb9fd06abf87ed340f05b977e52e516266.zip | |
Merge pull request #1754 from vfreex/ospf-area-range-fix
T4934: ospf: Fix inter-area route summarization
| -rw-r--r-- | data/templates/frr/ospfd.frr.j2 | 8 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_protocols_ospf.py | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/data/templates/frr/ospfd.frr.j2 b/data/templates/frr/ospfd.frr.j2 index 0baff2d72..8c4a81c57 100644 --- a/data/templates/frr/ospfd.frr.j2 +++ b/data/templates/frr/ospfd.frr.j2 @@ -84,11 +84,13 @@ router ospf {{ 'vrf ' ~ vrf if vrf is vyos_defined }} {% endfor %} {% if area_config.range is vyos_defined %} {% for range, range_config in area_config.range.items() %} -{% if range_config.cost is vyos_defined %} - area {{ area_id }} range {{ range }} cost {{ range_config.cost }} -{% endif %} {% if range_config.not_advertise is vyos_defined %} area {{ area_id }} range {{ range }} not-advertise +{% else %} + area {{ area_id }} range {{ range }} +{% endif %} +{% if range_config.cost is vyos_defined %} + area {{ area_id }} range {{ range }} cost {{ range_config.cost }} {% endif %} {% if range_config.substitute is vyos_defined %} area {{ area_id }} range {{ range }} substitute {{ range_config.substitute }} diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py index 8dd0160d3..130cd3644 100755 --- a/smoketest/scripts/cli/test_protocols_ospf.py +++ b/smoketest/scripts/cli/test_protocols_ospf.py @@ -75,6 +75,9 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase): 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']) + self.cli_set(base_path + ['area', '10', 'network', '10.0.0.0/16']) + self.cli_set(base_path + ['area', '10', 'range', '10.0.1.0/24']) + self.cli_set(base_path + ['area', '10', 'range', '10.0.2.0/24', 'not-advertise']) # commit changes self.cli_commit() @@ -90,6 +93,11 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase): self.assertIn(f' capability opaque', frrconfig) self.assertIn(f' default-metric {metric}', frrconfig) self.assertIn(f' passive-interface default', frrconfig) + self.assertIn(f' area 10 stub', frrconfig) + self.assertIn(f' area 10 network 10.0.0.0/16', frrconfig) + self.assertIn(f' area 10 range 10.0.1.0/24', frrconfig) + self.assertNotIn(f' area 10 range 10.0.1.0/24 not-advertise', frrconfig) + self.assertIn(f' area 10 range 10.0.2.0/24 not-advertise', frrconfig) def test_ospf_03_access_list(self): |