T7741: Fixes for 'show interfaces kernel'

 - Added dict_set_nested helper to set a value in a nested dictionary
 - Modified get_interface_vrf to accept string or dict as argument
 - Simplified logic using new helper functions

1 files changed, 21 insertions, 14 deletions

diff --git a/src/op_mode/interfaces.py b/src/op_mode/interfaces.py
index b6bbcbbc2..faeb846eb 100755
--- a/src/op_mode/interfaces.py
+++ b/src/op_mode/interfaces.py
@@ -29,8 +29,10 @@ import vyos.opmode
 from vyos.ifconfig import Section
 from vyos.ifconfig import Interface
 from vyos.ifconfig import VRRP
-from vyos.utils.process import cmd
+from vyos.utils.dict import dict_set_nested
+from vyos.utils.network import get_interface_vrf
 from vyos.utils.network import interface_exists
+from vyos.utils.process import cmd
 from vyos.utils.process import rc_cmd
 from vyos.utils.process import call
 from vyos.configquery import op_mode_config_dict
@@ -334,11 +336,18 @@ def _format_kernel_data(data, detail):
 
     # Sort interfaces by name
     for interface in sorted(data, key=lambda x: x.get('ifname', '')):
+        interface_name = interface.get('ifname', '')
+
+        # Skip VRF interfaces
         if interface.get('linkinfo', {}).get('info_kind') == 'vrf':
             continue
-        elif interface.get('ifname').startswith(('tunl', 'gre', 'erspan', 'pim6reg')):
+        # Skip spawned interfaces
+        elif interface_name.startswith(('tunl', 'gre', 'erspan', 'pim6reg')):
             continue
 
+        master = interface.get('master', 'default')
+        vrf = get_interface_vrf(interface)
+
         # Get the device model; ex. Intel Corporation Ethernet Controller I225-V
         dev_model = interface.get('parentdev', '')
         if 'parentdev' in interface:
@@ -349,7 +358,6 @@ def _format_kernel_data(data, detail):
         # Get the IP addresses on interface
         ip_list = []
         has_global = False
-        vrf = 'default'
 
         for ip in interface['addr_info']:
             if ip.get('scope') in ('global', 'host'):
@@ -358,25 +366,24 @@ def _format_kernel_data(data, detail):
                 prefixlen = ip.get('prefixlen', '')
                 ip_list.append(f"{local}/{prefixlen}")
 
-        if interface.get('ifname').startswith('pod-'):
-            podman_vrf[interface.get('ifname')] = {}
-            podman_vrf[interface.get('ifname')]['vrf'] = interface.get('master', 'default')
-
-        if interface.get('master', '').startswith('pod-'):
-            vrf = podman_vrf.get(interface.get('master', '')).get('vrf', 'default')
-        elif interface.get('linkinfo', {}).get('info_slave_kind', '') == 'vrf':
-            vrf = interface.get('master', 'default')
-
         # If no global IP address, add '-'; indicates no IP address on interface
         if not has_global:
             ip_list.append('-')
 
+        # Generate a mapping of podman interfaces to their VRF
+        if interface_name.startswith('pod-'):
+            dict_set_nested(f'{interface_name}.vrf', master, podman_vrf)
+
+        # If the veth interface's master is a podman interface, the VRF is the VRF of the podman interface
+        if master.startswith('pod-'):
+            vrf = podman_vrf.get(master).get('vrf', 'default')
+
         sl_status = ('A' if not 'UP' in interface['flags'] else 'u') + '/' + ('D' if interface['operstate'] == 'DOWN' else 'u')
 
         # Generate temporary dict to hold data
-        tmpInfo['ifname'] = interface.get('ifname', '')
+        tmpInfo['ifname'] = interface_name
         tmpInfo['ip'] = ip_list
-        tmpInfo['mac'] = interface.get('address', 'n/a') if is_interface_has_mac(interface.get('ifname', '')) else 'n/a'
+        tmpInfo['mac'] = interface.get('address', 'n/a') if is_interface_has_mac(interface_name) else 'n/a'
         tmpInfo['mtu'] = interface.get('mtu', '')
         tmpInfo['vrf'] = vrf
         tmpInfo['status'] = sl_status