feat(monitor): support host-level hyperlight VMM and add E2E test

Signed-off-by: imshubham22apr-gif <imshubham.22apr@gmail.com>

Author: imshubham22apr-gif

pkg/unikontainers/hypervisors/hyperlight.go

@@ -15,14 +15,14 @@
 package hypervisors
 
 import (
-	"strings"
+	"fmt"
 
 	"github.com/urunc-dev/urunc/pkg/unikontainers/types"
 )
 
 const (
 	HyperlightVmm    VmmType = "hyperlight"
-	HyperlightBinary string  = ""
+	HyperlightBinary string  = "hyperlight-unikraft"
 )
 
 type Hyperlight struct {
@@ -50,17 +50,20 @@ func (h *Hyperlight) Path() string {
 	return h.binaryPath
 }
 
-// Ok checks if the hyperlight binary is available.
-// Since hyperlight is embedded, we just return nil.
+// Ok checks if the hyperlight-unikraft binary is available.
+// Binary availability is already verified by getVMMPath via exec.LookPath.
 func (h *Hyperlight) Ok() error {
 	return nil
 }
 
+// BuildExecCmd constructs the hyperlight-unikraft command line.
 func (h *Hyperlight) BuildExecCmd(args types.ExecArgs, _ types.Unikernel) ([]string, error) {
-	// Hyperlight is an embedded VMM, so we just run the unikernel directly.
-	cmdArgs := []string{args.UnikernelPath}
-	if args.Command != "" {
-		cmdArgs = append(cmdArgs, strings.Split(args.Command, " ")...)
+	cmdArgs := []string{h.binaryPath, args.UnikernelPath}
+	if args.InitrdPath != "" {
+		cmdArgs = append(cmdArgs, "--initrd", args.InitrdPath)
+	}
+	if args.MemSizeB > 0 {
+		cmdArgs = append(cmdArgs, "--memory", fmt.Sprintf("%d", args.MemSizeB))
 	}
 	return cmdArgs, nil
 }

pkg/unikontainers/hypervisors/hyperlight_test.go

@@ -22,25 +22,30 @@ import (
 )
 
 func TestHyperlightBuildExecCmd(t *testing.T) {
-	h := &Hyperlight{}
+	h := &Hyperlight{
+		binaryPath: "/usr/local/bin/hyperlight-unikraft",
+	}
 	args := types.ExecArgs{
 		UnikernelPath: "/path/to/unikernel",
-		Command:       "arg1 arg2",
+		InitrdPath:    "/path/to/initrd",
+		MemSizeB:      1024 * 1024 * 256,
 	}
 
 	cmd, err := h.BuildExecCmd(args, nil)
 	assert.NoError(t, err)
-	assert.Equal(t, []string{"/path/to/unikernel", "arg1", "arg2"}, cmd)
+	assert.Equal(t, []string{"/usr/local/bin/hyperlight-unikraft", "/path/to/unikernel", "--initrd", "/path/to/initrd", "--memory", "268435456"}, cmd)
 }
 
-func TestHyperlightBuildExecCmdNoArgs(t *testing.T) {
-	h := &Hyperlight{}
+func TestHyperlightBuildExecCmdNoInitrd(t *testing.T) {
+	h := &Hyperlight{
+		binaryPath: "/usr/local/bin/hyperlight-unikraft",
+	}
 	args := types.ExecArgs{
 		UnikernelPath: "/path/to/unikernel",
-		Command:       "",
+		MemSizeB:      1024 * 1024 * 256,
 	}
 
 	cmd, err := h.BuildExecCmd(args, nil)
 	assert.NoError(t, err)
-	assert.Equal(t, []string{"/path/to/unikernel"}, cmd)
+	assert.Equal(t, []string{"/usr/local/bin/hyperlight-unikraft", "/path/to/unikernel", "--memory", "268435456"}, cmd)
 }

pkg/unikontainers/hypervisors/vmm.go

@@ -104,9 +104,6 @@ func NewVMM(vmmType VmmType, monitors map[string]types.MonitorConfig) (vmm types
 }
 
 func getVMMPath(vmmType VmmType, binary string, monitors map[string]types.MonitorConfig) (string, error) {
-	if vmmType == HyperlightVmm {
-		return "", nil
-	}
 	if vmmPath := monitors[string(vmmType)].BinaryPath; vmmPath != "" {
 		return vmmPath, nil
 	}

tests/e2e/test_cases.go

@@ -597,6 +597,23 @@ func ctrTestCases() []containerTestArgs {
 			ExpectOut:      "\"Unikraft\" \"FC\" \"urunc\"",
 			TestFunc:       matchTest,
 		},
+		{
+			Image:          "ghcr.io/hyperlight-dev/hello-hyperlight-unikraft:latest",
+			Name:           "Hyperlight-unikraft-hello",
+			Devmapper:      false,
+			Seccomp:        true,
+			UID:            0,
+			GID:            0,
+			Groups:         []int64{},
+			Memory:         "",
+			Cli:            "",
+			Volumes:        []containerVolume{},
+			StaticNet:      false,
+			SideContainers: []string{},
+			Skippable:      false,
+			ExpectOut:      "Hello World!",
+			TestFunc:       matchTest,
+		},
 		{
 			Image:          "harbor.nbfc.io/nubificus/urunc/hello-env-qemu-unikraft-initrd:latest",
 			Name:           "Qemu-unikraft-environment-variables",