feat: bond primary preselect as enum values closes #81

Author: mrcrgl

src/link/link_info/bond.rs

@@ -79,6 +79,9 @@ const BOND_XMIT_POLICY_ENCAP34: u8 = 4;
 const BOND_XMIT_POLICY_VLAN_SRCMAC: u8 = 5;
 const BOND_OPT_ARP_ALL_TARGETS_ANY: u32 = 0;
 const BOND_OPT_ARP_ALL_TARGETS_ALL: u32 = 1;
+const BOND_PRI_RESELECT_ALWAYS: u8 = 0;
+const BOND_PRI_RESELECT_BETTER: u8 = 1;
+const BOND_PRI_RESELECT_FAILURE: u8 = 2;
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 #[non_exhaustive]
@@ -280,6 +283,51 @@ impl std::fmt::Display for BondArpValidate {
     }
 }
 
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Default)]
+pub enum BondPrimaryReselect {
+    #[default]
+    Always,
+    Better,
+    Failure,
+    Other(u8),
+}
+
+impl From<BondPrimaryReselect> for u8 {
+    fn from(value: BondPrimaryReselect) -> Self {
+        match value {
+            BondPrimaryReselect::Always => BOND_PRI_RESELECT_ALWAYS,
+            BondPrimaryReselect::Better => BOND_PRI_RESELECT_BETTER,
+            BondPrimaryReselect::Failure => BOND_PRI_RESELECT_FAILURE,
+            BondPrimaryReselect::Other(d) => d,
+        }
+    }
+}
+
+impl From<u8> for BondPrimaryReselect {
+    fn from(value: u8) -> Self {
+        match value {
+            BOND_PRI_RESELECT_ALWAYS => BondPrimaryReselect::Always,
+            BOND_PRI_RESELECT_BETTER => BondPrimaryReselect::Better,
+            BOND_PRI_RESELECT_FAILURE => BondPrimaryReselect::Failure,
+            d => BondPrimaryReselect::Other(d),
+        }
+    }
+}
+
+impl std::fmt::Display for BondPrimaryReselect {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let kernel_name = match self {
+            BondPrimaryReselect::Always => "always",
+            BondPrimaryReselect::Better => "better",
+            BondPrimaryReselect::Failure => "failure",
+            BondPrimaryReselect::Other(d) => {
+                return write!(f, "unknown-variant ({d})")
+            }
+        };
+        f.write_str(kernel_name)
+    }
+}
+
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Default)]
 pub enum BondXmitHashPolicy {
     #[default]
@@ -458,7 +506,7 @@ pub enum InfoBond {
     ArpValidate(BondArpValidate),
     ArpAllTargets(BondArpAllTargets),
     Primary(u32),
-    PrimaryReselect(u8),
+    PrimaryReselect(BondPrimaryReselect),
     FailOverMac(BondFailOverMac),
     XmitHashPolicy(BondXmitHashPolicy),
     ResendIgmp(u32),
@@ -526,8 +574,10 @@ impl Nla for InfoBond {
         match self {
             Self::Mode(value) => buffer[0] = (*value).into(),
             Self::XmitHashPolicy(value) => buffer[0] = (*value).into(),
+            Self::PrimaryReselect(value) => buffer[0] = (*value).into(),
             Self::UseCarrier(value)
-            | Self::PrimaryReselect(value)
+            | Self::FailOverMac(value)
+            | Self::XmitHashPolicy(value)
             | Self::NumPeerNotif(value)
             | Self::AllPortsActive(value)
             | Self::AdLacpActive(value)
@@ -667,7 +717,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for InfoBond {
             ),
             IFLA_BOND_PRIMARY_RESELECT => Self::PrimaryReselect(
                 parse_u8(payload)
-                    .context("invalid IFLA_BOND_PRIMARY_RESELECT value")?,
+                    .context("invalid IFLA_BOND_PRIMARY_RESELECT value")?
+                    .into(),
             ),
             IFLA_BOND_FAIL_OVER_MAC => Self::FailOverMac(
                 parse_u8(payload)

src/link/link_info/mod.rs

@@ -30,7 +30,7 @@ mod xstats;
 
 pub use self::bond::{
     BondAdInfo, BondArpAllTargets, BondArpValidate, BondFailOverMac, BondMode,
-    BondXmitHashPolicy, InfoBond,
+    BondXmitHashPolicy, InfoBond, BondPrimaryReselect
 };
 pub use self::bond_port::{BondPortState, InfoBondPort, MiiStatus};
 pub use self::bridge::{

src/link/mod.rs

@@ -49,7 +49,7 @@ pub use self::link_info::{
     InfoVeth, InfoVlan, InfoVrf, InfoVrfPort, InfoVti, InfoVxlan, InfoXfrm,
     IpVlanFlags, IpVlanMode, IpVtapFlags, IpVtapMode, LinkInfo, LinkXstats,
     MacSecCipherId, MacSecOffload, MacSecValidate, MacVlanMode, MacVtapMode,
-    MiiStatus, VlanQosMapping,
+    MiiStatus, VlanQosMapping,BondPrimaryReselect
 };
 pub use self::link_layer_type::LinkLayerType;
 pub use self::link_state::State;

src/link/tests/bond.rs

@@ -7,7 +7,7 @@ use crate::link::{
     BondArpAllTargets, BondArpValidate, BondFailOverMac, BondMode,
     BondPortState, BondXmitHashPolicy, InfoBond, InfoBondPort, InfoData,
     InfoKind, InfoPortData, InfoPortKind, LinkAttribute, LinkHeader, LinkInfo,
-    LinkLayerType, LinkMessage, LinkMessageBuffer, Map, MiiStatus, State,
+    LinkLayerType, LinkMessage, LinkMessageBuffer, Map, MiiStatus, State, BondPrimaryReselect
 };
 use crate::{AddressFamily, RouteNetlinkMessage};
 
@@ -66,7 +66,7 @@ fn test_bond_link_info() {
                 InfoBond::ArpInterval(0),
                 InfoBond::ArpValidate(BondArpValidate::None),
                 InfoBond::ArpAllTargets(BondArpAllTargets::Any),
-                InfoBond::PrimaryReselect(0),
+                InfoBond::PrimaryReselect(BondPrimaryReselect::Always),
                 InfoBond::FailOverMac(BondFailOverMac::None),
                 InfoBond::XmitHashPolicy(BondXmitHashPolicy::Layer2),
                 InfoBond::ResendIgmp(1),