summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Mangin <thomas.mangin@exa.net.uk>2020-04-05 22:09:34 +0100
committerThomas Mangin <thomas.mangin@exa.net.uk>2020-04-06 20:22:35 +0100
commit8a93f664238101a38dec02c73a1615bfcea09f2a (patch)
tree668e3b8a40b2ca2210669f3f8c1c6f710d722136
parentaf931673d3643e95ea68b18d220d14403f4a8f48 (diff)
downloadvyos-1x-8a93f664238101a38dec02c73a1615bfcea09f2a.tar.gz
vyos-1x-8a93f664238101a38dec02c73a1615bfcea09f2a.zip
util: T2206: rewrite vrf to cmd
-rwxr-xr-xsrc/conf_mode/vrf.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py
index 8cf4b72ae..07466f3aa 100755
--- a/src/conf_mode/vrf.py
+++ b/src/conf_mode/vrf.py
@@ -20,13 +20,12 @@ from sys import exit
from copy import deepcopy
from jinja2 import FileSystemLoader, Environment
from json import loads
-from subprocess import check_output, CalledProcessError
from vyos.config import Config
from vyos.configdict import list_diff
from vyos.defaults import directories as vyos_data_dir
from vyos.ifconfig import Interface
-from vyos.util import read_file
+from vyos.util import read_file, cmd
from vyos import ConfigError
config_file = r'/etc/iproute2/rt_tables.d/vyos-vrf.conf'
@@ -40,14 +39,11 @@ default_config_data = {
}
def _cmd(command):
- try:
- check_output(command.split())
- except CalledProcessError as e:
- raise ConfigError(f'Error changing VRF: {e}')
+ cmd(command, raising=ConfigError, message='Error changing VRF')
def list_rules():
command = 'ip -j -4 rule show'
- answer = loads(check_output(command.split()).decode())
+ answer = loads(cmd(command))
return [_ for _ in answer if _]
def vrf_interfaces(c, match):