summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-04-02 22:46:46 +0200
committerGitHub <noreply@github.com>2021-04-02 22:46:46 +0200
commit810f4700acc9816178dc9a7f5f555bbde71a141d (patch)
tree46baa5af5c52fde8a6f2ea3bf5be560d1fce0a0b /src
parentb4fdcebebecd8d8952211b78bce26d53fd29edb3 (diff)
parentd9d923ea4e0bbe0cc154dc2fbdd626585b5d7449 (diff)
downloadvyos-1x-810f4700acc9816178dc9a7f5f555bbde71a141d.tar.gz
vyos-1x-810f4700acc9816178dc9a7f5f555bbde71a141d.zip
Merge pull request #798 from sever-sever/T3217
frr: T3217: Ability to save routing configs
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/protocols_bgp.py4
-rwxr-xr-xsrc/conf_mode/protocols_isis.py4
-rwxr-xr-xsrc/conf_mode/protocols_ospf.py4
-rwxr-xr-xsrc/conf_mode/protocols_ospfv3.py4
-rwxr-xr-xsrc/conf_mode/protocols_rip.py4
-rwxr-xr-xsrc/conf_mode/protocols_ripng.py4
-rwxr-xr-xsrc/conf_mode/protocols_static.py4
7 files changed, 14 insertions, 14 deletions
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index 6770865ff..73cfa9b83 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -213,8 +213,8 @@ def apply(bgp):
for a in range(5):
frr_cfg.commit_configuration(frr_daemon)
- # Save configuration to /run/frr/{daemon}.conf
- frr.save_configuration(frr_daemon)
+ # Save configuration to /run/frr/config/frr.conf
+ frr.save_configuration()
return None
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 02cf9970c..571520cfe 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -209,8 +209,8 @@ def apply(isis):
for a in range(5):
frr_cfg.commit_configuration(frr_daemon)
- # Save configuration to /run/frr/{daemon}.conf
- frr.save_configuration(frr_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 b4ee8659a..30cc33dcf 100755
--- a/src/conf_mode/protocols_ospf.py
+++ b/src/conf_mode/protocols_ospf.py
@@ -200,8 +200,8 @@ def apply(ospf):
for a in range(5):
frr_cfg.commit_configuration(frr_daemon)
- # Save configuration to /run/frr/{daemon}.conf
- frr.save_configuration(frr_daemon)
+ # Save configuration to /run/frr/config/frr.conf
+ frr.save_configuration()
return None
diff --git a/src/conf_mode/protocols_ospfv3.py b/src/conf_mode/protocols_ospfv3.py
index f3beab204..42b6462e3 100755
--- a/src/conf_mode/protocols_ospfv3.py
+++ b/src/conf_mode/protocols_ospfv3.py
@@ -91,8 +91,8 @@ def apply(ospfv3):
for a in range(5):
frr_cfg.commit_configuration(frr_daemon)
- # Save configuration to /run/frr/{daemon}.conf
- frr.save_configuration(frr_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 34d42d630..e7eafd059 100755
--- a/src/conf_mode/protocols_rip.py
+++ b/src/conf_mode/protocols_rip.py
@@ -116,8 +116,8 @@ def apply(rip):
for a in range(5):
frr_cfg.commit_configuration(frr_daemon)
- # Save configuration to /run/frr/{daemon}.conf
- frr.save_configuration(frr_daemon)
+ # Save configuration to /run/frr/config/frr.conf
+ frr.save_configuration()
return None
diff --git a/src/conf_mode/protocols_ripng.py b/src/conf_mode/protocols_ripng.py
index eff4297f9..140133bd0 100755
--- a/src/conf_mode/protocols_ripng.py
+++ b/src/conf_mode/protocols_ripng.py
@@ -115,8 +115,8 @@ def apply(ripng):
for a in range(5):
frr_cfg.commit_configuration(frr_daemon)
- # Save configuration to /run/frr/{daemon}.conf
- frr.save_configuration(frr_daemon)
+ # Save configuration to /run/frr/config/frr.conf
+ frr.save_configuration()
return None
diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py
index 0de073a6d..7ae952af8 100755
--- a/src/conf_mode/protocols_static.py
+++ b/src/conf_mode/protocols_static.py
@@ -97,8 +97,8 @@ def apply(static):
for a in range(5):
frr_cfg.commit_configuration(frr_daemon)
- # Save configuration to /run/frr/{daemon}.conf
- frr.save_configuration(frr_daemon)
+ # Save configuration to /run/frr/config/frr.conf
+ frr.save_configuration()
return None