From ea3c7785d06ed341487efb800c141fa7a7797ba7 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 27 Nov 2021 10:32:01 +0100
Subject: frr: T3753: add default_add_before mnemonic for routing protocols to
 re-use code

---
 src/conf_mode/protocols_isis.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/conf_mode/protocols_isis.py')

diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 4505e2496..120fc68a0 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -215,7 +215,7 @@ def apply(isis):
     # The route-map used for the FIB (zebra) is part of the zebra daemon
     frr_cfg.load_configuration(zebra_daemon)
     frr_cfg.modify_section(r'(\s+)?ip protocol isis route-map [-a-zA-Z0-9.]+$', '', '(\s|!)')
-    frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', isis['frr_zebra_config'])
+    frr_cfg.add_before(frr.default_add_before, isis['frr_zebra_config'])
     frr_cfg.commit_configuration(zebra_daemon)
 
     # Generate empty helper string which can be ammended to FRR commands, it
@@ -233,7 +233,7 @@ def apply(isis):
         for interface in isis[key]:
             frr_cfg.modify_section(f'^interface {interface}{vrf}$', '')
 
-    frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', isis['frr_isisd_config'])
+    frr_cfg.add_before(frr.default_add_before, isis['frr_isisd_config'])
     frr_cfg.commit_configuration(isis_daemon)
 
     # Save configuration to /run/frr/config/frr.conf
-- 
cgit v1.2.3


From df37032ddf58afeff91cfa2b4b0e815a17d44243 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 27 Nov 2021 10:32:02 +0100
Subject: isis: T3753: adjust to new FRR 8.1 syntax

---
 data/templates/frr/isisd.frr.tmpl            | 91 ++++++++++++++--------------
 smoketest/scripts/cli/test_protocols_isis.py |  3 +-
 src/conf_mode/protocols_isis.py              | 22 +++----
 3 files changed, 59 insertions(+), 57 deletions(-)

(limited to 'src/conf_mode/protocols_isis.py')

diff --git a/data/templates/frr/isisd.frr.tmpl b/data/templates/frr/isisd.frr.tmpl
index 51ac40060..fc0799e02 100644
--- a/data/templates/frr/isisd.frr.tmpl
+++ b/data/templates/frr/isisd.frr.tmpl
@@ -1,4 +1,50 @@
 !
+{% if interface is defined and interface is not none %}
+{%   for iface, iface_config in interface.items() %}
+interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
+ ip router isis VyOS
+ ipv6 router isis VyOS
+{%     if iface_config.bfd is defined %}
+ isis bfd
+{%     endif %}
+{%     if iface_config.network is defined and iface_config.network.point_to_point is defined %}
+ isis network point-to-point
+{%     endif %}
+{%     if iface_config.circuit_type is defined %}
+ isis circuit-type {{ iface_config.circuit_type }}
+{%     endif %}
+{%     if iface_config.hello_interval is defined and iface_config.hello_interval is not none %}
+ isis hello-interval {{ iface_config.hello_interval }}
+{%     endif %}
+{%     if iface_config.hello_multiplier is defined and iface_config.hello_multiplier is not none %}
+ isis hello-multiplier {{ iface_config.hello_multiplier }}
+{%     endif %}
+{%     if iface_config.hello_padding is defined %}
+ isis hello padding
+{%     endif %}
+{%     if iface_config.metric is defined and iface_config.metric is not none %}
+ isis metric {{ iface_config.metric }}
+{%     endif %}
+{%     if iface_config.passive is defined %}
+ isis passive
+{%     endif %}
+{%     if iface_config.password is defined and iface_config.password.plaintext_password is defined and iface_config.password.plaintext_password is not none %}
+ isis password clear {{ iface_config.password.plaintext_password }}
+{%     endif %}
+{%     if iface_config.priority is defined and iface_config.priority is not none %}
+ isis priority {{ iface_config.priority }}
+{%     endif %}
+{%     if iface_config.psnp_interval is defined and iface_config.psnp_interval is not none %}
+ isis psnp-interval {{ iface_config.psnp_interval }}
+{%     endif %}
+{%     if iface_config.no_three_way_handshake is defined %}
+ no isis three-way-handshake
+{%     endif %}
+exit
+!
+{%   endfor %}
+{% endif %}
+!
 router isis VyOS {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
  net {{ net }}
 {% if dynamic_hostname is defined %}
@@ -151,48 +197,5 @@ router isis VyOS {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
  is-type {{ level }}
 {%   endif %}
 {% endif %}
-!
-{% if interface is defined and interface is not none %}
-{%   for iface, iface_config in interface.items() %}
-interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
- ip router isis VyOS
- ipv6 router isis VyOS
-{%     if iface_config.bfd is defined %}
- isis bfd
-{%     endif %}
-{%     if iface_config.network is defined and iface_config.network.point_to_point is defined %}
- isis network point-to-point
-{%     endif %}
-{%     if iface_config.circuit_type is defined %}
- isis circuit-type {{ iface_config.circuit_type }}
-{%     endif %}
-{%     if iface_config.hello_interval is defined and iface_config.hello_interval is not none %}
- isis hello-interval {{ iface_config.hello_interval }}
-{%     endif %}
-{%     if iface_config.hello_multiplier is defined and iface_config.hello_multiplier is not none %}
- isis hello-multiplier {{ iface_config.hello_multiplier }}
-{%     endif %}
-{%     if iface_config.hello_padding is defined %}
- isis hello padding
-{%     endif %}
-{%     if iface_config.metric is defined and iface_config.metric is not none %}
- isis metric {{ iface_config.metric }}
-{%     endif %}
-{%     if iface_config.passive is defined %}
- isis passive
-{%     endif %}
-{%     if iface_config.password is defined and iface_config.password.plaintext_password is defined and iface_config.password.plaintext_password is not none %}
- isis password clear {{ iface_config.password.plaintext_password }}
-{%     endif %}
-{%     if iface_config.priority is defined and iface_config.priority is not none %}
- isis priority {{ iface_config.priority }}
-{%     endif %}
-{%     if iface_config.psnp_interval is defined and iface_config.psnp_interval is not none %}
- isis psnp-interval {{ iface_config.psnp_interval }}
-{%     endif %}
-{%     if iface_config.no_three_way_handshake is defined %}
- no isis three-way-handshake
-{%     endif %}
-{%   endfor %}
-{% endif %}
+exit
 !
\ No newline at end of file
diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py
index 949198ee6..e42040025 100755
--- a/smoketest/scripts/cli/test_protocols_isis.py
+++ b/smoketest/scripts/cli/test_protocols_isis.py
@@ -199,8 +199,6 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
 
 
     def test_isis_06_spf_delay(self):
-        self.isis_base_config()
-
         network = 'point-to-point'
         holddown = '10'
         init_delay = '50'
@@ -208,6 +206,7 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         short_delay = '100'
         time_to_learn = '75'
 
+        self.cli_set(base_path + ['net', net])
         for interface in self._interfaces:
             self.cli_set(base_path + ['interface', interface, 'network', network])
 
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 120fc68a0..3a0c40dc6 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -56,10 +56,10 @@ def get_config(config=None):
     # instead of the VRF instance.
     if vrf: isis['vrf'] = vrf
 
-    # As we no re-use this Python handler for both VRF and non VRF instances for
-    # IS-IS we need to find out if any interfaces changed so properly adjust
-    # the FRR configuration and not by acctident change interfaces from a
-    # different VRF.
+    # FRR has VRF support for different routing daemons. As interfaces belong
+    # to VRFs - or the global VRF, we need to check for changed interfaces so
+    # that they will be properly rendered for the FRR config. Also this eases
+    # removal of interfaces from the running configuration.
     interfaces_removed = node_changed(conf, base + ['interface'])
     if interfaces_removed:
         isis['interface_removed'] = list(interfaces_removed)
@@ -196,8 +196,6 @@ def verify(isis):
 
 def generate(isis):
     if not isis or 'deleted' in isis:
-        isis['frr_isisd_config'] = ''
-        isis['frr_zebra_config'] = ''
         return None
 
     isis['protocol'] = 'isis' # required for frr/vrf.route-map.frr.tmpl
@@ -214,8 +212,9 @@ def apply(isis):
 
     # The route-map used for the FIB (zebra) is part of the zebra daemon
     frr_cfg.load_configuration(zebra_daemon)
-    frr_cfg.modify_section(r'(\s+)?ip protocol isis route-map [-a-zA-Z0-9.]+$', '', '(\s|!)')
-    frr_cfg.add_before(frr.default_add_before, isis['frr_zebra_config'])
+    frr_cfg.modify_section('(\s+)?ip protocol isis route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
+    if 'frr_zebra_config' in isis:
+        frr_cfg.add_before(frr.default_add_before, isis['frr_zebra_config'])
     frr_cfg.commit_configuration(zebra_daemon)
 
     # Generate empty helper string which can be ammended to FRR commands, it
@@ -225,15 +224,16 @@ def apply(isis):
         vrf = ' vrf ' + isis['vrf']
 
     frr_cfg.load_configuration(isis_daemon)
-    frr_cfg.modify_section(f'^router isis VyOS{vrf}$', '')
+    frr_cfg.modify_section(f'^router isis VyOS{vrf}', stop_pattern='^exit', remove_stop_mark=True)
 
     for key in ['interface', 'interface_removed']:
         if key not in isis:
             continue
         for interface in isis[key]:
-            frr_cfg.modify_section(f'^interface {interface}{vrf}$', '')
+            frr_cfg.modify_section(f'^interface {interface}{vrf}', stop_pattern='^exit', remove_stop_mark=True)
 
-    frr_cfg.add_before(frr.default_add_before, isis['frr_isisd_config'])
+    if 'frr_isisd_config' in isis:
+        frr_cfg.add_before(frr.default_add_before, isis['frr_isisd_config'])
     frr_cfg.commit_configuration(isis_daemon)
 
     # Save configuration to /run/frr/config/frr.conf
-- 
cgit v1.2.3


From 3800ea910a72a4d1a78b63f235980d9414747816 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 27 Nov 2021 10:32:02 +0100
Subject: isis: T3753: reload config five (5) times - workaround for FRR issue
 #10133

Re-applying the same configuration after it failed the first times makes it
load. See https://github.com/FRRouting/frr/issues/10133 for more details
---
 src/conf_mode/protocols_isis.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/conf_mode/protocols_isis.py')

diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 3a0c40dc6..5d02de869 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -234,7 +234,15 @@ def apply(isis):
 
     if 'frr_isisd_config' in isis:
         frr_cfg.add_before(frr.default_add_before, isis['frr_isisd_config'])
-    frr_cfg.commit_configuration(isis_daemon)
+
+    # https://github.com/FRRouting/frr/issues/XXXX
+    count = 0
+    while count <= 5:
+        count += 1
+        try:
+            frr_cfg.commit_configuration(isis_daemon)
+        except:
+            pass
 
     # Save configuration to /run/frr/config/frr.conf
     frr.save_configuration()
-- 
cgit v1.2.3


From 5e38895c906f05ecd3815573f07106a9ccab145a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 27 Nov 2021 19:34:07 +0100
Subject: frr: alwaws try to commit connfig 5 times

As a result to some frr-reload bugs workarounded in commit 3800ea91 or fe0038c2
this commit adds the workaround in general.
---
 python/vyos/frr.py                | 20 ++++++++++++--------
 src/conf_mode/protocols_isis.py   | 10 +---------
 src/conf_mode/protocols_ospfv3.py | 10 +---------
 src/conf_mode/protocols_rpki.py   |  3 +++
 4 files changed, 17 insertions(+), 26 deletions(-)

(limited to 'src/conf_mode/protocols_isis.py')

diff --git a/python/vyos/frr.py b/python/vyos/frr.py
index 119ea8b50..7bad2b0b6 100644
--- a/python/vyos/frr.py
+++ b/python/vyos/frr.py
@@ -216,13 +216,8 @@ def reload_configuration(config, daemon=None):
 
 
 def save_configuration():
-    """Save FRR configuration to /run/frr/config/frr.conf
-       It save configuration on each commit. T3217
-    """
-
-    cmd(f'{path_vtysh} -n -w')
-
-    return
+    """ T3217: Save FRR configuration to /run/frr/config/frr.conf """
+    return cmd(f'{path_vtysh} -n -w')
 
 
 def execute(command):
@@ -457,7 +452,16 @@ class FRRConfig:
         LOG.debug('commit_configuration:  Commiting configuration')
         for i, e in enumerate(self.config):
             LOG.debug(f'commit_configuration: new_config {i:3} {e}')
-        reload_configuration('\n'.join(self.config), daemon=daemon)
+
+        # https://github.com/FRRouting/frr/issues/10132
+        # https://github.com/FRRouting/frr/issues/10133
+        count = 0
+        while count <= 5:
+            count += 1
+            try:
+                reload_configuration('\n'.join(self.config), daemon=daemon)
+            except:
+                pass
 
     def modify_section(self, start_pattern, replacement='!', stop_pattern=r'\S+', remove_stop_mark=False, count=0):
         if isinstance(replacement, str):
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 5d02de869..0011e6fbf 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -235,15 +235,7 @@ def apply(isis):
     if 'frr_isisd_config' in isis:
         frr_cfg.add_before(frr.default_add_before, isis['frr_isisd_config'])
 
-    # https://github.com/FRRouting/frr/issues/XXXX
-    count = 0
-    while count <= 5:
-        count += 1
-        try:
-            frr_cfg.commit_configuration(isis_daemon)
-        except:
-            pass
-
+    frr_cfg.commit_configuration(isis_daemon)
     # Save configuration to /run/frr/config/frr.conf
     frr.save_configuration()
 
diff --git a/src/conf_mode/protocols_ospfv3.py b/src/conf_mode/protocols_ospfv3.py
index 77d9e0366..5d6ca7169 100755
--- a/src/conf_mode/protocols_ospfv3.py
+++ b/src/conf_mode/protocols_ospfv3.py
@@ -101,15 +101,7 @@ def apply(ospfv3):
     if 'new_frr_config' in ospfv3:
         frr_cfg.add_before(frr.default_add_before, ospfv3['new_frr_config'])
 
-    # https://github.com/FRRouting/frr/issues/10132
-    count = 0
-    while count <= 5:
-        count += 1
-        try:
-            frr_cfg.commit_configuration(ospf6_daemon)
-        except:
-            pass
-
+    frr_cfg.commit_configuration(ospf6_daemon)
     # Save configuration to /run/frr/config/frr.conf
     frr.save_configuration()
 
diff --git a/src/conf_mode/protocols_rpki.py b/src/conf_mode/protocols_rpki.py
index 41ce1f1fd..dadd8d6f4 100755
--- a/src/conf_mode/protocols_rpki.py
+++ b/src/conf_mode/protocols_rpki.py
@@ -93,7 +93,10 @@ def apply(rpki):
     frr_cfg.modify_section('^rpki')
     if 'new_frr_config' in rpki:
         frr_cfg.add_before(frr.default_add_before, rpki['new_frr_config'])
+
     frr_cfg.commit_configuration(bgp_daemon)
+    # Save configuration to /run/frr/config/frr.conf
+    frr.save_configuration()
 
     return None
 
-- 
cgit v1.2.3


From f1973bcf16fcc5e38c5fa3d3749846470e8e4afa Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 27 Nov 2021 20:10:55 +0100
Subject: frr: T3753: autosave config when calling commit_configuration()

---
 python/vyos/frr.py                | 11 ++++++++---
 src/conf_mode/policy.py           |  3 ---
 src/conf_mode/protocols_bgp.py    |  3 ---
 src/conf_mode/protocols_isis.py   |  2 --
 src/conf_mode/protocols_ospf.py   |  3 ---
 src/conf_mode/protocols_ospfv3.py |  2 --
 src/conf_mode/protocols_rip.py    |  3 ---
 src/conf_mode/protocols_ripng.py  |  3 ---
 src/conf_mode/protocols_rpki.py   |  3 ---
 src/conf_mode/protocols_static.py |  3 ---
 src/conf_mode/vrf_vni.py          |  3 ---
 11 files changed, 8 insertions(+), 31 deletions(-)

(limited to 'src/conf_mode/protocols_isis.py')

diff --git a/python/vyos/frr.py b/python/vyos/frr.py
index e5253350a..a8f115d9a 100644
--- a/python/vyos/frr.py
+++ b/python/vyos/frr.py
@@ -445,9 +445,11 @@ class FRRConfig:
         mark_configuration('\n'.join(self.config))
 
     def commit_configuration(self, daemon=None):
-        '''Commit the current configuration to FRR
-           daemon: str with name of the FRR daemon to commit to or
-                   None to use the consolidated config
+        '''
+        Commit the current configuration to FRR daemon: str with name of the
+        FRR daemon to commit to or None to use the consolidated config.
+
+        Configuration is automatically saved after apply
         '''
         LOG.debug('commit_configuration:  Commiting configuration')
         for i, e in enumerate(self.config):
@@ -469,6 +471,9 @@ class FRRConfig:
         if count >= count_max:
             raise ConfigurationNotValid(f'Config commit retry counter ({count_max}) exceeded')
 
+        # Save configuration to /run/frr/config/frr.conf
+        save_configuration()
+
 
     def modify_section(self, start_pattern, replacement='!', stop_pattern=r'\S+', remove_stop_mark=False, count=0):
         if isinstance(replacement, str):
diff --git a/src/conf_mode/policy.py b/src/conf_mode/policy.py
index 5f9fcab9f..e251396c7 100755
--- a/src/conf_mode/policy.py
+++ b/src/conf_mode/policy.py
@@ -204,9 +204,6 @@ def apply(policy):
         frr_cfg.add_before(frr.default_add_before, policy['new_frr_config'])
     frr_cfg.commit_configuration(zebra_daemon)
 
-    # Save configuration to /run/frr/config/frr.conf
-    frr.save_configuration()
-
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index 359bfff76..b88f0c4ef 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -302,9 +302,6 @@ def apply(bgp):
         frr_cfg.add_before(frr.default_add_before, bgp['frr_bgpd_config'])
     frr_cfg.commit_configuration(bgp_daemon)
 
-    # Save configuration to /run/frr/config/frr.conf
-    frr.save_configuration()
-
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 0011e6fbf..9b4b215de 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -236,8 +236,6 @@ def apply(isis):
         frr_cfg.add_before(frr.default_add_before, isis['frr_isisd_config'])
 
     frr_cfg.commit_configuration(isis_daemon)
-    # Save configuration to /run/frr/config/frr.conf
-    frr.save_configuration()
 
     return None
 
diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py
index 255560e19..9d1fb48e4 100755
--- a/src/conf_mode/protocols_ospf.py
+++ b/src/conf_mode/protocols_ospf.py
@@ -231,9 +231,6 @@ def apply(ospf):
         frr_cfg.add_before(frr.default_add_before, ospf['frr_ospfd_config'])
     frr_cfg.commit_configuration(ospf_daemon)
 
-    # Save configuration to /run/frr/config/frr.conf
-    frr.save_configuration()
-
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_ospfv3.py b/src/conf_mode/protocols_ospfv3.py
index 5d6ca7169..f1e490f48 100755
--- a/src/conf_mode/protocols_ospfv3.py
+++ b/src/conf_mode/protocols_ospfv3.py
@@ -102,8 +102,6 @@ def apply(ospfv3):
         frr_cfg.add_before(frr.default_add_before, ospfv3['new_frr_config'])
 
     frr_cfg.commit_configuration(ospf6_daemon)
-    # Save configuration to /run/frr/config/frr.conf
-    frr.save_configuration()
 
     return None
 
diff --git a/src/conf_mode/protocols_rip.py b/src/conf_mode/protocols_rip.py
index 96df41bdb..300f56489 100755
--- a/src/conf_mode/protocols_rip.py
+++ b/src/conf_mode/protocols_rip.py
@@ -131,9 +131,6 @@ def apply(rip):
         frr_cfg.add_before(frr.default_add_before, rip['new_frr_config'])
     frr_cfg.commit_configuration(rip_daemon)
 
-    # Save configuration to /run/frr/config/frr.conf
-    frr.save_configuration()
-
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_ripng.py b/src/conf_mode/protocols_ripng.py
index d46a2216c..d9b8c0b30 100755
--- a/src/conf_mode/protocols_ripng.py
+++ b/src/conf_mode/protocols_ripng.py
@@ -116,9 +116,6 @@ def apply(ripng):
         frr_cfg.add_before(frr.default_add_before, ripng['new_frr_config'])
     frr_cfg.commit_configuration(ripng_daemon)
 
-    # Save configuration to /run/frr/config/frr.conf
-    frr.save_configuration()
-
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_rpki.py b/src/conf_mode/protocols_rpki.py
index dadd8d6f4..4bd4e8650 100755
--- a/src/conf_mode/protocols_rpki.py
+++ b/src/conf_mode/protocols_rpki.py
@@ -95,9 +95,6 @@ def apply(rpki):
         frr_cfg.add_before(frr.default_add_before, rpki['new_frr_config'])
 
     frr_cfg.commit_configuration(bgp_daemon)
-    # Save configuration to /run/frr/config/frr.conf
-    frr.save_configuration()
-
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py
index 5cfe37655..c1e427b16 100755
--- a/src/conf_mode/protocols_static.py
+++ b/src/conf_mode/protocols_static.py
@@ -114,9 +114,6 @@ def apply(static):
         frr_cfg.add_before(frr.default_add_before, static['new_frr_config'])
     frr_cfg.commit_configuration(static_daemon)
 
-    # Save configuration to /run/frr/config/frr.conf
-    frr.save_configuration()
-
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/vrf_vni.py b/src/conf_mode/vrf_vni.py
index a357f30dd..680d79826 100755
--- a/src/conf_mode/vrf_vni.py
+++ b/src/conf_mode/vrf_vni.py
@@ -52,9 +52,6 @@ def apply(vrf):
         frr_cfg.add_before(frr.default_add_before, 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__':
-- 
cgit v1.2.3