1 files changed, 47 insertions, 26 deletions

diff --git a/src/conf_mode/interfaces_ethernet.py b/src/conf_mode/interfaces_ethernet.py
index 34ce7bc47..b112b244e 100755
--- a/src/conf_mode/interfaces_ethernet.py
+++ b/src/conf_mode/interfaces_ethernet.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2019-2024 VyOS maintainers and contributors
+# Copyright VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # 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
@@ -22,6 +22,7 @@ from vyos.base import Warning
 from vyos.config import Config
 from vyos.configdict import get_interface_dict
 from vyos.configdict import is_node_changed
+from vyos.configdict import get_flowtable_interfaces
 from vyos.configverify import verify_address
 from vyos.configverify import verify_dhcpv6
 from vyos.configverify import verify_interface_exists
@@ -33,15 +34,16 @@ from vyos.configverify import verify_vrf
 from vyos.configverify import verify_bond_bridge_member
 from vyos.configverify import verify_eapol
 from vyos.ethtool import Ethtool
+from vyos.frrender import FRRender
+from vyos.frrender import get_frrender_dict
 from vyos.ifconfig import EthernetIf
 from vyos.ifconfig import BondIf
-from vyos.template import render_to_string
 from vyos.utils.dict import dict_search
 from vyos.utils.dict import dict_to_paths_values
 from vyos.utils.dict import dict_set
 from vyos.utils.dict import dict_delete
+from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
-from vyos import frr
 from vyos import airbag
 airbag.enable()
 
@@ -164,6 +166,11 @@ def get_config(config=None):
     tmp = is_node_changed(conf, base + [ifname, 'duplex'])
     if tmp: ethernet.update({'speed_duplex_changed': {}})
 
+    tmp = is_node_changed(conf, base + [ifname, 'evpn'])
+    if tmp: ethernet.update({'frr_dict' : get_frrender_dict(conf)})
+
+    ethernet['flowtable_interfaces'] = get_flowtable_interfaces(conf)
+
     return ethernet
 
 def verify_speed_duplex(ethernet: dict, ethtool: Ethtool):
@@ -265,7 +272,38 @@ def verify_allowedbond_changes(ethernet: dict):
                               f' on interface "{ethernet["ifname"]}".' \
                               f' Interface is a bond member')
 
+def verify_flowtable(ethernet: dict):
+    ifname = ethernet['ifname']
+
+    if 'deleted' in ethernet and ifname in ethernet['flowtable_interfaces']:
+        raise ConfigError(f'Cannot delete interface "{ifname}", still referenced on a flowtable')
+
+    if 'vif_remove' in ethernet:
+        for vif in ethernet['vif_remove']:
+            vifname = f'{ifname}.{vif}'
+
+            if vifname in ethernet['flowtable_interfaces']:
+                raise ConfigError(f'Cannot delete interface "{vifname}", still referenced on a flowtable')
+
+    if 'vif_s_remove' in ethernet:
+        for vifs in ethernet['vif_s_remove']:
+            vifsname = f'{ifname}.{vifs}'
+
+            if vifsname in ethernet['flowtable_interfaces']:
+                raise ConfigError(f'Cannot delete interface "{vifsname}", still referenced on a flowtable')
+
+    if 'vif_s' in ethernet:
+        for vifs, vifs_conf in ethernet['vif_s'].items():
+            if 'vif_c_delete' in vifs_conf:
+                for vifc in vifs_conf['vif_c_delete']:
+                    vifcname = f'{ifname}.{vifs}.{vifc}'
+
+                    if vifcname in ethernet['flowtable_interfaces']:
+                        raise ConfigError(f'Cannot delete interface "{vifcname}", still referenced on a flowtable')
+
 def verify(ethernet):
+    verify_flowtable(ethernet)
+
     if 'deleted' in ethernet:
         return None
     if 'is_bond_member' in ethernet:
@@ -318,42 +356,25 @@ def verify_ethernet(ethernet):
     return None
 
 def generate(ethernet):
-    if 'deleted' in ethernet:
-        return None
-
-    ethernet['frr_zebra_config'] = ''
-    if 'deleted' not in ethernet:
-        ethernet['frr_zebra_config'] = render_to_string('frr/evpn.mh.frr.j2', ethernet)
-
+    if 'frr_dict' in ethernet and not is_systemd_service_running('vyos-configd.service'):
+        FRRender().generate(ethernet['frr_dict'])
     return None
 
 def apply(ethernet):
-    ifname = ethernet['ifname']
-
-    e = EthernetIf(ifname)
+    if 'frr_dict' in ethernet and not is_systemd_service_running('vyos-configd.service'):
+        FRRender().apply()
+    e = EthernetIf(ethernet['ifname'])
     if 'deleted' in ethernet:
-        # delete interface
         e.remove()
     else:
         e.update(ethernet)
-
-    zebra_daemon = 'zebra'
-    # Save original configuration prior to starting any commit actions
-    frr_cfg = frr.FRRConfig()
-
-    # The route-map used for the FIB (zebra) is part of the zebra daemon
-    frr_cfg.load_configuration(zebra_daemon)
-    frr_cfg.modify_section(f'^interface {ifname}', stop_pattern='^exit', remove_stop_mark=True)
-    if 'frr_zebra_config' in ethernet:
-        frr_cfg.add_before(frr.default_add_before, ethernet['frr_zebra_config'])
-    frr_cfg.commit_configuration(zebra_daemon)
+    return None
 
 if __name__ == '__main__':
     try:
         c = get_config()
         verify(c)
         generate(c)
-
         apply(c)
     except ConfigError as e:
         print(e)