1 files changed, 8 insertions, 21 deletions
diff --git a/src/op_mode/vrf.py b/src/op_mode/vrf.py
index aeb50fe6e..51032a4b5 100755
--- a/src/op_mode/vrf.py
+++ b/src/op_mode/vrf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2022 VyOS maintainers and contributors
+# Copyright (C) 2022-2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -20,46 +20,31 @@ import sys
 import typing
 
 from tabulate import tabulate
-from vyos.util import cmd
+from vyos.utils.network import get_vrf_members
+from vyos.utils.process import cmd
 
 import vyos.opmode
 
-
 def _get_raw_data(name=None):
     """
     If vrf name is not set - get all VRFs
     If vrf name is set - get only this name data
     If vrf name set and not found - return []
     """
-    output = cmd('sudo ip --json --brief link show type vrf')
+    output = cmd('ip --json --brief link show type vrf')
     data = json.loads(output)
     if not data:
         return []
     if name:
         is_vrf_exists = True if [vrf for vrf in data if vrf.get('ifname') == name] else False
         if is_vrf_exists:
-            output = cmd(f'sudo ip --json --brief link show dev {name}')
+            output = cmd(f'ip --json --brief link show dev {name}')
             data = json.loads(output)
             return data
         return []
     return data
 
 
-def _get_vrf_members(vrf: str) -> list:
-    """
-    Get list of interface VRF members
-    :param vrf: str
-    :return: list
-    """
-    output = cmd(f'sudo ip --json --brief link show master {vrf}')
-    answer = json.loads(output)
-    interfaces = []
-    for data in answer:
-        if 'ifname' in data:
-            interfaces.append(data.get('ifname'))
-    return interfaces if len(interfaces) > 0 else ['n/a']
-
-
 def _get_formatted_output(raw_data):
     data_entries = []
     for vrf in raw_data:
@@ -67,7 +52,9 @@ def _get_formatted_output(raw_data):
         state = vrf.get('operstate').lower()
         hw_address = vrf.get('address')
         flags = ','.join(vrf.get('flags')).lower()
-        members = ','.join(_get_vrf_members(name))
+        tmp = get_vrf_members(name)
+        if tmp: members = ','.join(get_vrf_members(name))
+        else: members = 'n/a'
         data_entries.append([name, state, hw_address, flags, members])
 
     headers = ["Name", "State", "MAC address", "Flags", "Interfaces"]