Add bond hash policy

https://github.com/openstack/ironic/blob/master/ironic/tests/unit/drivers/modules/network/json_samples/network_data.json#L31 Adds the bond hash policy feature added to Ironic.
metal3-io · Apr 25, 2023 · 1b2a764 · 1b2a764
1 parent b656f5c
commit 1b2a764
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/api/v1beta1/metal3datatemplate_types.go b/api/v1beta1/metal3datatemplate_types.go
@@ -224,6 +224,10 @@ type NetworkDataLinkBond struct {
 	// balance-rr, active-backup, balance-xor, broadcast, balance-tlb, balance-alb, 802.3ad
 	BondMode string `json:"bondMode"`
 
+	// Selects the transmit hash policy used for port selection in balance-xor and 802.3ad modes
+	// +optional
+	BondHashPolicy string `json:"bond_xmit_hash_policy"`
+
 	// Id is the ID of the interface (used for naming)
 	Id string `json:"id"` //nolint:revive,stylecheck
 
@@ -238,6 +242,7 @@ type NetworkDataLinkBond struct {
 	MACAddress *NetworkLinkEthernetMac `json:"macAddress"`
 
 	// BondLinks is the list of links that are part of the bond.
+	// +optional
 	BondLinks []string `json:"bondLinks"`
 }
 

diff --git a/baremetal/metal3data_manager.go b/baremetal/metal3data_manager.go
@@ -727,12 +727,13 @@ func renderNetworkLinks(networkLinks infrav1.NetworkDataLink, bmh *bmov1alpha1.B
 			return nil, err
 		}
 		data = append(data, map[string]interface{}{
-			"type":                 "bond",
-			"id":                   link.Id,
-			"mtu":                  link.MTU,
-			"ethernet_mac_address": macAddress,
-			"bond_mode":            link.BondMode,
-			"bond_links":           link.BondLinks,
+			"type":                  "bond",
+			"id":                    link.Id,
+			"mtu":                   link.MTU,
+			"ethernet_mac_address":  macAddress,
+			"bond_mode":             link.BondMode,
+			"bond_xmit_hash_policy": link.BondHashPolicy,
+			"bond_links":            link.BondLinks,
 		})
 	}
 

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_metal3datatemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_metal3datatemplates.yaml
@@ -1146,6 +1146,10 @@ spec:
                           description: NetworkDataLinkBond represents a bond link
                             object.
                           properties:
+                            bond_xmit_hash_policy:
+                              description: Selects the transmit hash policy used for
+                                port selection in balance-xor and 802.3ad modes
+                              type: string
                             bondLinks:
                               description: BondLinks is the list of links that are
                                 part of the bond.
@@ -1189,7 +1193,6 @@ spec:
                               maximum: 9000
                               type: integer
                           required:
-                          - bondLinks
                           - bondMode
                           - id
                           - macAddress