diff options
-rwxr-xr-x | src/conf_mode/system-syslog.py | 2 | ||||
-rwxr-xr-x | src/op_mode/ping.py | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/conf_mode/system-syslog.py b/src/conf_mode/system-syslog.py index e05e7e29c..19c87bcee 100755 --- a/src/conf_mode/system-syslog.py +++ b/src/conf_mode/system-syslog.py @@ -45,6 +45,8 @@ def get_config(config=None): syslog = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True) + syslog.update({ 'logrotate' : logrotate_conf }) + tmp = is_node_changed(conf, base + ['vrf']) if tmp: syslog.update({'restart_required': {}}) diff --git a/src/op_mode/ping.py b/src/op_mode/ping.py index 934cfdb52..f1d87a118 100755 --- a/src/op_mode/ping.py +++ b/src/op_mode/ping.py @@ -90,6 +90,16 @@ options = { 'type': '<seconds>', 'help': 'Number of seconds to wait between requests' }, + 'ipv4': { + 'ping': '{command} -4', + 'type': 'noarg', + 'help': 'Use IPv4 only' + }, + 'ipv6': { + 'ping': '{command} -6', + 'type': 'noarg', + 'help': 'Use IPv6 only' + }, 'mark': { 'ping': '{command} -m {value}', 'type': '<fwmark>', |