kola: iso.* fix typos

nikita-dubrovskii · nikita-dubrovskii · commit 4c171d394c58 · 2026-03-05T13:25:22.000+01:00
diff --git a/mantle/kola/tests/iso/live-as-disk.go b/mantle/kola/tests/iso/live-as-disk.go
@@ -91,8 +91,8 @@ func isoTestAsDisk(c cluster.TestCluster, opts IsoTestOpts) {
 		return builder.AddIso(isopath, "", true)
 	}
 
-	callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}
-	_, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callacks)
+	callbacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}
+	_, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callbacks)
 	if err != nil {
 		c.Fatalf("Unable to create test machine: %v", err)
 	}
diff --git a/mantle/kola/tests/iso/live-fips.go b/mantle/kola/tests/iso/live-fips.go
@@ -88,8 +88,8 @@ func testLiveFIPS(c cluster.TestCluster) {
 		return builder.AddIso(isopath, "", false)
 	}
 
-	callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}
-	_, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callacks)
+	callbacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}
+	_, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callbacks)
 	if err != nil {
 		c.Fatalf("Unable to create test machine: %v", err)
 	}
diff --git a/mantle/kola/tests/iso/live-iscsi.go b/mantle/kola/tests/iso/live-iscsi.go
@@ -179,8 +179,8 @@ func isoInstalliScsi(c cluster.TestCluster, opts IsoTestOpts) {
 		return nil
 	}
 
-	callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}
-	_, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callacks)
+	callbacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}
+	_, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callbacks)
 	if err != nil {
 		c.Fatalf("Unable to create test machine: %v", err)
 	}
diff --git a/mantle/kola/tests/iso/live-iso.go b/mantle/kola/tests/iso/live-iso.go
@@ -208,10 +208,10 @@ func isoLiveInstall(c cluster.TestCluster, opts IsoTestOpts) {
 		c.Fatalf("Unsupported cluster type")
 	}
 	if opts.enable4k {
-		qc.EnforeNative4k()
+		qc.EnforceNative4k()
 	}
 	if opts.enableMultipath {
-		qc.EnforeMultipath()
+		qc.EnforceMultipath()
 	}
 
 	tempdir, err := os.MkdirTemp("/var/tmp", "iso")
diff --git a/mantle/kola/tests/iso/live-login.go b/mantle/kola/tests/iso/live-login.go
@@ -57,8 +57,8 @@ version: 1.1.0`)
 
 	switch pc := c.Cluster.(type) {
 	case *qemu.Cluster:
-		callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}
-		_, err := pc.NewMachineWithQemuOptionsAndBuilderCallbacks(butane, platform.QemuMachineOptions{}, callacks)
+		callbacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}
+		_, err := pc.NewMachineWithQemuOptionsAndBuilderCallbacks(butane, platform.QemuMachineOptions{}, callbacks)
 		if err != nil {
 			c.Fatalf("Unable to create test machine: %v", err)
 		}
diff --git a/mantle/kola/tests/iso/live-pxe.go b/mantle/kola/tests/iso/live-pxe.go
@@ -150,7 +150,7 @@ func testPXE(c cluster.TestCluster, opts IsoTestOpts) {
 		c.Fatalf("Unsupported cluster type")
 	}
 	if opts.enable4k {
-		qc.EnforeNative4k()
+		qc.EnforceNative4k()
 	}
 
 	installerConfig := CoreosInstallerConfig{
@@ -287,8 +287,8 @@ func testPXE(c cluster.TestCluster, opts IsoTestOpts) {
 
 	extra := platform.QemuMachineOptions{}
 	extra.SkipStartMachine = true
-	callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, SetupNetwork: setupNet, OverrideDefaults: overrideFW}
-	qm, err := qc.NewMachineWithQemuOptionsAndBuilderCallbacks(liveConfig, extra, callacks)
+	callbacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, SetupNetwork: setupNet, OverrideDefaults: overrideFW}
+	qm, err := qc.NewMachineWithQemuOptionsAndBuilderCallbacks(liveConfig, extra, callbacks)
 	if err != nil {
 		c.Fatal(errors.Wrap(err, "unable to create test machine"))
 	}
diff --git a/mantle/platform/machine/qemu/cluster.go b/mantle/platform/machine/qemu/cluster.go
@@ -51,11 +51,11 @@ type BuilderCallbacks struct {
 	OverrideDefaults func(builder *platform.QemuBuilder) error
 }
 
-func (qc *Cluster) EnforeNative4k() {
+func (qc *Cluster) EnforceNative4k() {
 	qc.flight.opts.Native4k = true
 }
 
-func (qc *Cluster) EnforeMultipath() {
+func (qc *Cluster) EnforceMultipath() {
 	qc.flight.opts.MultiPathDisk = true
 }
 

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ func isoTestAsDisk(c cluster.TestCluster, opts IsoTestOpts) {`
`91`	`91`	`return builder.AddIso(isopath, "", true)`
`92`	`92`	`}`
`93`	`93`
`94`		`- callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}`
`95`		`- _, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callacks)`
	`94`	`+ callbacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}`
	`95`	`+ _, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callbacks)`
`96`	`96`	`if err != nil {`
`97`	`97`	`c.Fatalf("Unable to create test machine: %v", err)`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ func testLiveFIPS(c cluster.TestCluster) {`
`88`	`88`	`return builder.AddIso(isopath, "", false)`
`89`	`89`	`}`
`90`	`90`
`91`		`- callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}`
`92`		`- _, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callacks)`
	`91`	`+ callbacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}`
	`92`	`+ _, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callbacks)`
`93`	`93`	`if err != nil {`
`94`	`94`	`c.Fatalf("Unable to create test machine: %v", err)`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,8 @@ func isoInstalliScsi(c cluster.TestCluster, opts IsoTestOpts) {`
`179`	`179`	`return nil`
`180`	`180`	`}`
`181`	`181`
`182`		`- callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}`
`183`		`- _, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callacks)`
	`182`	`+ callbacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}`
	`183`	`+ _, err = qc.NewMachineWithQemuOptionsAndBuilderCallbacks(config, platform.QemuMachineOptions{}, callbacks)`
`184`	`184`	`if err != nil {`
`185`	`185`	`c.Fatalf("Unable to create test machine: %v", err)`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,10 +208,10 @@ func isoLiveInstall(c cluster.TestCluster, opts IsoTestOpts) {`
`208`	`208`	`c.Fatalf("Unsupported cluster type")`
`209`	`209`	`}`
`210`	`210`	`if opts.enable4k {`
`211`		`- qc.EnforeNative4k()`
	`211`	`+ qc.EnforceNative4k()`
`212`	`212`	`}`
`213`	`213`	`if opts.enableMultipath {`
`214`		`- qc.EnforeMultipath()`
	`214`	`+ qc.EnforceMultipath()`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`tempdir, err := os.MkdirTemp("/var/tmp", "iso")`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func testPXE(c cluster.TestCluster, opts IsoTestOpts) {`
`150`	`150`	`c.Fatalf("Unsupported cluster type")`
`151`	`151`	`}`
`152`	`152`	`if opts.enable4k {`
`153`		`- qc.EnforeNative4k()`
	`153`	`+ qc.EnforceNative4k()`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`installerConfig := CoreosInstallerConfig{`
`@@ -287,8 +287,8 @@ func testPXE(c cluster.TestCluster, opts IsoTestOpts) {`
`287`	`287`
`288`	`288`	`extra := platform.QemuMachineOptions{}`
`289`	`289`	`extra.SkipStartMachine = true`
`290`		`- callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, SetupNetwork: setupNet, OverrideDefaults: overrideFW}`
`291`		`- qm, err := qc.NewMachineWithQemuOptionsAndBuilderCallbacks(liveConfig, extra, callacks)`
	`290`	`+ callbacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, SetupNetwork: setupNet, OverrideDefaults: overrideFW}`
	`291`	`+ qm, err := qc.NewMachineWithQemuOptionsAndBuilderCallbacks(liveConfig, extra, callbacks)`
`292`	`292`	`if err != nil {`
`293`	`293`	`c.Fatal(errors.Wrap(err, "unable to create test machine"))`
`294`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,11 @@ type BuilderCallbacks struct {`
`51`	`51`	`OverrideDefaults func(builder *platform.QemuBuilder) error`
`52`	`52`	`}`
`53`	`53`
`54`		`-func (qc *Cluster) EnforeNative4k() {`
	`54`	`+func (qc *Cluster) EnforceNative4k() {`
`55`	`55`	`qc.flight.opts.Native4k = true`
`56`	`56`	`}`
`57`	`57`
`58`		`-func (qc *Cluster) EnforeMultipath() {`
	`58`	`+func (qc *Cluster) EnforceMultipath() {`
`59`	`59`	`qc.flight.opts.MultiPathDisk = true`
`60`	`60`	`}`
`61`	`61`