Remove TapInterface from RuntimeConfig

See lf-edge#827

Signed-off-by: Pavel Abramov <uncle.decart@gmail.com>

cmd/edenStart.go

@@ -13,14 +13,15 @@ import (
 
 func newStartCmd(configName, verbosity *string) *cobra.Command {
 	cfg := &openevec.EdenSetupArgs{}
-	var zedControlURL, vmName string
+	var zedControlURL, vmName, tapInterface string
+
 	var startCmd = &cobra.Command{
 		Use:               "start",
 		Short:             "start harness",
 		Long:              `Start harness.`,
 		PersistentPreRunE: preRunViperLoadFunction(cfg, configName, verbosity),
 		Run: func(cmd *cobra.Command, args []string) {
-			if err := openevec.StartEden(cfg, vmName, zedControlURL); err != nil {
+			if err := openevec.StartEden(cfg, vmName, tapInterface, zedControlURL); err != nil {
 				log.Fatalf("Start eden failed: %s", err)
 			}
 		},
@@ -62,8 +63,8 @@ func newStartCmd(configName, verbosity *string) *cobra.Command {
 	startCmd.Flags().IntVarP(&cfg.Eve.QemuConfig.MonitorPort, "qemu-monitor-port", "", defaults.DefaultQemuMonitorPort, "Port for access to QEMU monitor")
 	startCmd.Flags().StringVarP(&cfg.Eve.Pid, "eve-pid", "", filepath.Join(currentPath, defaults.DefaultDist, "eve.pid"), "file for save EVE pid")
 	startCmd.Flags().StringVarP(&cfg.Eve.Log, "eve-log", "", filepath.Join(currentPath, defaults.DefaultDist, "eve.log"), "file for save EVE log")
+	startCmd.Flags().StringVarP(&tapInterface, "with-tap", "", "", "use tap interface in QEMU as the third")
 	startCmd.Flags().StringVarP(&cfg.Eve.ImageFile, "image-file", "", cfg.Eve.ImageFile, "path to image drive, overrides default setting")
-	startCmd.Flags().StringVarP(&cfg.Runtime.TapInterface, "with-tap", "", "", "use tap interface in QEMU as the third")
 	startCmd.Flags().StringVarP(&vmName, "vmname", "", defaults.DefaultVBoxVMName, "vbox vmname required to create vm")
 	startCmd.Flags().StringVar(&zedControlURL, "zedcontrol", "", "Use provided zedcontrol domain instead of adam (as example: zedcloud.alpha.zededa.net)")
 

cmd/eve.go

@@ -53,14 +53,14 @@ func swtpmPidFile(cfg *openevec.EdenSetupArgs) string {
 }
 
 func newStartEveCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
-	var vmName string
+	var vmName, tapInterface string
 
 	var startEveCmd = &cobra.Command{
 		Use:   "start",
 		Short: "start eve",
 		Long:  `Start eve.`,
 		Run: func(cmd *cobra.Command, args []string) {
-			if err := openevec.StartEve(vmName, cfg); err != nil {
+			if err := openevec.StartEve(vmName, tapInterface, cfg); err != nil {
 				log.Fatal(err)
 			}
 		},
@@ -86,7 +86,7 @@ func newStartEveCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 	startEveCmd.Flags().IntVarP(&cfg.Eve.TelnetPort, "eve-telnet-port", "", defaults.DefaultTelnetPort, "Port for telnet access")
 	startEveCmd.Flags().IntVarP(&cfg.Eve.QemuCpus, "cpus", "", defaults.DefaultCpus, "vbox cpus")
 	startEveCmd.Flags().IntVarP(&cfg.Eve.QemuMemory, "memory", "", defaults.DefaultMemory, "vbox memory size (MB)")
-	startEveCmd.Flags().StringVarP(&cfg.Runtime.TapInterface, "with-tap", "", "", "use tap interface in QEMU as the third")
+	startEveCmd.Flags().StringVarP(&tapInterface, "with-tap", "", "", "use tap interface in QEMU as the third")
 
 	return startEveCmd
 }

pkg/openevec/config.go

@@ -147,7 +147,6 @@ type RegistryConfig struct {
 }
 
 type RuntimeConfig struct {
-	TapInterface string `cobraflag:"with-tap"`
 }
 
 type PacketConfig struct {

pkg/openevec/eve.go

@@ -23,7 +23,7 @@ import (
 
 const SdnStartTimeout = 3 * time.Minute
 
-func StartEve(vmName string, cfg *EdenSetupArgs) error {
+func StartEve(vmName, tapInterface string, cfg *EdenSetupArgs) error {
 	if cfg.Eve.Remote {
 		return nil
 	}
@@ -42,14 +42,14 @@ func StartEve(vmName string, cfg *EdenSetupArgs) error {
 			log.Infof("EVE is starting in Virtual Box")
 		}
 	default:
-		if err := StartEveQemu(cfg); err != nil {
+		if err := StartEveQemu(tapInterface, cfg); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
-func StartEveQemu(cfg *EdenSetupArgs) error {
+func StartEveQemu(tapInterface string, cfg *EdenSetupArgs) error {
 	// Load network model and prepare SDN config.
 	var err error
 	var netModel sdnapi.NetworkModel
@@ -170,7 +170,7 @@ func StartEveQemu(cfg *EdenSetupArgs) error {
 	// Start EVE VM.
 	if err = eden.StartEVEQemu(cfg.Eve.Arch, cfg.Eve.QemuOS, imageFile, imageFormat, isInstaller, cfg.Eve.Serial, cfg.Eve.TelnetPort,
 		cfg.Eve.QemuConfig.MonitorPort, cfg.Eve.QemuConfig.NetDevSocketPort, cfg.Eve.HostFwd, cfg.Eve.Accel, cfg.Eve.QemuFileToSave, cfg.Eve.Log,
-		cfg.Eve.Pid, netModel, isSdnEnabled(cfg.Sdn.Disable, cfg.Eve.Remote, cfg.Eve.DevModel), cfg.Runtime.TapInterface, usbImagePath, cfg.Eve.TPM, false); err != nil {
+		cfg.Eve.Pid, netModel, isSdnEnabled(cfg.Sdn.Disable, cfg.Eve.Remote, cfg.Eve.DevModel), tapInterface, usbImagePath, cfg.Eve.TPM, false); err != nil {
 		log.Errorf("cannot start eve: %s", err.Error())
 	} else {
 		log.Infof("EVE is starting")

pkg/openevec/start.go

@@ -69,7 +69,7 @@ func StartEServer(cfg EdenSetupArgs) error {
 	return nil
 }
 
-func StartEden(cfg *EdenSetupArgs, vmName, zedControlURL string) error {
+func StartEden(cfg *EdenSetupArgs, vmName, zedControlURL, tapInterface string) error {
 
 	// Note that custom installer only works with zedcloud controller.
 	useZedcloud := cfg.Eve.CustomInstaller.Path != "" || zedControlURL != ""
@@ -96,7 +96,7 @@ func StartEden(cfg *EdenSetupArgs, vmName, zedControlURL string) error {
 		return nil
 	}
 
-	if err := StartEve(vmName, cfg); err != nil {
+	if err := StartEve(vmName, tapInterface, cfg); err != nil {
 		return fmt.Errorf("cannot start eve %w", err)
 	}
 	log.Infof("EVE is starting")