opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Implement generic providers

Browse Source 
The intial refactor used specifically qemu for testing and infra bring
up.  But the whole point was to have things interfaced.  This PR results
in an interface experience like podman 4 using the same term `provider`
to generically represent 'a provider' like qemu/applehv/etc.

This PR is required to move forward with new providers.

Also renamed pkg/machine/p5 to pkg/machine/shim.

[NO NEW TESTS REQUIRED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2024-01-22 15:21:37 -06:00
parent 9bb191df51
commit e8501ca991
22 changed files with 133 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/podman/machine/info.go
View File

@ -16,7 +16,6 @@ import (
"github.com/containers/podman/v4/pkg/domain/entities" "github.com/containers/podman/v4/pkg/domain/entities"
"github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/machine"
machineDefine "github.com/containers/podman/v4/pkg/machine/define" machineDefine "github.com/containers/podman/v4/pkg/machine/define"
"github.com/containers/podman/v4/pkg/machine/qemu"
"github.com/containers/podman/v4/pkg/machine/vmconfigs" "github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
@ -101,10 +100,7 @@ func hostInfo() (*entities.MachineHostInfo, error) {
host.Arch = runtime.GOARCH host.Arch = runtime.GOARCH
host.OS = runtime.GOOS host.OS = runtime.GOOS
// TODO This is temporary dirs, err := machine.GetMachineDirs(provider.VMType())
s := new(qemu.QEMUStubber)
dirs, err := machine.GetMachineDirs(s.VMType())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -130,7 +126,7 @@ func hostInfo() (*entities.MachineHostInfo, error) {
host.DefaultMachine = vm.Name host.DefaultMachine = vm.Name
} }
// If machine is running or starting, it is automatically the current machine // If machine is running or starting, it is automatically the current machine
state, err := s.State(vm, false) state, err := provider.State(vm, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -153,7 +149,7 @@ func hostInfo() (*entities.MachineHostInfo, error) {
} }
} }
host.VMType = s.VMType().String() host.VMType = provider.VMType().String()
host.MachineImageDir = dirs.DataDir.GetPath() host.MachineImageDir = dirs.DataDir.GetPath()
host.MachineConfigDir = dirs.ConfigDir.GetPath() host.MachineConfigDir = dirs.ConfigDir.GetPath()

9
cmd/podman/machine/init.go
View File

@ -11,8 +11,7 @@ import (
"github.com/containers/podman/v4/libpod/events" "github.com/containers/podman/v4/libpod/events"
"github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/define" "github.com/containers/podman/v4/pkg/machine/define"
"github.com/containers/podman/v4/pkg/machine/p5" "github.com/containers/podman/v4/pkg/machine/shim"
"github.com/containers/podman/v4/pkg/machine/qemu"
"github.com/containers/podman/v4/pkg/machine/vmconfigs" "github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -144,10 +143,8 @@ func initMachine(cmd *cobra.Command, args []string) error {
return fmt.Errorf("cannot use %q for a machine name", initOpts.Name) return fmt.Errorf("cannot use %q for a machine name", initOpts.Name)
} }
s := new(qemu.QEMUStubber)
// Check if machine already exists // Check if machine already exists
_, exists, err := p5.VMExists(initOpts.Name, []vmconfigs.VMStubber{s}) _, exists, err := shim.VMExists(initOpts.Name, []vmconfigs.VMProvider{provider})
if err != nil { if err != nil {
return err return err
} }
@ -194,7 +191,7 @@ func initMachine(cmd *cobra.Command, args []string) error {
// } // }
// TODO this is for QEMU only (change to generic when adding second provider) // TODO this is for QEMU only (change to generic when adding second provider)
mc, err := p5.Init(initOpts, s) mc, err := shim.Init(initOpts, provider)
if err != nil { if err != nil {
return err return err
} }

6
cmd/podman/machine/inspect.go
View File

@ -10,7 +10,6 @@ import (
"github.com/containers/podman/v4/cmd/podman/registry" "github.com/containers/podman/v4/cmd/podman/registry"
"github.com/containers/podman/v4/cmd/podman/utils" "github.com/containers/podman/v4/cmd/podman/utils"
"github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/qemu"
"github.com/containers/podman/v4/pkg/machine/vmconfigs" "github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -48,8 +47,7 @@ func inspect(cmd *cobra.Command, args []string) error {
var ( var (
errs utils.OutputErrors errs utils.OutputErrors
) )
s := new(qemu.QEMUStubber) dirs, err := machine.GetMachineDirs(provider.VMType())
dirs, err := machine.GetMachineDirs(s.VMType())
if err != nil { if err != nil {
return err return err
} }
@ -65,7 +63,7 @@ func inspect(cmd *cobra.Command, args []string) error {
continue continue
} }
state, err := s.State(mc, false) state, err := provider.State(mc, false)
if err != nil { if err != nil {
return err return err
} }

9
cmd/podman/machine/list.go
View File

@ -9,10 +9,6 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/containers/podman/v4/pkg/machine/p5"
"github.com/containers/podman/v4/pkg/machine/qemu"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/completion"
"github.com/containers/common/pkg/report" "github.com/containers/common/pkg/report"
"github.com/containers/podman/v4/cmd/podman/common" "github.com/containers/podman/v4/cmd/podman/common"
@ -20,6 +16,8 @@ import (
"github.com/containers/podman/v4/cmd/podman/validate" "github.com/containers/podman/v4/cmd/podman/validate"
"github.com/containers/podman/v4/pkg/domain/entities" "github.com/containers/podman/v4/pkg/domain/entities"
"github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/shim"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/docker/go-units" "github.com/docker/go-units"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -67,8 +65,7 @@ func list(cmd *cobra.Command, args []string) error {
err error err error
) )
s := new(qemu.QEMUStubber) listResponse, err := shim.List([]vmconfigs.VMProvider{provider}, opts)
listResponse, err := p5.List([]vmconfigs.VMStubber{s}, opts)
if err != nil { if err != nil {
return err return err
} }

17
cmd/podman/machine/machine.go
View File

@ -41,6 +41,10 @@ var (
} }
) )
var (
provider vmconfigs.VMProvider
)
func init() { func init() {
registry.Commands = append(registry.Commands, registry.CliCommand{ registry.Commands = append(registry.Commands, registry.CliCommand{
Command: machineCmd, Command: machineCmd,
@ -48,14 +52,11 @@ func init() {
} }
func machinePreRunE(c *cobra.Command, args []string) error { func machinePreRunE(c *cobra.Command, args []string) error {
// TODO this should get enabled again once we define what a new provider is var err error
// this can be done when the second "provider" is enabled. provider, err = provider2.Get()
if err != nil {
// var err error return err
// provider, err = provider2.Get() }
// if err != nil {
// return err
// }
return rootlessOnly(c, args) return rootlessOnly(c, args)
} }

11
cmd/podman/machine/os/apply.go
View File

@ -8,7 +8,7 @@ import (
"github.com/containers/podman/v4/cmd/podman/registry" "github.com/containers/podman/v4/cmd/podman/registry"
"github.com/containers/podman/v4/cmd/podman/validate" "github.com/containers/podman/v4/cmd/podman/validate"
"github.com/containers/podman/v4/pkg/machine/os" "github.com/containers/podman/v4/pkg/machine/os"
"github.com/containers/podman/v4/pkg/machine/qemu" provider2 "github.com/containers/podman/v4/pkg/machine/provider"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -49,10 +49,11 @@ func apply(cmd *cobra.Command, args []string) error {
Restart: restart, Restart: restart,
} }
// TODO This is temporary provider, err := provider2.Get()
s := new(qemu.QEMUStubber) if err != nil {
return err
osManager, err := NewOSManager(managerOpts, s) }
osManager, err := NewOSManager(managerOpts, provider)
if err != nil { if err != nil {
return err return err
} }

7
cmd/podman/machine/os/manager.go
View File

@ -8,12 +8,11 @@ import (
"os" "os"
"strings" "strings"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
machineconfig "github.com/containers/common/pkg/machine" machineconfig "github.com/containers/common/pkg/machine"
pkgMachine "github.com/containers/podman/v4/pkg/machine" pkgMachine "github.com/containers/podman/v4/pkg/machine"
pkgOS "github.com/containers/podman/v4/pkg/machine/os" pkgOS "github.com/containers/podman/v4/pkg/machine/os"
"github.com/containers/podman/v4/pkg/machine/provider" "github.com/containers/podman/v4/pkg/machine/provider"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
) )
type ManagerOpts struct { type ManagerOpts struct {
@ -23,7 +22,7 @@ type ManagerOpts struct {
} }
// NewOSManager creates a new OSManager depending on the mode of the call // NewOSManager creates a new OSManager depending on the mode of the call
func NewOSManager(opts ManagerOpts, p vmconfigs.VMStubber) (pkgOS.Manager, error) { func NewOSManager(opts ManagerOpts, p vmconfigs.VMProvider) (pkgOS.Manager, error) {
// If a VM name is specified, then we know that we are not inside a // If a VM name is specified, then we know that we are not inside a
// Podman VM, but rather outside of it. // Podman VM, but rather outside of it.
if machineconfig.IsPodmanMachine() && opts.VMName == "" { if machineconfig.IsPodmanMachine() && opts.VMName == "" {
@ -44,7 +43,7 @@ func guestOSManager() (pkgOS.Manager, error) {
} }
// machineOSManager returns an os manager that manages outside the VM. // machineOSManager returns an os manager that manages outside the VM.
func machineOSManager(opts ManagerOpts, _ vmconfigs.VMStubber) (pkgOS.Manager, error) { func machineOSManager(opts ManagerOpts, _ vmconfigs.VMProvider) (pkgOS.Manager, error) {
vmName := opts.VMName vmName := opts.VMName
if opts.VMName == "" { if opts.VMName == "" {
vmName = pkgMachine.DefaultMachineName vmName = pkgMachine.DefaultMachineName

13
cmd/podman/machine/rm.go
View File

@ -12,8 +12,7 @@ import (
"github.com/containers/podman/v4/libpod/events" "github.com/containers/podman/v4/libpod/events"
"github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/define" "github.com/containers/podman/v4/pkg/machine/define"
"github.com/containers/podman/v4/pkg/machine/p5" "github.com/containers/podman/v4/pkg/machine/shim"
"github.com/containers/podman/v4/pkg/machine/qemu"
"github.com/containers/podman/v4/pkg/machine/vmconfigs" "github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -62,9 +61,7 @@ func rm(_ *cobra.Command, args []string) error {
vmName = args[0] vmName = args[0]
} }
// TODO this is for QEMU only (change to generic when adding second provider) dirs, err := machine.GetMachineDirs(provider.VMType())
q := new(qemu.QEMUStubber)
dirs, err := machine.GetMachineDirs(q.VMType())
if err != nil { if err != nil {
return err return err
} }
@ -74,7 +71,7 @@ func rm(_ *cobra.Command, args []string) error {
return err return err
} }
state, err := q.State(mc, false) state, err := provider.State(mc, false)
if err != nil { if err != nil {
return err return err
} }
@ -83,7 +80,7 @@ func rm(_ *cobra.Command, args []string) error {
if !destroyOptions.Force { if !destroyOptions.Force {
return &define.ErrVMRunningCannotDestroyed{Name: vmName} return &define.ErrVMRunningCannotDestroyed{Name: vmName}
} }
if err := p5.Stop(mc, q, dirs, true); err != nil { if err := shim.Stop(mc, provider, dirs, true); err != nil {
return err return err
} }
} }
@ -93,7 +90,7 @@ func rm(_ *cobra.Command, args []string) error {
return err return err
} }
providerFiles, providerRm, err := q.Remove(mc) providerFiles, providerRm, err := provider.Remove(mc)
if err != nil { if err != nil {
return err return err
} }

2
cmd/podman/machine/set.go
View File

@ -9,7 +9,6 @@ import (
"github.com/containers/common/pkg/strongunits" "github.com/containers/common/pkg/strongunits"
"github.com/containers/podman/v4/cmd/podman/registry" "github.com/containers/podman/v4/cmd/podman/registry"
"github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/qemu"
"github.com/containers/podman/v4/pkg/machine/vmconfigs" "github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -100,7 +99,6 @@ func setMachine(cmd *cobra.Command, args []string) error {
vmName = args[0] vmName = args[0]
} }
provider := new(qemu.QEMUStubber)
dirs, err := machine.GetMachineDirs(provider.VMType()) dirs, err := machine.GetMachineDirs(provider.VMType())
if err != nil { if err != nil {
return err return err

7
cmd/podman/machine/ssh.go
View File

@ -12,7 +12,6 @@ import (
"github.com/containers/podman/v4/cmd/podman/registry" "github.com/containers/podman/v4/cmd/podman/registry"
"github.com/containers/podman/v4/cmd/podman/utils" "github.com/containers/podman/v4/cmd/podman/utils"
"github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/qemu"
"github.com/containers/podman/v4/pkg/machine/vmconfigs" "github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -55,9 +54,7 @@ func ssh(cmd *cobra.Command, args []string) error {
validVM bool validVM bool
) )
// TODO Temporary dirs, err := machine.GetMachineDirs(provider.VMType())
q := new(qemu.QEMUStubber)
dirs, err := machine.GetMachineDirs(q.VMType())
if err != nil { if err != nil {
return err return err
} }
@ -109,7 +106,7 @@ func ssh(cmd *cobra.Command, args []string) error {
} }
} }
state, err := q.State(mc, false) state, err := provider.State(mc, false)
if err != nil { if err != nil {
return err return err
} }

24
cmd/podman/machine/start.go
View File

@ -5,18 +5,13 @@ package machine
import ( import (
"fmt" "fmt"
"github.com/sirupsen/logrus"
"github.com/containers/podman/v4/pkg/machine/p5"
"github.com/containers/podman/v4/pkg/machine/qemu"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/containers/podman/v4/pkg/machine/define"
"github.com/containers/podman/v4/cmd/podman/registry" "github.com/containers/podman/v4/cmd/podman/registry"
"github.com/containers/podman/v4/libpod/events" "github.com/containers/podman/v4/libpod/events"
"github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/define"
"github.com/containers/podman/v4/pkg/machine/shim"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -60,10 +55,7 @@ func start(_ *cobra.Command, args []string) error {
vmName = args[0] vmName = args[0]
} }
// TODO this is for QEMU only (change to generic when adding second provider) dirs, err := machine.GetMachineDirs(provider.VMType())
q := new(qemu.QEMUStubber)
dirs, err := machine.GetMachineDirs(q.VMType())
if err != nil { if err != nil {
return err return err
} }
@ -72,7 +64,7 @@ func start(_ *cobra.Command, args []string) error {
return err return err
} }
state, err := q.State(mc, false) state, err := provider.State(mc, false)
if err != nil { if err != nil {
return err return err
} }
@ -81,7 +73,7 @@ func start(_ *cobra.Command, args []string) error {
return define.ErrVMAlreadyRunning return define.ErrVMAlreadyRunning
} }
if err := p5.CheckExclusiveActiveVM(q, mc); err != nil { if err := shim.CheckExclusiveActiveVM(provider, mc); err != nil {
return err return err
} }
@ -102,7 +94,7 @@ func start(_ *cobra.Command, args []string) error {
logrus.Error(err) logrus.Error(err)
} }
}() }()
if err := p5.Start(mc, q, dirs, startOpts); err != nil { if err := shim.Start(mc, provider, dirs, startOpts); err != nil {
return err return err
} }
fmt.Printf("Machine %q started successfully\n", vmName) fmt.Printf("Machine %q started successfully\n", vmName)

10
cmd/podman/machine/stop.go
View File

@ -6,12 +6,10 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/containers/podman/v4/pkg/machine/p5"
"github.com/containers/podman/v4/cmd/podman/registry" "github.com/containers/podman/v4/cmd/podman/registry"
"github.com/containers/podman/v4/libpod/events" "github.com/containers/podman/v4/libpod/events"
"github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/qemu" "github.com/containers/podman/v4/pkg/machine/shim"
"github.com/containers/podman/v4/pkg/machine/vmconfigs" "github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -48,9 +46,7 @@ func stop(cmd *cobra.Command, args []string) error {
vmName = args[0] vmName = args[0]
} }
// TODO this is for QEMU only (change to generic when adding second provider) dirs, err := machine.GetMachineDirs(provider.VMType())
q := new(qemu.QEMUStubber)
dirs, err := machine.GetMachineDirs(q.VMType())
if err != nil { if err != nil {
return err return err
} }
@ -59,7 +55,7 @@ func stop(cmd *cobra.Command, args []string) error {
return err return err
} }
if err := p5.Stop(mc, q, dirs, false); err != nil { if err := shim.Stop(mc, provider, dirs, false); err != nil {
return err return err
} }

62
cmd/podman/system/reset_machine.go
View File

@ -3,7 +3,14 @@
package system package system
import ( import (
"github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/connection"
"github.com/containers/podman/v4/pkg/machine/define"
p "github.com/containers/podman/v4/pkg/machine/provider" p "github.com/containers/podman/v4/pkg/machine/provider"
"github.com/containers/podman/v4/pkg/machine/shim"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/containers/podman/v4/utils"
"github.com/sirupsen/logrus"
) )
func resetMachine() error { func resetMachine() error {
@ -11,5 +18,58 @@ func resetMachine() error {
if err != nil { if err != nil {
return err return err
} }
return provider.RemoveAndCleanMachines() dirs, err := machine.GetMachineDirs(provider.VMType())
if err != nil {
return err
}
mcs, err := vmconfigs.LoadMachinesInDir(dirs)
if err != nil {
// Note: the reason we might be cleaning is because a JSON file is messed
// up and is unreadable. This should not be fatal. Keep going ...
logrus.Errorf("unable to load machines: %q", err)
}
for _, mc := range mcs {
state, err := provider.State(mc, false)
if err != nil {
logrus.Errorf("unable to determine state of %s: %q", mc.Name, err)
}
if state == define.Running {
if err := shim.Stop(mc, provider, dirs, true); err != nil {
logrus.Errorf("unable to stop running machine %s: %q", mc.Name, err)
}
}
if err := connection.RemoveConnections(mc.Name, mc.Name+"-root"); err != nil {
logrus.Error(err)
}
// the thinking here is that the we dont need to remove machine specific files because
// we will nuke them all at the end of this. Just do what provider needs
_, providerRm, err := provider.Remove(mc)
if err != nil {
logrus.Errorf("unable to prepare provider machine removal: %q", err)
}
if err := providerRm(); err != nil {
logrus.Errorf("unable remove machine %s from provider: %q", mc.Name, err)
}
}
if err := utils.GuardedRemoveAll(dirs.DataDir.GetPath()); err != nil {
logrus.Errorf("unable to remove machine data dir %q: %q", dirs.DataDir.GetPath(), err)
}
if err := utils.GuardedRemoveAll(dirs.RuntimeDir.GetPath()); err != nil {
logrus.Errorf("unable to remove machine runtime dir %q: %q", dirs.RuntimeDir.GetPath(), err)
}
if err := utils.GuardedRemoveAll(dirs.ConfigDir.GetPath()); err != nil {
logrus.Errorf("unable to remove machine config dir %q: %q", dirs.ConfigDir.GetPath(), err)
}
// Just in case a provider needs something general done
return provider.RemoveAndCleanMachines(dirs)
} }

2
pkg/machine/e2e/machine_test.go
View File

@ -48,7 +48,7 @@ func TestMachine(t *testing.T) {
RunSpecs(t, "Podman Machine tests") RunSpecs(t, "Podman Machine tests")
} }
var testProvider vmconfigs.VMStubber var testProvider vmconfigs.VMProvider
var _ = BeforeSuite(func() { var _ = BeforeSuite(func() {
var err error var err error

8
pkg/machine/os/machine_os.go
View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/machine"
"github.com/containers/podman/v4/pkg/machine/p5" "github.com/containers/podman/v4/pkg/machine/shim"
"github.com/containers/podman/v4/pkg/machine/vmconfigs" "github.com/containers/podman/v4/pkg/machine/vmconfigs"
) )
@ -14,7 +14,7 @@ import (
type MachineOS struct { type MachineOS struct {
Args []string Args []string
VM *vmconfigs.MachineConfig VM *vmconfigs.MachineConfig
Provider vmconfigs.VMStubber Provider vmconfigs.VMProvider
VMName string VMName string
Restart bool Restart bool
} }
@ -33,10 +33,10 @@ func (m *MachineOS) Apply(image string, opts ApplyOptions) error {
} }
if m.Restart { if m.Restart {
if err := p5.Stop(m.VM, m.Provider, dirs, false); err != nil { if err := shim.Stop(m.VM, m.Provider, dirs, false); err != nil {
return err return err
} }
if err := p5.Start(m.VM, m.Provider, dirs, machine.StartOptions{NoInfo: true}); err != nil { if err := shim.Start(m.VM, m.Provider, dirs, machine.StartOptions{NoInfo: true}); err != nil {
return err return err
} }
fmt.Printf("Machine %q restarted successfully\n", m.VMName) fmt.Printf("Machine %q restarted successfully\n", m.VMName)

5
pkg/machine/provider/platform.go
View File

@ -6,15 +6,14 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/containers/common/pkg/config" "github.com/containers/common/pkg/config"
"github.com/containers/podman/v4/pkg/machine/define" "github.com/containers/podman/v4/pkg/machine/define"
"github.com/containers/podman/v4/pkg/machine/qemu" "github.com/containers/podman/v4/pkg/machine/qemu"
"github.com/containers/podman/v4/pkg/machine/vmconfigs"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
func Get() (vmconfigs.VMStubber, error) { func Get() (vmconfigs.VMProvider, error) {
cfg, err := config.Default() cfg, err := config.Default()
if err != nil { if err != nil {
return nil, err return nil, err

5
pkg/machine/qemu/stubber.go
View File

@ -252,8 +252,9 @@ func (q *QEMUStubber) StartNetworking(mc *vmconfigs.MachineConfig, cmd *gvproxy.
return nil return nil
} }
func (q *QEMUStubber) RemoveAndCleanMachines() error { func (q *QEMUStubber) RemoveAndCleanMachines(_ *define.MachineDirs) error {
return define.ErrNotImplemented // nothing to do but remove files
return nil
} }
// mountVolumesToVM iterates through the machine's volumes and mounts them to the // mountVolumesToVM iterates through the machine's volumes and mounts them to the

2
pkg/machine/p5/claim_darwin.go → pkg/machine/shim/claim_darwin.go
View File

@ -1,4 +1,4 @@
package p5 package shim
import ( import (
"fmt" "fmt"

2
pkg/machine/p5/claim_unsupported.go → pkg/machine/shim/claim_unsupported.go
View File

@ -1,6 +1,6 @@
//build: !darwin //build: !darwin
package p5 package shim
func dockerClaimHelperInstalled() bool { func dockerClaimHelperInstalled() bool {
return false return false

18
pkg/machine/p5/host.go → pkg/machine/shim/host.go
View File

@ -1,4 +1,4 @@
package p5 package shim
import ( import (
"context" "context"
@ -36,7 +36,7 @@ func SSH() {}
// List is done at the host level to allow for a *possible* future where // List is done at the host level to allow for a *possible* future where
// more than one provider is used // more than one provider is used
func List(vmstubbers []vmconfigs.VMStubber, opts machine.ListOptions) ([]*machine.ListResponse, error) { func List(vmstubbers []vmconfigs.VMProvider, opts machine.ListOptions) ([]*machine.ListResponse, error) {
var ( var (
lrs []*machine.ListResponse lrs []*machine.ListResponse
) )
@ -78,7 +78,7 @@ func List(vmstubbers []vmconfigs.VMStubber, opts machine.ListOptions) ([]*machin
return lrs, nil return lrs, nil
} }
func Init(opts machineDefine.InitOptions, mp vmconfigs.VMStubber) (*vmconfigs.MachineConfig, error) { func Init(opts machineDefine.InitOptions, mp vmconfigs.VMProvider) (*vmconfigs.MachineConfig, error) {
var ( var (
err error err error
) )
@ -219,7 +219,7 @@ func Init(opts machineDefine.InitOptions, mp vmconfigs.VMStubber) (*vmconfigs.Ma
} }
// VMExists looks across given providers for a machine's existence. returns the actual config and found bool // VMExists looks across given providers for a machine's existence. returns the actual config and found bool
func VMExists(name string, vmstubbers []vmconfigs.VMStubber) (*vmconfigs.MachineConfig, bool, error) { func VMExists(name string, vmstubbers []vmconfigs.VMProvider) (*vmconfigs.MachineConfig, bool, error) {
mcs, err := getMCsOverProviders(vmstubbers) mcs, err := getMCsOverProviders(vmstubbers)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
@ -229,9 +229,9 @@ func VMExists(name string, vmstubbers []vmconfigs.VMStubber) (*vmconfigs.Machine
} }
// CheckExclusiveActiveVM checks if any of the machines are already running // CheckExclusiveActiveVM checks if any of the machines are already running
func CheckExclusiveActiveVM(provider vmconfigs.VMStubber, mc *vmconfigs.MachineConfig) error { func CheckExclusiveActiveVM(provider vmconfigs.VMProvider, mc *vmconfigs.MachineConfig) error {
// Check if any other machines are running; if so, we error // Check if any other machines are running; if so, we error
localMachines, err := getMCsOverProviders([]vmconfigs.VMStubber{provider}) localMachines, err := getMCsOverProviders([]vmconfigs.VMProvider{provider})
if err != nil { if err != nil {
return err return err
} }
@ -249,7 +249,7 @@ func CheckExclusiveActiveVM(provider vmconfigs.VMStubber, mc *vmconfigs.MachineC
// getMCsOverProviders loads machineconfigs from a config dir derived from the "provider". it returns only what is known on // getMCsOverProviders loads machineconfigs from a config dir derived from the "provider". it returns only what is known on
// disk so things like status may be incomplete or inaccurate // disk so things like status may be incomplete or inaccurate
func getMCsOverProviders(vmstubbers []vmconfigs.VMStubber) (map[string]*vmconfigs.MachineConfig, error) { func getMCsOverProviders(vmstubbers []vmconfigs.VMProvider) (map[string]*vmconfigs.MachineConfig, error) {
mcs := make(map[string]*vmconfigs.MachineConfig) mcs := make(map[string]*vmconfigs.MachineConfig)
for _, stubber := range vmstubbers { for _, stubber := range vmstubbers {
dirs, err := machine.GetMachineDirs(stubber.VMType()) dirs, err := machine.GetMachineDirs(stubber.VMType())
@ -274,7 +274,7 @@ func getMCsOverProviders(vmstubbers []vmconfigs.VMStubber) (map[string]*vmconfig
// Stop stops the machine as well as supporting binaries/processes // Stop stops the machine as well as supporting binaries/processes
// TODO: I think this probably needs to go somewhere that remove can call it. // TODO: I think this probably needs to go somewhere that remove can call it.
func Stop(mc *vmconfigs.MachineConfig, mp vmconfigs.VMStubber, dirs *machineDefine.MachineDirs, hardStop bool) error { func Stop(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, dirs *machineDefine.MachineDirs, hardStop bool) error {
// state is checked here instead of earlier because stopping a stopped vm is not considered // state is checked here instead of earlier because stopping a stopped vm is not considered
// an error. so putting in one place instead of sprinkling all over. // an error. so putting in one place instead of sprinkling all over.
state, err := mp.State(mc, false) state, err := mp.State(mc, false)
@ -318,7 +318,7 @@ func Stop(mc *vmconfigs.MachineConfig, mp vmconfigs.VMStubber, dirs *machineDefi
return nil return nil
} }
func Start(mc *vmconfigs.MachineConfig, mp vmconfigs.VMStubber, dirs *machineDefine.MachineDirs, opts machine.StartOptions) error { func Start(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, dirs *machineDefine.MachineDirs, opts machine.StartOptions) error {
defaultBackoff := 500 * time.Millisecond defaultBackoff := 500 * time.Millisecond
maxBackoffs := 6 maxBackoffs := 6

4
pkg/machine/p5/networking.go → pkg/machine/shim/networking.go
View File

@ -1,4 +1,4 @@
package p5 package shim
import ( import (
"fmt" "fmt"
@ -22,7 +22,7 @@ const (
dockerConnectTimeout = 5 * time.Second dockerConnectTimeout = 5 * time.Second
) )
func startNetworking(mc *vmconfigs.MachineConfig, provider vmconfigs.VMStubber) (string, machine.APIForwardingState, error) { func startNetworking(mc *vmconfigs.MachineConfig, provider vmconfigs.VMProvider) (string, machine.APIForwardingState, error) {
var ( var (
forwardingState machine.APIForwardingState forwardingState machine.APIForwardingState
forwardSock string forwardSock string

4
pkg/machine/vmconfigs/config.go
View File

@ -105,13 +105,13 @@ func (f fcosMachineImage) path() string {
return "" return ""
} }
type VMStubber interface { //nolint:interfacebloat type VMProvider interface { //nolint:interfacebloat
CreateVM(opts define.CreateVMOpts, mc *MachineConfig) error CreateVM(opts define.CreateVMOpts, mc *MachineConfig) error
GetHyperVisorVMs() ([]string, error) GetHyperVisorVMs() ([]string, error)
MountType() VolumeMountType MountType() VolumeMountType
MountVolumesToVM(mc *MachineConfig, quiet bool) error MountVolumesToVM(mc *MachineConfig, quiet bool) error
Remove(mc *MachineConfig) ([]string, func() error, error) Remove(mc *MachineConfig) ([]string, func() error, error)
RemoveAndCleanMachines() error RemoveAndCleanMachines(dirs *define.MachineDirs) error
SetProviderAttrs(mc *MachineConfig, cpus, memory *uint64, newDiskSize *strongunits.GiB) error SetProviderAttrs(mc *MachineConfig, cpus, memory *uint64, newDiskSize *strongunits.GiB) error
StartNetworking(mc *MachineConfig, cmd *gvproxy.GvproxyCommand) error StartNetworking(mc *MachineConfig, cmd *gvproxy.GvproxyCommand) error
StartVM(mc *MachineConfig) (func() error, func() error, error) StartVM(mc *MachineConfig) (func() error, func() error, error)