From 841ab78776539861cd61aa04d81ca759ca2ac11d Mon Sep 17 00:00:00 2001 From: Nicolas Fort Date: Mon, 11 Dec 2023 10:56:36 +0000 Subject: T5807: fix op-mode command , which only display rules if nat was configured. In this commit, check is fixed and rules are printed as expected. (cherry picked from commit 3d3418d1585cbb6d3c2d1d81d310a3107e16c4aa) --- src/op_mode/nat.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/op_mode') diff --git a/src/op_mode/nat.py b/src/op_mode/nat.py index 71a40c0e1..2bc7e24fe 100755 --- a/src/op_mode/nat.py +++ b/src/op_mode/nat.py @@ -28,9 +28,6 @@ from vyos.configquery import ConfigTreeQuery from vyos.utils.process import cmd from vyos.utils.dict import dict_search -base = 'nat' -unconf_message = 'NAT is not configured' - ArgDirection = typing.Literal['source', 'destination'] ArgFamily = typing.Literal['inet', 'inet6'] @@ -293,8 +290,9 @@ def _verify(func): @wraps(func) def _wrapper(*args, **kwargs): config = ConfigTreeQuery() + base = 'nat66' if 'inet6' in sys.argv[1:] else 'nat' if not config.exists(base): - raise vyos.opmode.UnconfiguredSubsystem(unconf_message) + raise vyos.opmode.UnconfiguredSubsystem(f'{base.upper()} is not configured') return func(*args, **kwargs) return _wrapper -- cgit v1.2.3