ip-link: Make tests pass

Author: yonatan-linik

src/ip/link/link_details.rs

@@ -33,7 +33,7 @@ impl std::fmt::Display for CliLinkInfoCombined {
         if let Some(slave_kind) = &self.info_slave_kind {
             write!(f, "\n    {}_slave ", slave_kind)?;
             if let Some(slave_data) = &self.info_slave_data {
-                write!(f, "{slave_data} ")?;
+                write!(f, "{slave_data}")?;
             }
         }
         Ok(())
@@ -47,8 +47,6 @@ const IFLA_GRO_MAX_SIZE: u16 = 58;
 const IFLA_TSO_MAX_SIZE: u16 = 59;
 const IFLA_TSO_MAX_SEGS: u16 = 60;
 const IFLA_ALLMULTI: u16 = 61;
-const IFLA_GSO_IPV4_MAX_SIZE: u16 = 63;
-const IFLA_GRO_IPV4_MAX_SIZE: u16 = 64;
 
 fn get_addr_gen_mode(af_spec_unspec: &[AfSpecUnspec]) -> String {
     af_spec_unspec
@@ -99,8 +97,6 @@ pub(crate) struct CliLinkInfoDetails {
     tso_max_size: u32,
     tso_max_segs: u32,
     gro_max_size: u32,
-    gso_ipv4_max_size: u32,
-    gro_ipv4_max_size: u32,
     #[serde(skip_serializing_if = "String::is_empty")]
     parentbus: String,
     #[serde(skip_serializing_if = "String::is_empty")]
@@ -121,8 +117,6 @@ impl CliLinkInfoDetails {
         let mut tso_max_size = 0;
         let mut tso_max_segs = 0;
         let mut gro_max_size = 0;
-        let mut gso_ipv4_max_size = 0;
-        let mut gro_ipv4_max_size = 0;
         let mut inet6_addr_gen_mode = String::new();
         let mut parentbus = String::new();
         let mut parentdev = String::new();
@@ -166,16 +160,6 @@ impl CliLinkInfoDetails {
                         default_nla.emit_value(&mut val);
                         allmulti = u32::from_ne_bytes(val);
                     }
-                    IFLA_GSO_IPV4_MAX_SIZE => {
-                        let mut val = [0u8; 4];
-                        default_nla.emit_value(&mut val);
-                        gso_ipv4_max_size = u32::from_ne_bytes(val);
-                    }
-                    IFLA_GRO_IPV4_MAX_SIZE => {
-                        let mut val = [0u8; 4];
-                        default_nla.emit_value(&mut val);
-                        gro_ipv4_max_size = u32::from_ne_bytes(val);
-                    }
                     _ => { /* println!("Remains {:?}", default_nla); */ }
                 },
                 LinkAttribute::LinkInfo(info) => {
@@ -219,8 +203,6 @@ impl CliLinkInfoDetails {
             tso_max_size,
             tso_max_segs,
             gro_max_size,
-            gso_ipv4_max_size,
-            gro_ipv4_max_size,
             parentbus,
             parentdev,
         }
@@ -231,7 +213,7 @@ impl std::fmt::Display for CliLinkInfoDetails {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
-            " promiscuity {} allmulti {} minmtu {} maxmtu {} ",
+            " promiscuity {}  allmulti {} minmtu {} maxmtu {} ",
             self.promiscuity, self.allmulti, self.min_mtu, self.max_mtu,
         )?;
 
@@ -242,8 +224,7 @@ impl std::fmt::Display for CliLinkInfoDetails {
         write!(
             f,
             "addrgenmode {} numtxqueues {} numrxqueues {} gso_max_size {} \
-             gso_max_segs {} tso_max_size {} tso_max_segs {} gro_max_size {} \
-             gso_ipv4_max_size {} gro_ipv4_max_size {} ",
+             gso_max_segs {} tso_max_size {} tso_max_segs {} gro_max_size {} ",
             self.inet6_addr_gen_mode,
             self.num_tx_queues,
             self.num_rx_queues,
@@ -252,8 +233,6 @@ impl std::fmt::Display for CliLinkInfoDetails {
             self.tso_max_size,
             self.tso_max_segs,
             self.gro_max_size,
-            self.gso_ipv4_max_size,
-            self.gro_ipv4_max_size,
         )?;
 
         if !self.parentbus.is_empty() {

src/ip/link/link_info.rs

@@ -8,7 +8,8 @@ use serde::Serialize;
 use iproute_rs::mac_to_string;
 
 /// Format bridge ID to match iproute2's format:
-/// Priority is 4 hex digits, MAC address bytes use minimal formatting (no leading zeros for bytes < 0x10)
+/// Priority is 4 hex digits, MAC address bytes use minimal formatting (no
+/// leading zeros for bytes < 0x10)
 fn format_bridge_id(priority: u16, mac_bytes: [u8; 6]) -> String {
     format!(
         "{:04x}.{:x}:{:x}:{:x}:{:x}:{:x}:{:x}",
@@ -32,7 +33,6 @@ const IFLA_BR_FDB_N_LEARNED: u16 = 48;
 const IFLA_BR_FDB_MAX_LEARNED: u16 = 49;
 const IFLA_BR_NO_LL_LEARN: u16 = 51;
 const IFLA_BR_VLAN_MCAST_SNOOPING: u16 = 52;
-const IFLA_BR_MST_ENABLED: u16 = 53;
 
 #[derive(Serialize)]
 #[serde(untagged)]
@@ -72,15 +72,11 @@ pub(crate) enum CliLinkInfoData {
         bcast_flood: bool,
         mcast_to_unicast: bool,
         neigh_suppress: bool,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        neigh_vlan_suppress: Option<bool>,
         group_fwd_mask: String,
         group_fwd_mask_str: String,
         vlan_tunnel: bool,
         isolated: bool,
         locked: bool,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        mab: Option<bool>,
     },
     Bridge {
         forward_delay: u32,
@@ -118,7 +114,6 @@ pub(crate) enum CliLinkInfoData {
         mcast_snooping: u8,
         no_linklocal_learn: u8,
         mcast_vlan_snooping: u8,
-        mst_enabled: u8,
         mcast_router: u8,
         mcast_query_use_ifaddr: u8,
         mcast_querier: u8,
@@ -204,12 +199,10 @@ impl CliLinkInfoData {
                 let mut bcast_flood = false;
                 let mut mcast_to_unicast = false;
                 let mut neigh_suppress = false;
-                let mut neigh_vlan_suppress = None;
                 let mut group_fwd_mask: u16 = 0;
                 let mut vlan_tunnel = false;
                 let mut isolated = false;
                 let mut locked = false;
-                let mut mab = None;
 
                 for nla in info_bridge_port {
                     match nla {
@@ -292,14 +285,10 @@ impl CliLinkInfoData {
                             mcast_to_unicast = *v
                         }
                         InfoBridgePort::NeighSupress(v) => neigh_suppress = *v,
-                        InfoBridgePort::NeighVlanSupress(v) => {
-                            neigh_vlan_suppress = Some(*v)
-                        }
                         InfoBridgePort::GroupFwdMask(v) => group_fwd_mask = *v,
                         InfoBridgePort::VlanTunnel(v) => vlan_tunnel = *v,
                         InfoBridgePort::Isolated(v) => isolated = *v,
                         InfoBridgePort::Locked(v) => locked = *v,
-                        InfoBridgePort::Mab(v) => mab = Some(*v),
                         _ => (),
                     }
                 }
@@ -340,13 +329,11 @@ impl CliLinkInfoData {
                     bcast_flood,
                     mcast_to_unicast,
                     neigh_suppress,
-                    neigh_vlan_suppress,
                     group_fwd_mask: group_fwd_mask_string,
                     group_fwd_mask_str,
                     vlan_tunnel,
                     isolated,
                     locked,
-                    mab,
                 }
             }
             _ => todo!("Other port types not yet implemented"),
@@ -405,7 +392,6 @@ impl CliLinkInfoData {
                 let mut fdb_max_learned = None;
                 let mut no_linklocal_learn = 0;
                 let mut mcast_vlan_snooping = 0;
-                let mut mst_enabled = 0;
 
                 for nla in info_bridge {
                     match nla {
@@ -533,11 +519,6 @@ impl CliLinkInfoData {
                                     nla.emit_value(&mut val);
                                     mcast_vlan_snooping = val[0];
                                 }
-                                IFLA_BR_MST_ENABLED => {
-                                    let mut val = [0u8; 1];
-                                    nla.emit_value(&mut val);
-                                    mst_enabled = val[0];
-                                }
                                 _ => (),
                             }
                         }
@@ -576,7 +557,6 @@ impl CliLinkInfoData {
                     mcast_snooping,
                     no_linklocal_learn,
                     mcast_vlan_snooping,
-                    mst_enabled,
                     mcast_router,
                     mcast_query_use_ifaddr,
                     mcast_querier,
@@ -811,13 +791,11 @@ impl std::fmt::Display for CliLinkInfoData {
                 bcast_flood,
                 mcast_to_unicast,
                 neigh_suppress,
-                neigh_vlan_suppress,
                 group_fwd_mask,
                 group_fwd_mask_str,
                 vlan_tunnel,
                 isolated,
                 locked,
-                mab,
             } => {
                 let format_timer = |val: u64| -> String {
                     let seconds = val as f64 / 100.0;
@@ -866,21 +844,11 @@ impl std::fmt::Display for CliLinkInfoData {
                 write!(f, "bcast_flood {} ", on_off(*bcast_flood))?;
                 write!(f, "mcast_to_unicast {} ", on_off(*mcast_to_unicast))?;
                 write!(f, "neigh_suppress {} ", on_off(*neigh_suppress))?;
-                if let Some(v) = neigh_vlan_suppress {
-                    write!(f, "neigh_vlan_suppress {} ", on_off(*v))?;
-                } else {
-                    write!(f, "neigh_vlan_suppress off ")?;
-                }
                 write!(f, "group_fwd_mask {} ", group_fwd_mask)?;
                 write!(f, "group_fwd_mask_str {} ", group_fwd_mask_str)?;
                 write!(f, "vlan_tunnel {} ", on_off(*vlan_tunnel))?;
                 write!(f, "isolated {} ", on_off(*isolated))?;
                 write!(f, "locked {} ", on_off(*locked))?;
-                if let Some(v) = mab {
-                    write!(f, "mab {}", on_off(*v))?;
-                } else {
-                    write!(f, "mab off")?;
-                }
             }
             CliLinkInfoData::Veth => (),
             CliLinkInfoData::Bond {
@@ -957,7 +925,6 @@ impl std::fmt::Display for CliLinkInfoData {
                 mcast_snooping,
                 no_linklocal_learn,
                 mcast_vlan_snooping,
-                mst_enabled,
                 mcast_router,
                 mcast_query_use_ifaddr,
                 mcast_querier,
@@ -1038,7 +1005,6 @@ impl std::fmt::Display for CliLinkInfoData {
                 write!(f, "mcast_snooping {} ", mcast_snooping)?;
                 write!(f, "no_linklocal_learn {} ", no_linklocal_learn)?;
                 write!(f, "mcast_vlan_snooping {} ", mcast_vlan_snooping)?;
-                write!(f, "mst_enabled {} ", mst_enabled)?;
                 write!(f, "mcast_router {} ", mcast_router)?;
                 write!(
                     f,
@@ -1135,7 +1101,8 @@ impl CliLinkInfoKindNData {
                     // but skip this for now - we'll handle it separately
                 }
                 LinkInfo::PortData(_data) => {
-                    // Skip port data in this structure - it's handled separately
+                    // Skip port data in this structure - it's handled
+                    // separately
                 }
                 _ => (),
             }

src/ip/link/tests/link.rs

@@ -14,7 +14,8 @@ fn exec_in_netns(args: &[&str]) -> String {
 }
 
 /// Normalize timer values in output to avoid test flakiness
-/// Timer values can vary slightly between consecutive calls due to kernel timing
+/// Timer values can vary slightly between consecutive calls due to kernel
+/// timing
 fn normalize_timers(output: &str) -> String {
     let timer_names = [
         "hello_timer",
@@ -28,7 +29,8 @@ fn normalize_timers(output: &str) -> String {
 
     let mut result = output.to_string();
     for timer_name in timer_names {
-        // Find and replace timer values like "gc_timer    0.05" with "gc_timer    0.00"
+        // Find and replace timer values like "gc_timer    0.05" with "gc_timer
+        // 0.00"
         let mut new_result = String::new();
         let mut remaining = result.as_str();
 
@@ -75,7 +77,8 @@ fn normalize_timers_json(output: &str) -> String {
 
     let mut result = output.to_string();
     for timer_name in timer_names {
-        // Find and replace JSON timer values like "\"gc_timer\":5" or "\"gc_timer\":0.05" with "\"gc_timer\":0"
+        // Find and replace JSON timer values like "\"gc_timer\":5" or
+        // "\"gc_timer\":0.05" with "\"gc_timer\":0"
         let search_pattern = format!("\"{}\":", timer_name);
         let mut new_result = String::new();
         let mut remaining = result.as_str();