T7741: Fixes for 'show interfaces kernel'

 - Moved is_interface_has_mac outside of _get_summary_data
 - Updated MAC definition in _format_kernel_data to use is_interface_has_mac

1 files changed, 5 insertions, 5 deletions

diff --git a/src/op_mode/interfaces.py b/src/op_mode/interfaces.py
index de3dd7b8e..bdb863b6d 100755
--- a/src/op_mode/interfaces.py
+++ b/src/op_mode/interfaces.py
@@ -87,6 +87,10 @@ def filtered_interfaces(ifnames: typing.Union[str, list],
 
         yield interface
 
+def is_interface_has_mac(interface_name):
+    interface_no_mac = ('tun', 'wg')
+    return not any(interface_name.startswith(prefix) for prefix in interface_no_mac)
+
 def detailed_output(dataset, headers):
     for data in dataset:
         adjusted_rule = data + [""] * (len(headers) - len(data)) # account for different header length, like default-action
@@ -247,10 +251,6 @@ def _get_summary_data(ifname: typing.Optional[str],
         iftype = ''
     ret = []
 
-    def is_interface_has_mac(interface_name):
-        interface_no_mac = ('tun', 'wg')
-        return not any(interface_name.startswith(prefix) for prefix in interface_no_mac)
-
     for interface in filtered_interfaces(ifname, iftype, vif, vrrp):
         res_intf = {}
 
@@ -376,7 +376,7 @@ def _format_kernel_data(data, detail):
         # Generate temporary dict to hold data
         tmpInfo['ifname'] = interface.get('ifname', '')
         tmpInfo['ip'] = ip_list
-        tmpInfo['mac'] = "n/a" if interface.get('ifname', '').startswith(("tun", "wg", "gre")) else interface.get('address', 'n/a')
+        tmpInfo['mac'] = interface.get('address', 'n/a') if is_interface_has_mac(interface.get('ifname', '')) else 'n/a'
         tmpInfo['mtu'] = interface.get('mtu', '')
         tmpInfo['vrf'] = vrf
         tmpInfo['status'] = sl_status