diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-07-16 14:44:26 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-07-16 14:44:28 +0200 |
| commit | a7d26396ef7dd1f977221865e2345084bf9bcbef (patch) | |
| tree | a03bcb4ca9c01a68546f26e82cbac7fee4e74d68 | |
| parent | 4056974666cd1368c500a0afb75b3b8b1417ad89 (diff) | |
| download | vyos-1x-a7d26396ef7dd1f977221865e2345084bf9bcbef.tar.gz vyos-1x-a7d26396ef7dd1f977221865e2345084bf9bcbef.zip | |
T5195: fix remaining references to decommissioned vyos.util
| -rw-r--r-- | python/vyos/frr.py | 1 | ||||
| -rwxr-xr-x | src/conf_mode/host_name.py | 3 | ||||
| -rwxr-xr-x | src/op_mode/vrrp.py | 11 |
3 files changed, 5 insertions, 10 deletions
diff --git a/python/vyos/frr.py b/python/vyos/frr.py index 58213d197..2e3c8a271 100644 --- a/python/vyos/frr.py +++ b/python/vyos/frr.py @@ -68,7 +68,6 @@ Apply the new configuration: import tempfile import re -from vyos import util from vyos.utils.permission import chown from vyos.utils.process import cmd from vyos.utils.process import popen diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py index 0fef3892b..36d1f6493 100755 --- a/src/conf_mode/host_name.py +++ b/src/conf_mode/host_name.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2021 VyOS maintainers and contributors +# Copyright (C) 2018-2023 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 @@ -18,7 +18,6 @@ import re import sys import copy -import vyos.util import vyos.hostsd_client from vyos.base import Warning diff --git a/src/op_mode/vrrp.py b/src/op_mode/vrrp.py index dab146d28..b3ab55cc3 100755 --- a/src/op_mode/vrrp.py +++ b/src/op_mode/vrrp.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2022 VyOS maintainers and contributors +# Copyright (C) 2018-2023 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 @@ -13,7 +13,6 @@ # # 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 sys import time @@ -21,12 +20,10 @@ import argparse import json import tabulate -import vyos.util - from vyos.configquery import ConfigTreeQuery from vyos.ifconfig.vrrp import VRRP -from vyos.ifconfig.vrrp import VRRPError, VRRPNoData - +from vyos.ifconfig.vrrp import VRRPError +from vyos.ifconfig.vrrp import VRRPNoData parser = argparse.ArgumentParser() group = parser.add_mutually_exclusive_group() @@ -44,7 +41,7 @@ def is_configured(): return True # Exit early if VRRP is dead or not configured -if is_configured() == False: +if is_configured() == False: print('VRRP not configured!') exit(0) if not VRRP.is_running(): |