Merge pull request #4536 from ig0rb/fix/T7510-ospf-nssa-translation-error

T7510: ospfd.frr.j2 ospf nssa translation error - fix template

Author: dmbaturin

data/templates/frr/ospfd.frr.j2

@@ -82,7 +82,7 @@ router ospf {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
 {%     for area_id, area_config in area.items() %}
 {%         if area_config.area_type is vyos_defined %}
 {%             for type, type_config in area_config.area_type.items() if type != 'normal' %}
- area {{ area_id }} {{ type }} {{ 'no-summary' if type_config.no_summary is vyos_defined }}
+ area {{ area_id }} {{ type }} {{ 'translate-' + type_config.translate if type_config.translate is vyos_defined }} {{ 'no-summary' if type_config.no_summary is vyos_defined }}
 {%                 if type_config.default_cost is vyos_defined %}
  area {{ area_id }} default-cost {{ type_config.default_cost }}
 {%                 endif %}

smoketest/scripts/cli/test_protocols_ospf.py

@@ -574,5 +574,23 @@ def test_ospf_17_duplicate_area_network(self):
         self.assertIn(f'router ospf', frrconfig)
         self.assertIn(f' network {network} area {area1}', frrconfig)
 
+    def test_ospf_18_area_translate_no_summary(self):
+        area = '11'
+        area_type = 'nssa'
+        network = '100.64.0.0/10'
+
+        self.cli_set(base_path + ['area', area, 'area-type', area_type, 'no-summary'])
+        self.cli_set(base_path + ['area', area, 'area-type', area_type, 'translate', 'never'])
+        self.cli_set(base_path + ['area', area, 'network', network])
+
+        # commit changes
+        self.cli_commit()
+
+        # Verify FRR ospfd configuration
+        frrconfig = self.getFRRconfig('router ospf', endsection='^exit')
+        self.assertIn(f'router ospf', frrconfig)
+        self.assertIn(f' area {area} {area_type} translate-never no-summary', frrconfig)
+        self.assertIn(f' network {network} area {area}', frrconfig)
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)

src/conf_mode/protocols_ospf.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021-2024 VyOS maintainers and contributors
+# Copyright (C) 2021-2025 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -17,6 +17,7 @@
 from sys import exit
 from sys import argv
 
+from vyos.base import Warning
 from vyos.config import Config
 from vyos.configverify import verify_common_route_maps
 from vyos.configverify import verify_route_map
@@ -62,6 +63,16 @@ def verify(config_dict):
     if 'area' in ospf:
           networks = []
           for area, area_config in ospf['area'].items():
+              # Implemented as warning to not break existing configurations
+              if area == '0' and dict_search('area_type.nssa', area_config) != None:
+                  Warning('You cannot configure NSSA to backbone!')
+              # Implemented as warning to not break existing configurations
+              if area == '0' and dict_search('area_type.stub', area_config) != None:
+                  Warning('You cannot configure STUB to backbone!')
+              # Implemented as warning to not break existing configurations
+              if len(area_config['area_type']) > 1:
+                  Warning(f'Only one area-type is supported for area "{area}"!')
+
               if 'import_list' in area_config:
                   acl_import = area_config['import_list']
                   if acl_import: verify_access_list(acl_import, ospf)