feat(machined): support per-interface route metric for OpenNebula (ETH*_METRIC)

mcanevet · smira · commit e9331b271f8e · 2026-03-18T20:57:17.000+04:00
Parse ETHn_METRIC context variables and apply the value as the route priority for static default gateway routes and the DHCP4 operator's RouteMetric. When absent, the existing default of 1024 is preserved, matching the reference netcfg-networkd behavior. Signed-off-by: Mickaël Canévet <mickael.canevet@proton.ch> Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit 7adbbd2)
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/platform/opennebula/opennebula.go b/internal/app/machined/pkg/runtime/v1alpha1/platform/opennebula/opennebula.go
@@ -294,6 +294,17 @@ func (o *OpenNebula) ParseMetadata(st state.State, oneContextPlain []byte) (*run
 
 			ifaceNameLower := strings.ToLower(ifaceName)
 
+			routeMetric := uint32(network.DefaultRouteMetric)
+
+			if metricStr := oneContext[ifaceName+"_METRIC"]; metricStr != "" {
+				m, err := strconv.ParseUint(metricStr, 10, 32)
+				if err != nil {
+					return nil, fmt.Errorf("interface %s: failed to parse metric: %w", ifaceName, err)
+				}
+
+				routeMetric = uint32(m)
+			}
+
 			if oneContext[ifaceName+"_METHOD"] == "dhcp" {
 				// Create DHCP4 OperatorSpec entry
 				networkConfig.Operators = append(networkConfig.Operators,
@@ -302,7 +313,7 @@ func (o *OpenNebula) ParseMetadata(st state.State, oneContextPlain []byte) (*run
 						LinkName:  ifaceNameLower,
 						RequireUp: true,
 						DHCP4: network.DHCP4OperatorSpec{
-							RouteMetric:         1024,
+							RouteMetric:         routeMetric,
 							SkipHostnameRequest: true,
 						},
 						ConfigLayer: network.ConfigPlatform,
@@ -372,7 +383,7 @@ func (o *OpenNebula) ParseMetadata(st state.State, oneContextPlain []byte) (*run
 						Protocol:    nethelpers.ProtocolStatic,
 						Type:        nethelpers.TypeUnicast,
 						Family:      nethelpers.FamilyInet4,
-						Priority:    network.DefaultRouteMetric,
+						Priority:    routeMetric,
 					}
 
 					route.Normalize()
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/platform/opennebula/testdata/expected.yaml b/internal/app/machined/pkg/runtime/v1alpha1/platform/opennebula/testdata/expected.yaml
@@ -26,7 +26,7 @@ routes:
       gateway: 192.168.1.1
       outLinkName: eth0
       table: main
-      priority: 1024
+      priority: 100
       scope: global
       type: unicast
       flags: ""
@@ -71,7 +71,14 @@ resolvers:
         - global.example.com
         - example.com
 timeServers: []
-operators: []
+operators:
+    - operator: dhcp4
+      linkName: eth1
+      requireUp: true
+      dhcp4:
+        routeMetric: 200
+        skipHostnameRequest: true
+      layer: platform
 externalIPs: []
 metadata:
     platform: opennebula
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/platform/opennebula/testdata/expected_no_network_flag.yaml b/internal/app/machined/pkg/runtime/v1alpha1/platform/opennebula/testdata/expected_no_network_flag.yaml
@@ -26,7 +26,7 @@ routes:
       gateway: 192.168.1.1
       outLinkName: eth0
       table: main
-      priority: 1024
+      priority: 100
       scope: global
       type: unicast
       flags: ""
@@ -71,7 +71,14 @@ resolvers:
         - global.example.com
         - example.com
 timeServers: []
-operators: []
+operators:
+    - operator: dhcp4
+      linkName: eth1
+      requireUp: true
+      dhcp4:
+        routeMetric: 200
+        skipHostnameRequest: true
+      layer: platform
 externalIPs: []
 metadata:
     platform: opennebula
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/platform/opennebula/testdata/metadata.yaml b/internal/app/machined/pkg/runtime/v1alpha1/platform/opennebula/testdata/metadata.yaml
@@ -19,7 +19,7 @@ ETH0_IP6_ULA = ""
 ETH0_MAC = "02:00:c0:a8:01:5c"
 ETH0_MASK = "255.255.255.0"
 ETH0_METHOD = ""
-ETH0_METRIC = ""
+ETH0_METRIC = "100"
 ETH0_MTU = ""
 ETH0_NETWORK = "192.168.1.0"
 ETH0_ROUTES = "10.0.0.0 255.0.0.0 192.168.1.1, 172.16.0.0 255.255.0.0 192.168.1.1 500"
@@ -33,4 +33,7 @@ NETWORK = "YES"
 SSH_PUBLIC_KEY = ""
 TARGET = "hda"
 VMID = "14"
+ETH1_MAC = "02:00:c0:a8:01:5d"
+ETH1_METHOD = "dhcp"
+ETH1_METRIC = "200"
 NAME = "code-server"
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/platform/opennebula/testdata/metadata_no_network_flag.yaml b/internal/app/machined/pkg/runtime/v1alpha1/platform/opennebula/testdata/metadata_no_network_flag.yaml
@@ -21,7 +21,7 @@ ETH0_IP6_ULA = ""
 ETH0_MAC = "02:00:c0:a8:01:5c"
 ETH0_MASK = "255.255.255.0"
 ETH0_METHOD = ""
-ETH0_METRIC = ""
+ETH0_METRIC = "100"
 ETH0_MTU = ""
 ETH0_NETWORK = "192.168.1.0"
 ETH0_ROUTES = "10.0.0.0 255.0.0.0 192.168.1.1, 172.16.0.0 255.255.0.0 192.168.1.1 500"
@@ -35,4 +35,7 @@ NETWORK = "NO"
 SSH_PUBLIC_KEY = ""
 TARGET = "hda"
 VMID = "14"
+ETH1_MAC = "02:00:c0:a8:01:5d"
+ETH1_METHOD = "dhcp"
+ETH1_METRIC = "200"
 NAME = "code-server"
