opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-03 01:37:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

hyperv: lookup machine on local filesystem first

Browse Source 
when looking for a machine, look it up locally first to prevent
accidental collision with non-podman machine vms.  in the cast of
`podman machine ls`, only list podman machines found by json files

Enabled remove with force.

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2023-03-22 15:29:24 -05:00
parent 67c98ec5de
commit 518eafaa34
15 changed files with 232 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/machine/hyperv/config.go
View File

@ -70,16 +70,16 @@ func (v Virtualization) IsValidVMName(name string) (bool, error) {
}
func (v Virtualization) List(opts machine.ListOptions) ([]*machine.ListResponse, error) {
var response []*machine.ListResponse
vmm := hypervctl.NewVirtualMachineManager()
vms, err := vmm.GetAll()
mms, err := v.loadFromLocalJson()
if err != nil {
return nil, err
}
for _, vm := range vms {
m := &HyperVMachine{Name: vm.ElementName}
mm, err := m.loadFromFile()
var response []*machine.ListResponse
vmm := hypervctl.NewVirtualMachineManager()
for _, mm := range mms {
vm, err := vmm.GetMachine(mm.Name)
if err != nil {
return nil, err
}
@ -159,8 +159,7 @@ func (v Virtualization) NewMachine(opts machine.InitOptions) (machine.VM, error)
config := hypervctl.HardwareConfig{
CPUs: uint16(opts.CPUS),
DiskPath: imagePath.GetPath(),
// TODO remove this and make real
DiskSize: 100,
DiskSize: opts.DiskSize,
Memory: int32(opts.Memory),
}
@ -251,7 +250,7 @@ func (v Virtualization) loadFromLocalJson() ([]*HyperVMachine, error) {
if e != nil {
return e
}
if filepath.Ext(d.Name()) == "json" {
if filepath.Ext(d.Name()) == ".json" {
jsonFiles = append(jsonFiles, input)
}
return nil