set App virtulization mode via PodConfig

Signed-off-by: Shahriyar Jalayeri <[email protected]>

Author: shjala

cmd/edenPod.go

@@ -1,11 +1,14 @@
 package cmd
 
 import (
+	"strings"
+
 	"github.com/dustin/go-humanize"
 	"github.com/lf-edge/eden/pkg/controller/types"
 	"github.com/lf-edge/eden/pkg/defaults"
 	"github.com/lf-edge/eden/pkg/openevec"
 	edgeRegistry "github.com/lf-edge/edge-containers/pkg/registry"
+	"github.com/lf-edge/eve-api/go/config"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/thediveo/enumflag"
@@ -76,6 +79,13 @@ func newPodPublishCmd() *cobra.Command {
 
 func newPodDeployCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 	var pc openevec.PodConfig
+	var virtMode string
+	switch cfg.Eve.Arch {
+	case "amd64":
+		virtMode = "HVM"
+	case "arm64":
+		virtMode = "PV"
+	}
 
 	var podDeployCmd = &cobra.Command{
 		Use:   "deploy (docker|http(s)|file|directory)://(<TAG|PATH>[:<VERSION>] | <URL for qcow2 image> | <path to qcow2 image>)",
@@ -88,6 +98,17 @@ func newPodDeployCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 				log.Fatal(err)
 			}
 		},
+		PreRun: func(cmd *cobra.Command, args []string) {
+			virtMode = strings.ToUpper(virtMode)
+			// XXX : fix this in EVE API
+			if virtMode == "FILLER" {
+				virtMode = "Filler"
+			}
+			if _, ok := config.VmMode_value[virtMode]; !ok {
+				log.Fatalf("Unknown virt-mode: %s", virtMode)
+			}
+			pc.VirtMode = config.VmMode(config.VmMode_value[virtMode])
+		},
 	}
 
 	podDeployCmd.Flags().StringVar(&pc.AppMemory, "memory", humanize.Bytes(defaults.DefaultAppMem*1024), "memory for app")
@@ -122,6 +143,7 @@ You can set access VLAN ID (VID) for a particular network in the format '<networ
 	podDeployCmd.Flags().StringVar(&pc.DatastoreOverride, "datastoreOverride", "", "Override datastore path for disks (when we use different URL for Eden and EVE or for local datastore)")
 	podDeployCmd.Flags().Uint32Var(&pc.StartDelay, "start-delay", 0, "The amount of time (in seconds) that EVE waits (after boot finish) before starting application")
 	podDeployCmd.Flags().BoolVar(&pc.PinCpus, "pin-cpus", false, "Pin the CPUs used by the pod")
+	podDeployCmd.Flags().StringVar(&virtMode, "virt-mode", virtMode, "Virtualization mode for the pod (PV, HVM, FILLER, FML, NOHYPER, LEGACY)")
 
 	return podDeployCmd
 }

pkg/openevec/config.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/lf-edge/eden/pkg/defaults"
 	"github.com/lf-edge/eden/pkg/utils"
+	"github.com/lf-edge/eve-api/go/config"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -210,6 +211,7 @@ type PodConfig struct {
 	OpenStackMetadata bool
 	DatastoreOverride string
 	ACLOnlyHost       bool
+	VirtMode          config.VmMode
 }
 
 func Merge(dst, src reflect.Value, flags *pflag.FlagSet) {

pkg/openevec/pod.go

@@ -77,6 +77,7 @@ func (openEVEC *OpenEVEC) PodDeploy(appLink string, pc PodConfig, cfg *EdenSetup
 	opts = append(opts, expect.WithVnc(pc.VncDisplay))
 	opts = append(opts, expect.WithVncPassword(pc.VncPassword))
 	opts = append(opts, expect.WithAppAdapters(pc.AppAdapters))
+	opts = append(opts, expect.WithVirtualizationMode(pc.VirtMode))
 	if len(pc.Networks) > 0 {
 		for i, el := range pc.Networks {
 			if i == 0 {