test: add tests for new func supporting ignition and fix existing tests

cmd/vfkit/main_test.go

@@ -0,0 +1,44 @@
+package main
+
+import (
+	"bytes"
+	"io"
+	"net"
+	"net/http"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestStartIgnitionProvisionerServer(t *testing.T) {
+	socketPath := "virtiovsock"
+	defer os.Remove(socketPath)
+
+	ignitionData := []byte("ignition configuration")
+	ignitionReader := bytes.NewReader(ignitionData)
+
+	// Start the server using the socket so that it can returns the ignition data
+	go func() {
+		err := startIgnitionProvisionerServer(ignitionReader, socketPath)
+		require.NoError(t, err)
+	}()
+
+	// Make a request to the server
+	client := http.Client{
+		Transport: &http.Transport{
+			Dial: func(_, _ string) (net.Conn, error) {
+				return net.Dial("unix", socketPath)
+			},
+		},
+	}
+	resp, err := client.Get("http://unix://" + socketPath)
+	require.NoError(t, err)
+	defer resp.Body.Close()
+
+	// Verify the response from the server is actually the ignition data
+	body, err := io.ReadAll(resp.Body)
+	require.NoError(t, err)
+	assert.Equal(t, ignitionData, body)
+}

pkg/config/config_test.go

@@ -0,0 +1,23 @@
+package config
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAddIgnitionFile_MultipleOptions(t *testing.T) {
+	vm := &VirtualMachine{}
+	err := vm.AddIgnitionFileFromCmdLine("file1,file2")
+	assert.EqualError(t, err, "ignition only accept one option in command line argument")
+}
+
+func TestAddIgnitionFile_OneOption(t *testing.T) {
+	vm := &VirtualMachine{}
+	err := vm.AddIgnitionFileFromCmdLine("file1")
+	require.NoError(t, err)
+	assert.Len(t, vm.Devices, 1)
+	assert.Equal(t, uint32(ignitionVsockPort), vm.Devices[0].(*VirtioVsock).Port)
+	assert.Equal(t, "file1", vm.Ignition.ConfigPath)
+}

pkg/config/json_test.go

@@ -85,6 +85,16 @@ var jsonTests = map[string]jsonTest{
 		},
 		expectedJSON: `{"vcpus":3,"memoryBytes":4194304000,"bootloader":{"kind":"linuxBootloader","vmlinuzPath":"/vmlinuz","initrdPath":"/initrd","kernelCmdLine":"console=hvc0"},"timesync":{"vsockPort":1234}}`,
 	},
+	"TestIgnition": {
+		newVM: func(t *testing.T) *VirtualMachine {
+			vm := newLinuxVM(t)
+			ignition, err := IgnitionNew("config", "socket")
+			require.NoError(t, err)
+			vm.Ignition = ignition
+			return vm
+		},
+		expectedJSON: `{"vcpus":3,"memoryBytes":4194304000,"bootloader":{"kind":"linuxBootloader","vmlinuzPath":"/vmlinuz","initrdPath":"/initrd","kernelCmdLine":"console=hvc0"}, "ignition":{"kind":"ignition","configPath":"config","socketPath":"socket"}}`,
+	},
 	"TestVirtioRNG": {
 		newVM: func(t *testing.T) *VirtualMachine {
 			vm := newLinuxVM(t)
@@ -207,7 +217,7 @@ var jsonStabilityTests = map[string]jsonStabilityTest{
 
 			return vm
 		},
-		skipFields:   []string{"Bootloader", "Devices", "Timesync"},
+		skipFields:   []string{"Bootloader", "Devices", "Timesync", "Ignition"},
 		expectedJSON: `{"vcpus":3,"memoryBytes":3,"bootloader":{"kind":"linuxBootloader","vmlinuzPath":"/vmlinuz","kernelCmdLine":"console=hvc0","initrdPath":"/initrd"},"devices":[{"kind":"virtiorng"}],"timesync":{"vsockPort":1234}}`,
 	},
 	"RosettaShare": {