diff options
| -rw-r--r-- | python/vyos/vrf.py | 23 | ||||
| -rwxr-xr-x | src/conf_mode/vrf.py | 1 | ||||
| -rwxr-xr-x | src/op_mode/show_vrf.py | 27 |
3 files changed, 24 insertions, 27 deletions
diff --git a/python/vyos/vrf.py b/python/vyos/vrf.py deleted file mode 100644 index 99e4cb7d1..000000000 --- a/python/vyos/vrf.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020 VyOS maintainers and contributors <maintainers@vyos.io> -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library. If not, see <http://www.gnu.org/licenses/>. - -import json -import subprocess - - -def list_vrfs(): - command = 'ip -j -br link show type vrf' - answer = json.loads(subprocess.check_output(command.split()).decode()) - return [_ for _ in answer if _] diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py index 75b19da23..c2bbc72b3 100755 --- a/src/conf_mode/vrf.py +++ b/src/conf_mode/vrf.py @@ -22,7 +22,6 @@ from subprocess import check_call, CalledProcessError from vyos.config import Config from vyos.configdict import list_diff from vyos import ConfigError -from vyos import vrf default_config_data = { 'vrf_add': [], diff --git a/src/op_mode/show_vrf.py b/src/op_mode/show_vrf.py index 210b3c9a4..ec894d572 100755 --- a/src/op_mode/show_vrf.py +++ b/src/op_mode/show_vrf.py @@ -1,7 +1,28 @@ #!/usr/bin/env python3 +# +# Copyright (C) 2020 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. import argparse -import vyos.vrf + +from subprocess import check_output +from json import loads + +def list_vrfs(): + command = 'ip -j -br link show type vrf' + answer = loads(check_output(command.split()).decode()) + return [_ for _ in answer if _] parser = argparse.ArgumentParser() group = parser.add_mutually_exclusive_group() @@ -15,7 +36,7 @@ args = parser.parse_args() if args.extensive: print('{:16} {:7} {:17} {}'.format('interface', 'state', 'mac', 'flags')) print('{:16} {:7} {:17} {}'.format('---------', '-----', '---', '-----')) - for vrf in vyos.vrf.list_vrfs(): + for vrf in list_vrfs(): name = vrf['ifname'] if args.interface and name != args.interface: continue @@ -24,4 +45,4 @@ if args.extensive: info = ','.join([_.lower() for _ in vrf['flags']]) print(f'{name:16} {state:7} {mac:17} {info}') else: - print(" ".join([vrf['ifname'] for vrf in vyos.vrf.list_vrfs()])) + print(" ".join([vrf['ifname'] for vrf in list_vrfs()])) |