Merge pull request #4227 from c-po/T6746-frr-10

frr: upgrade to 10.2 and migrate protocols to unified FRRender class

1 files changed, 19 insertions, 27 deletions

diff --git a/src/conf_mode/protocols_mpls.py b/src/conf_mode/protocols_mpls.py
index ad164db9f..e8097b7ff 100755
--- a/src/conf_mode/protocols_mpls.py
+++ b/src/conf_mode/protocols_mpls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2022 VyOS maintainers and contributors
+# Copyright (C) 2020-2024 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
@@ -20,33 +20,32 @@ from sys import exit
 
 from glob import glob
 from vyos.config import Config
-from vyos.template import render_to_string
+from vyos.configdict import get_frrender_dict
+from vyos.configverify import has_frr_protocol_in_dict
+from vyos.frrender import FRRender
 from vyos.utils.dict import dict_search
 from vyos.utils.file import read_file
+from vyos.utils.process import is_systemd_service_running
 from vyos.utils.system import sysctl_write
 from vyos.configverify import verify_interface_exists
 from vyos import ConfigError
-from vyos import frr
 from vyos import airbag
 airbag.enable()
 
-config_file = r'/tmp/ldpd.frr'
-
 def get_config(config=None):
     if config:
         conf = config
     else:
         conf = Config()
-    base = ['protocols', 'mpls']
 
-    mpls = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
-    return mpls
+    return get_frrender_dict(conf)
 
-def verify(mpls):
-    # If no config, then just bail out early.
-    if not mpls:
+def verify(config_dict):
+    if not has_frr_protocol_in_dict(config_dict, 'mpls'):
         return None
 
+    mpls = config_dict['mpls']
+
     if 'interface' in mpls:
         for interface in mpls['interface']:
             verify_interface_exists(mpls, interface)
@@ -68,26 +67,19 @@ def verify(mpls):
 
     return None
 
-def generate(mpls):
-    # If there's no MPLS config generated, create dictionary key with no value.
-    if not mpls or 'deleted' in mpls:
-        return None
-
-    mpls['frr_ldpd_config'] = render_to_string('frr/ldpd.frr.j2', mpls)
+def generate(config_dict):
+    if config_dict and not is_systemd_service_running('vyos-configd.service'):
+        FRRender().generate(config_dict)
     return None
 
-def apply(mpls):
-    ldpd_damon = 'ldpd'
-
-    # Save original configuration prior to starting any commit actions
-    frr_cfg = frr.FRRConfig()
+def apply(config_dict):
+    if config_dict and not is_systemd_service_running('vyos-configd.service'):
+        FRRender().apply()
 
-    frr_cfg.load_configuration(ldpd_damon)
-    frr_cfg.modify_section(f'^mpls ldp', stop_pattern='^exit', remove_stop_mark=True)
+    if not has_frr_protocol_in_dict(config_dict, 'mpls'):
+        return None
 
-    if 'frr_ldpd_config' in mpls:
-        frr_cfg.add_before(frr.default_add_before, mpls['frr_ldpd_config'])
-    frr_cfg.commit_configuration(ldpd_damon)
+    mpls = config_dict['mpls']
 
     # Set number of entries in the platform label tables
     labels = '0'