Merge pull request #99 from jcronenberg/method_selection

Fix ip method selection logic
jcronenberg · Oct 11, 2024 · 5c2b353 · 5c2b353
2 parents f0cf339 + d8e3a79
commit 5c2b353
Show file tree

Hide file tree

Showing 14 changed files with 130 additions and 22 deletions.
diff --git a/rust/migrate-wicked/src/interface.rs b/rust/migrate-wicked/src/interface.rs
@@ -23,6 +23,8 @@ pub struct Interface {
     pub ipv4: Ipv4,
     #[serde(rename = "ipv4-static")]
     pub ipv4_static: Option<Ipv4Static>,
+    #[serde(rename = "ipv4-dhcp")]
+    pub ipv4_dhcp: Option<Ipv4Dhcp>,
     pub ipv6: Ipv6,
     #[serde(rename = "ipv6-static")]
     pub ipv6_static: Option<Ipv6Static>,
@@ -61,18 +63,34 @@ pub struct Link {
     pub mtu: Option<u32>,
 }
 
-#[derive(Debug, PartialEq, Default, Serialize, Deserialize)]
-#[serde(default)]
+fn default_true() -> bool {
+    true
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct Ipv4 {
+    #[serde(default = "default_true")]
     pub enabled: bool,
 }
 
-#[derive(Debug, PartialEq, Default, Serialize, Deserialize)]
-#[serde(default)]
+impl Default for Ipv4 {
+    fn default() -> Self {
+        Self { enabled: true }
+    }
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct Ipv6 {
+    #[serde(default = "default_true")]
     pub enabled: bool,
 }
 
+impl Default for Ipv6 {
+    fn default() -> Self {
+        Self { enabled: true }
+    }
+}
+
 #[skip_serializing_none]
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct Ipv4Static {
@@ -82,6 +100,11 @@ pub struct Ipv4Static {
     pub routes: Option<Vec<Route>>,
 }
 
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct Ipv4Dhcp {
+    pub enabled: bool,
+}
+
 #[skip_serializing_none]
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct Ipv6Static {
@@ -242,19 +265,18 @@ impl Interface {
             },
             warnings: vec![],
         };
-        let method4 = if self.ipv4.enabled && self.ipv4_static.is_some() {
+        let method4 = if self.ipv4_static.is_some() {
             Ipv4Method::Manual
         } else if !self.ipv4.enabled {
             Ipv4Method::Disabled
-        } else {
+        } else if self.ipv4_dhcp.is_some() {
             Ipv4Method::Auto
+        } else {
+            Ipv4Method::Disabled
         };
-        let method6 = if self.ipv6.enabled && self.ipv6_static.is_some() {
+        let method6 = if self.ipv6_static.is_some() {
             Ipv6Method::Manual
-        } else if self.ipv6.enabled
-            && self.ipv6_dhcp.is_some()
-            && self.ipv6_dhcp.as_ref().unwrap().mode == "managed"
-        {
+        } else if self.ipv6_dhcp.is_some() && self.ipv6_dhcp.as_ref().unwrap().mode == "managed" {
             Ipv6Method::Dhcp
         } else if !self.ipv6.enabled {
             Ipv6Method::Disabled
@@ -451,8 +473,7 @@ mod tests {
     fn test_dhcp_interface_to_connection() {
         setup_default_migration_settings();
         let static_interface = Interface {
-            ipv4: Ipv4 { enabled: true },
-            ipv6: Ipv6 { enabled: true },
+            ipv4_dhcp: Some(Ipv4Dhcp { enabled: true }),
             ..Default::default()
         };
 

diff --git a/rust/migrate-wicked/tests/firewall_zone/system-connections/eth8.nmconnection b/rust/migrate-wicked/tests/firewall_zone/system-connections/eth8.nmconnection
@@ -14,6 +14,6 @@ method=disabled
 
 [ipv6]
 addr-gen-mode=default
-method=disabled
+method=auto
 
 [proxy]
diff --git a/rust/migrate-wicked/tests/ipv4_static/system-connections/eth9.nmconnection b/rust/migrate-wicked/tests/ipv4_static/system-connections/eth9.nmconnection
@@ -0,0 +1,20 @@
+[connection]
+id=eth9
+uuid=da886e32-22a9-4d83-8c04-421ec59d274b
+type=ethernet
+interface-name=eth9
+
+[ethernet]
+
+[match]
+
+[ipv4]
+address1=192.168.100.5/24
+address2=192.168.101.5/24
+method=manual
+
+[ipv6]
+addr-gen-mode=default
+method=auto
+
+[proxy]
diff --git a/rust/migrate-wicked/tests/ipv4_static/wicked_xml/ipv4_static.xml b/rust/migrate-wicked/tests/ipv4_static/wicked_xml/ipv4_static.xml
@@ -23,3 +23,26 @@
     <accept-redirects>false</accept-redirects>
   </ipv6>
 </interface>
+<interface origin="compat:suse:/etc/sysconfig/network/ifcfg-eth9">
+  <name>eth9</name>
+  <control>
+    <mode>boot</mode>
+  </control>
+  <firewall/>
+  <link/>
+  <ipv4>
+    <arp-verify>true</arp-verify>
+  </ipv4>
+  <ipv4:static>
+    <address>
+      <local>192.168.100.5/24</local>
+    </address>
+    <address>
+      <local>192.168.101.5/24</local>
+    </address>
+  </ipv4:static>
+  <ipv6>
+    <privacy>prefer-public</privacy>
+    <accept-redirects>false</accept-redirects>
+  </ipv6>
+</interface>
diff --git a/rust/migrate-wicked/tests/ipv6_auto/system-connections/eth7.nmconnection b/rust/migrate-wicked/tests/ipv6_auto/system-connections/eth7.nmconnection
@@ -9,7 +9,7 @@ interface-name=eth7
 [match]
 
 [ipv4]
-method=auto
+method=disabled
 
 [ipv6]
 addr-gen-mode=default

diff --git a/rust/migrate-wicked/tests/ipv6_dhcp/system-connections/eth5.nmconnection b/rust/migrate-wicked/tests/ipv6_dhcp/system-connections/eth5.nmconnection
@@ -9,7 +9,7 @@ interface-name=eth5
 [match]
 
 [ipv4]
-method=auto
+method=disabled
 
 [ipv6]
 addr-gen-mode=default

diff --git a/rust/migrate-wicked/tests/ipv6_dhcp/system-connections/eth6.nmconnection b/rust/migrate-wicked/tests/ipv6_dhcp/system-connections/eth6.nmconnection
@@ -9,7 +9,7 @@ interface-name=eth6
 [match]
 
 [ipv4]
-method=auto
+method=disabled
 
 [ipv6]
 addr-gen-mode=default

diff --git a/rust/migrate-wicked/tests/ipv6_static/system-connections/eth5.nmconnection b/rust/migrate-wicked/tests/ipv6_static/system-connections/eth5.nmconnection
@@ -9,7 +9,7 @@ interface-name=eth5
 [match]
 
 [ipv4]
-method=auto
+method=disabled
 
 [ipv6]
 addr-gen-mode=default

diff --git a/rust/migrate-wicked/tests/ipv6_static/system-connections/eth6.nmconnection b/rust/migrate-wicked/tests/ipv6_static/system-connections/eth6.nmconnection
@@ -0,0 +1,20 @@
+[connection]
+id=eth6
+uuid=f429f20c-8e87-4e84-8380-4fbcc1bcd371
+type=ethernet
+interface-name=eth6
+
+[ethernet]
+
+[match]
+
+[ipv4]
+method=disabled
+
+[ipv6]
+addr-gen-mode=default
+address1=2001:db8:0:1::5/64
+address2=2001:db8:0:2::5/64
+method=manual
+
+[proxy]
diff --git a/rust/migrate-wicked/tests/ipv6_static/wicked_xml/ipv6_static.xml b/rust/migrate-wicked/tests/ipv6_static/wicked_xml/ipv6_static.xml
@@ -23,3 +23,27 @@
     </address>
   </ipv6:static>
 </interface>
+<interface origin="compat:suse:/etc/sysconfig/network/ifcfg-eth6">
+  <name>eth6</name>
+  <control>
+    <mode>boot</mode>
+  </control>
+  <firewall/>
+  <link/>
+  <ipv4>
+    <enabled>true</enabled>
+    <arp-verify>true</arp-verify>
+  </ipv4>
+  <ipv6>
+    <privacy>prefer-public</privacy>
+    <accept-redirects>false</accept-redirects>
+  </ipv6>
+  <ipv6:static>
+    <address>
+      <local>2001:db8:0:1::5/64</local>
+    </address>
+    <address>
+      <local>2001:db8:0:2::5/64</local>
+    </address>
+  </ipv6:static>
+</interface>
diff --git a/rust/migrate-wicked/tests/tap/system-connections/tap9.nmconnection b/rust/migrate-wicked/tests/tap/system-connections/tap9.nmconnection
@@ -16,6 +16,6 @@ method=disabled
 
 [ipv6]
 addr-gen-mode=default
-method=disabled
+method=auto
 
 [proxy]
diff --git a/rust/migrate-wicked/tests/tun/system-connections/tun9.nmconnection b/rust/migrate-wicked/tests/tun/system-connections/tun9.nmconnection
@@ -15,6 +15,6 @@ method=disabled
 
 [ipv6]
 addr-gen-mode=default
-method=disabled
+method=auto
 
 [proxy]
diff --git a/rust/migrate-wicked/tests/wireless_eap/system-connections/wlan_eap1.nmconnection b/rust/migrate-wicked/tests/wireless_eap/system-connections/wlan_eap1.nmconnection
@@ -28,6 +28,6 @@ method=disabled
 
 [ipv6]
 addr-gen-mode=default
-method=disabled
+method=auto
 
 [proxy]
diff --git a/rust/migrate-wicked/tests/wireless_eap/system-connections/wlan_eap2.nmconnection b/rust/migrate-wicked/tests/wireless_eap/system-connections/wlan_eap2.nmconnection
@@ -29,6 +29,6 @@ method=disabled
 
 [ipv6]
 addr-gen-mode=default
-method=disabled
+method=auto
 
 [proxy]
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ interface-name=eth7 @@
     [match]
     [ipv4]
-    method=auto
+    method=disabled
     [ipv6]
     addr-gen-mode=default
@@ Expand Down @@