Merge pull request #5115 from c-po/commit-archive-vrf

remote: T4732: add VRF option for commit-archive

1 files changed, 6 insertions, 7 deletions

diff --git a/src/conf_mode/system_config-management.py b/src/conf_mode/system_config-management.py
index c1d83af34..81a48ea50 100755
--- a/src/conf_mode/system_config-management.py
+++ b/src/conf_mode/system_config-management.py
@@ -19,9 +19,10 @@ import sys
 
 from vyos import ConfigError
 from vyos.config import Config
+from vyos.configverify import verify_vrf
 from vyos.config_mgmt import ConfigMgmt
-from vyos.config_mgmt import commit_post_hook_dir, commit_hooks
-
+from vyos.config_mgmt import commit_post_hook_dir
+from vyos.config_mgmt import commit_hooks
 
 def get_config(config=None):
     if config:
@@ -34,10 +35,8 @@ def get_config(config=None):
         return None
 
     mgmt = ConfigMgmt(config=conf)
-
     return mgmt
 
-
 def verify(mgmt):
     if mgmt is None:
         return
@@ -47,16 +46,16 @@ def verify(mgmt):
     if confirm.get('action', '') == 'reload' and 'commit_revisions' not in d:
         raise ConfigError('commit-confirm reload requires non-zero commit-revisions')
 
-    return
+    if 'commit_archive' in d:
+        verify_vrf(d['commit_archive'])
 
+    return
 
 def generate(mgmt):
     if mgmt is None:
         return
-
     mgmt.initialize_revision()
 
-
 def apply(mgmt):
     if mgmt is None:
         return