fix: parse corrected spelling of gratuitous-arp in Netplan

Netplan fixed this spelling, which breaks us on newer version. We now parse both the new correct spelling and the old incorrect one.
manadart · Feb 14, 2025 · 539715c · 539715c
1 parent 088866a
commit 539715c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/network/netplan/netplan.go b/network/netplan/netplan.go
@@ -208,9 +208,9 @@ type BondParameters struct {
 	UpDelay            IntString `yaml:"up-delay,omitempty"`
 	DownDelay          IntString `yaml:"down-delay,omitempty"`
 	FailOverMACPolicy  IntString `yaml:"fail-over-mac-policy,omitempty"`
-	// Netplan misspelled this as 'gratuitious-arp', not sure if it works with that name.
-	// We may need custom handling of both spellings.
-	GratuitousARP         *int      `yaml:"gratuitious-arp,omitempty"` // nolint: misspell
+	// Netplan misspelled this and retained it along with the corrected spelling.
+	GratuitousARPLegacy   *int      `yaml:"gratuitious-arp,omitempty"` // nolint: misspell
+	GratuitousARP         *int      `yaml:"gratuitous-arp,omitempty"`
 	PacketsPerSlave       *int      `yaml:"packets-per-slave,omitempty"`
 	PrimaryReselectPolicy IntString `yaml:"primary-reselect-policy,omitempty"`
 	ResendIGMP            *int      `yaml:"resend-igmp,omitempty"`

diff --git a/network/netplan/netplan_test.go b/network/netplan/netplan_test.go
@@ -1411,6 +1411,7 @@ network:
       macaddress: "00:11:22:33:44:77"
       parameters:
         primary: eno3
+        gratuitous-arp: 1
 `[1:]
 	np := MustNetplanFromYaml(c, input)