Merge branch 'current' into 2fa

1 files changed, 0 insertions, 20 deletions

diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py
index c1cfc1dcb..919083ac4 100755
--- a/src/conf_mode/vrf.py
+++ b/src/conf_mode/vrf.py
@@ -24,7 +24,6 @@ from vyos.config import Config
 from vyos.configdict import node_changed
 from vyos.ifconfig import Interface
 from vyos.template import render
-from vyos.template import render_to_string
 from vyos.util import call
 from vyos.util import cmd
 from vyos.util import dict_search
@@ -32,12 +31,9 @@ from vyos.util import get_interface_config
 from vyos.util import popen
 from vyos.util import run
 from vyos import ConfigError
-from vyos import frr
 from vyos import airbag
 airbag.enable()
 
-frr_daemon = 'zebra'
-
 config_file = r'/etc/iproute2/rt_tables.d/vyos-vrf.conf'
 
 def list_rules():
@@ -131,7 +127,6 @@ def verify(vrf):
 
 def generate(vrf):
     render(config_file, 'vrf/vrf.conf.tmpl', vrf)
-    vrf['new_frr_config'] = render_to_string('frr/vrf.frr.tmpl', vrf)
     # Render nftables zones config
     vrf['nft_vrf_zones'] = NamedTemporaryFile().name
     render(vrf['nft_vrf_zones'], 'firewall/nftables-vrf-zones.tmpl', vrf)
@@ -242,21 +237,6 @@ def apply(vrf):
         if tmp == 0:
             cmd('nft delete table inet vrf_zones')
 
-    #   T3694: Somehow we hit a priority inversion here as we need to remove the
-    #   VRF assigned VNI before we can remove a BGP bound VRF instance. Maybe
-    #   move this to an individual helper script that set's up the VNI for the
-    #   given VRF after any routing protocol.
-    #
-    #   # add configuration to FRR
-    #   frr_cfg = frr.FRRConfig()
-    #   frr_cfg.load_configuration(frr_daemon)
-    #   frr_cfg.modify_section(f'^vrf [a-zA-Z-]*$', '')
-    #   frr_cfg.add_before(r'(interface .*|line vty)', vrf['new_frr_config'])
-    #   frr_cfg.commit_configuration(frr_daemon)
-    #
-    #   # Save configuration to /run/frr/config/frr.conf
-    #   frr.save_configuration()
-
     return None
 
 if __name__ == '__main__':