Enable scan-ssid wireless network property for migration

jcronenberg · Jan 29, 2024 · 2b45f32 · 2b45f32
1 parent 468ecb3
commit 2b45f32
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/rust/migrate-wicked/src/wireless.rs b/rust/migrate-wicked/src/wireless.rs
@@ -25,8 +25,8 @@ pub struct Wireless {
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct Network {
     pub essid: String,
-    // #[serde(rename = "scan-ssid")]
-    // pub scan_ssid: bool,
+    #[serde(rename = "scan-ssid")]
+    pub scan_ssid: bool,
     pub mode: WickedWirelessMode,
     #[serde(rename = "wpa-psk")]
     pub wpa_psk: Option<WpaPsk>,
@@ -114,6 +114,7 @@ impl TryFrom<&Network> for model::ConnectionConfig {
         let settings = MIGRATION_SETTINGS.get().unwrap();
         let mut config = model::WirelessConfig {
             ssid: SSID(network.essid.as_bytes().to_vec()),
+            hidden: network.scan_ssid,
             ..Default::default()
         };
 
@@ -194,6 +195,7 @@ mod tests {
                 networks: Some(vec![Network {
                     channel: Some(0),
                     essid: "testssid".to_string(),
+                    scan_ssid: false,
                     mode: WickedWirelessMode::AP,
                     wpa_psk: None,
                     key_management: vec!["wpa-psk".to_string()],
@@ -235,6 +237,7 @@ mod tests {
             wireless: Some(Wireless {
                 networks: Some(vec![Network {
                     essid: "testssid".to_string(),
+                    scan_ssid: true,
                     mode: WickedWirelessMode::Infrastructure,
                     wpa_psk: Some(WpaPsk {
                         passphrase: "testpassword".to_string(),
@@ -259,6 +262,7 @@ mod tests {
             panic!()
         };
         assert_eq!(wireless.ssid, SSID("testssid".as_bytes().to_vec()));
+        assert!(wireless.hidden);
         assert_eq!(wireless.mode, model::WirelessMode::Infra);
         assert_eq!(wireless.password, Some("testpassword".to_string()));
         assert_eq!(wireless.security, model::SecurityProtocol::WPA2);

diff --git a/rust/migrate-wicked/tests/wireless/system-connections/wlan0-0.nmconnection b/rust/migrate-wicked/tests/wireless/system-connections/wlan0-0.nmconnection
@@ -8,6 +8,7 @@ interface-name=wlan0
 band=a
 bssid=12:34:56:78:9A:BC
 channel=100
+hidden=true
 mode=adhoc
 ssid=example_ssid
 

diff --git a/rust/migrate-wicked/tests/wireless/system-connections/wlan0-1.nmconnection b/rust/migrate-wicked/tests/wireless/system-connections/wlan0-1.nmconnection
@@ -5,6 +5,7 @@ type=wifi
 interface-name=wlan0
 
 [wifi]
+hidden=true
 mode=adhoc
 ssid=example_ssid2
 

diff --git a/rust/migrate-wicked/tests/wireless/wicked_xml/wireless.xml b/rust/migrate-wicked/tests/wireless/wicked_xml/wireless.xml
@@ -54,7 +54,7 @@
     <networks>
       <network>
         <essid>test</essid>
-        <scan-ssid>true</scan-ssid>
+        <scan-ssid>false</scan-ssid>
         <mode>infrastructure</mode>
         <access-point>12:34:56:78:9a:bc</access-point>
         <key-management>none</key-management>