diff options
author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-10-20 11:51:32 +0000 |
---|---|---|
committer | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-10-23 17:47:13 +0000 |
commit | 28b312d687291cef1e3935b7f39dc28b9e7976ef (patch) | |
tree | c703ff9d5de4c59b3b8e410b9217fe770abbfb05 | |
parent | 6acf41ea7d11d549cb4453f9aa6f66aaa121aa5e (diff) | |
download | vyos-1x-28b312d687291cef1e3935b7f39dc28b9e7976ef.tar.gz vyos-1x-28b312d687291cef1e3935b7f39dc28b9e7976ef.zip |
T4762: Add check for show nat if nat config does not exist
Add check for 'show nat xxx' if nat configuration does not exist
-rwxr-xr-x | src/op_mode/nat.py | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/op_mode/nat.py b/src/op_mode/nat.py index 845dbbb2c..f899eb3dc 100755 --- a/src/op_mode/nat.py +++ b/src/op_mode/nat.py @@ -22,12 +22,18 @@ import xmltodict from sys import exit from tabulate import tabulate +from vyos.configquery import ConfigTreeQuery + from vyos.util import cmd from vyos.util import dict_search import vyos.opmode +base = 'nat' +unconf_message = 'NAT is not configured' + + def _get_xml_translation(direction, family): """ Get conntrack XML output --src-nat|--dst-nat @@ -277,6 +283,20 @@ def _get_formatted_translation(dict_data, nat_direction, family): return output +def _verify(func): + """Decorator checks if NAT config exists""" + from functools import wraps + + @wraps(func) + def _wrapper(*args, **kwargs): + config = ConfigTreeQuery() + if not config.exists(base): + raise vyos.opmode.UnconfiguredSubsystem(unconf_message) + return func(*args, **kwargs) + return _wrapper + + +@_verify def show_rules(raw: bool, direction: str, family: str): nat_rules = _get_raw_data_rules(direction, family) if raw: @@ -285,6 +305,7 @@ def show_rules(raw: bool, direction: str, family: str): return _get_formatted_output_rules(nat_rules, direction, family) +@_verify def show_statistics(raw: bool, direction: str, family: str): nat_statistics = _get_raw_data_rules(direction, family) if raw: @@ -293,6 +314,7 @@ def show_statistics(raw: bool, direction: str, family: str): return _get_formatted_output_statistics(nat_statistics, direction) +@_verify def show_translations(raw: bool, direction: str, family: str): family = 'ipv6' if family == 'inet6' else 'ipv4' nat_translation = _get_raw_translation(direction, family) |