T6561: Add vrf aware for show ntp (#4009)

(cherry picked from commit 5f780ebb7f1799eb9a93218bb83561db509c7e56)

Co-authored-by: Viacheslav Hletenko <v.gletenko@vyos.io>

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: