diff options
author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2024-08-22 13:12:29 +0000 |
---|---|---|
committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-08-22 19:51:14 +0000 |
commit | 31aa181d893561ebd45199e07d5e89450cc853fe (patch) | |
tree | dc03d961d508f0c095c1465ed44260aeb5f8ec49 /src/op_mode/ntp.py | |
parent | 6cfa688699a2460becc27175c14263985ebfdfd0 (diff) | |
download | vyos-1x-mergify/bp/sagitta/pr-4003.tar.gz vyos-1x-mergify/bp/sagitta/pr-4003.zip |
T6561: Add vrf aware for show ntpmergify/bp/sagitta/pr-4003
(cherry picked from commit 5f780ebb7f1799eb9a93218bb83561db509c7e56)
Diffstat (limited to 'src/op_mode/ntp.py')
-rw-r--r-- | src/op_mode/ntp.py | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/src/op_mode/ntp.py b/src/op_mode/ntp.py index e14cc46d0..6ec0fedcb 100644 --- a/src/op_mode/ntp.py +++ b/src/op_mode/ntp.py @@ -110,49 +110,62 @@ def _is_configured(): if not config.exists("service ntp"): raise vyos.opmode.UnconfiguredSubsystem("NTP service is not enabled.") +def _extend_command_vrf(): + config = ConfigTreeQuery() + if config.exists('service ntp vrf'): + vrf = config.value('service ntp vrf') + return f'ip vrf exec {vrf} ' + return '' + + def show_activity(raw: bool): _is_configured() command = f'chronyc' if raw: - command += f" -c activity" - return _get_raw_data(command) + command += f" -c activity" + return _get_raw_data(command) else: - command += f" activity" - return cmd(command) + command = _extend_command_vrf() + command + command += f" activity" + return cmd(command) def show_sources(raw: bool): _is_configured() command = f'chronyc' if raw: - command += f" -c sources" - return _get_raw_data(command) + command += f" -c sources" + return _get_raw_data(command) else: - command += f" sources -v" - return cmd(command) + command = _extend_command_vrf() + command + command += f" sources -v" + return cmd(command) def show_tracking(raw: bool): _is_configured() command = f'chronyc' if raw: - command += f" -c tracking" - return _get_raw_data(command) + command += f" -c tracking" + return _get_raw_data(command) else: - command += f" tracking" - return cmd(command) + command = _extend_command_vrf() + command + command += f" tracking" + return cmd(command) def show_sourcestats(raw: bool): _is_configured() command = f'chronyc' if raw: - command += f" -c sourcestats" - return _get_raw_data(command) + command += f" -c sourcestats" + return _get_raw_data(command) else: - command += f" sourcestats -v" - return cmd(command) + command = _extend_command_vrf() + command + command += f" sourcestats -v" + return cmd(command) + if __name__ == '__main__': try: |