feat(#121): add DeviceType::Vlan variant and is_vlan() helper

Author: cachebag

nmrs/src/api/models/device.rs

@@ -144,6 +144,8 @@ pub enum DeviceType {
     Loopback,
     /// Bluetooth
     Bluetooth,
+    /// VLAN (802.1Q) virtual device.
+    Vlan,
     /// Unknown or unsupported device type with raw code.
     ///
     /// Use the methods on `DeviceType` to query capabilities of unknown device types,
@@ -208,6 +210,7 @@ impl DeviceType {
             Self::WifiP2P => "wifi-p2p",
             Self::Loopback => "loopback",
             Self::Bluetooth => "bluetooth",
+            Self::Vlan => "vlan",
             Self::Other(code) => {
                 crate::types::device_type_registry::connection_type_for_code(*code)
                     .unwrap_or("generic")
@@ -224,6 +227,7 @@ impl DeviceType {
             Self::WifiP2P => 30,
             Self::Loopback => 32,
             Self::Bluetooth => 6,
+            Self::Vlan => 11,
             Self::Other(code) => *code,
         }
     }
@@ -308,6 +312,12 @@ impl Device {
     pub fn is_loopback(&self) -> bool {
         matches!(self.device_type, DeviceType::Loopback)
     }
+
+    /// Returns `true` if this is a VLAN (802.1Q) device.
+    #[must_use]
+    pub fn is_vlan(&self) -> bool {
+        matches!(self.device_type, DeviceType::Vlan)
+    }
 }
 
 impl Display for Device {
@@ -326,6 +336,7 @@ impl From<u32> for DeviceType {
             1 => DeviceType::Ethernet,
             2 => DeviceType::Wifi,
             5 => DeviceType::Bluetooth,
+            11 => DeviceType::Vlan,
             30 => DeviceType::WifiP2P,
             32 => DeviceType::Loopback,
             v => DeviceType::Other(v),
@@ -361,6 +372,7 @@ impl Display for DeviceType {
             DeviceType::WifiP2P => write!(f, "Wi-Fi P2P"),
             DeviceType::Loopback => write!(f, "Loopback"),
             DeviceType::Bluetooth => write!(f, "Bluetooth"),
+            DeviceType::Vlan => write!(f, "VLAN"),
             DeviceType::Other(v) => write!(
                 f,
                 "{}",

nmrs/src/api/models/tests.rs

@@ -18,6 +18,7 @@ use crate::api::models::DeviceType;
 fn device_type_from_u32_all_variants() {
     assert_eq!(DeviceType::from(1), DeviceType::Ethernet);
     assert_eq!(DeviceType::from(2), DeviceType::Wifi);
+    assert_eq!(DeviceType::from(11), DeviceType::Vlan);
     assert_eq!(DeviceType::from(30), DeviceType::WifiP2P);
     assert_eq!(DeviceType::from(32), DeviceType::Loopback);
     assert_eq!(DeviceType::from(999), DeviceType::Other(999));
@@ -26,7 +27,9 @@ fn device_type_from_u32_all_variants() {
 
 #[test]
 fn device_type_from_u32_registry_types() {
-    assert_eq!(DeviceType::from(11), DeviceType::Other(11));
+    // VLAN is now a first-class variant
+    assert_eq!(DeviceType::from(11), DeviceType::Vlan);
+    // These still fall through to Other since they're only in the registry
     assert_eq!(DeviceType::from(12), DeviceType::Other(12));
     assert_eq!(DeviceType::from(13), DeviceType::Other(13));
     assert_eq!(DeviceType::from(16), DeviceType::Other(16));
@@ -39,6 +42,7 @@ fn device_type_display() {
     assert_eq!(format!("{}", DeviceType::Wifi), "Wi-Fi");
     assert_eq!(format!("{}", DeviceType::WifiP2P), "Wi-Fi P2P");
     assert_eq!(format!("{}", DeviceType::Loopback), "Loopback");
+    assert_eq!(format!("{}", DeviceType::Vlan), "VLAN");
     assert_eq!(format!("{}", DeviceType::Other(42)), "Other(42)");
 }
 
@@ -100,6 +104,7 @@ fn device_type_connection_type_str() {
     assert_eq!(DeviceType::Wifi.connection_type_str(), "802-11-wireless");
     assert_eq!(DeviceType::WifiP2P.connection_type_str(), "wifi-p2p");
     assert_eq!(DeviceType::Loopback.connection_type_str(), "loopback");
+    assert_eq!(DeviceType::Vlan.connection_type_str(), "vlan");
 }
 
 #[test]
@@ -114,6 +119,7 @@ fn device_type_connection_type_str_registry() {
 fn device_type_to_code() {
     assert_eq!(DeviceType::Ethernet.to_code(), 1);
     assert_eq!(DeviceType::Wifi.to_code(), 2);
+    assert_eq!(DeviceType::Vlan.to_code(), 11);
     assert_eq!(DeviceType::WifiP2P.to_code(), 30);
     assert_eq!(DeviceType::Loopback.to_code(), 32);
     assert_eq!(DeviceType::Other(999).to_code(), 999);

nmrs/src/lib.rs

@@ -354,10 +354,10 @@ pub use api::models::{
     EapMethod, EapOptions, Network, NetworkInfo, OpenVpnAuthType, OpenVpnCompression,
     OpenVpnConfig, OpenVpnConnectionType, OpenVpnProxy, Phase2, RadioState, SavedConnection,
     SavedConnectionBrief, SecurityFeatures, SettingsPatch, SettingsSummary, StateReason,
-    TimeoutConfig, VpnConfig, VpnConfiguration, VpnConnection, VpnConnectionInfo, VpnCredentials,
-    VpnDetails, VpnKind, VpnRoute, VpnSecretFlags, VpnType, WifiDevice, WifiKeyMgmt, WifiSecurity,
-    WifiSecuritySummary, WireGuardConfig, WireGuardPeer, connection_state_reason_to_error,
-    reason_to_error,
+    TimeoutConfig, VlanConfig, VpnConfig, VpnConfiguration, VpnConnection, VpnConnectionInfo,
+    VpnCredentials, VpnDetails, VpnKind, VpnRoute, VpnSecretFlags, VpnType, WifiDevice,
+    WifiKeyMgmt, WifiSecurity, WifiSecuritySummary, WireGuardConfig, WireGuardPeer,
+    connection_state_reason_to_error, reason_to_error,
 };
 pub use api::network_manager::NetworkManager;
 pub use api::wifi_scope::WifiScope;