opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-26 02:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Show cpus and memory in machine list

Browse Source 
[NO TESTS NEEDED]

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
This commit is contained in:
Anders F Björklund
2021-09-22 12:29:24 +02:00
parent d88ed478cb
commit 911298252a
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,8 @@ type machineReporter struct {
Created string Created string
LastUp string LastUp string
VMType string VMType string
CPUs uint64
Memory string
} }
func init() { func init() {
@ -54,7 +56,7 @@ func init() {
flags := lsCmd.Flags() flags := lsCmd.Flags()
formatFlagName := "format" formatFlagName := "format"
flags.StringVar(&listFlag.format, formatFlagName, "{{.Name}}\t{{.VMType}}\t{{.Created}}\t{{.LastUp}}\n", "Format volume output using Go template") flags.StringVar(&listFlag.format, formatFlagName, "{{.Name}}\t{{.VMType}}\t{{.Created}}\t{{.LastUp}}\t{{.CPUs}}\t{{.Memory}}\n", "Format volume output using Go template")
_ = lsCmd.RegisterFlagCompletionFunc(formatFlagName, completion.AutocompleteNone) _ = lsCmd.RegisterFlagCompletionFunc(formatFlagName, completion.AutocompleteNone)
flags.BoolVar(&listFlag.noHeading, "noheading", false, "Do not print headers") flags.BoolVar(&listFlag.noHeading, "noheading", false, "Do not print headers")
} }
@ -87,6 +89,8 @@ func outputTemplate(cmd *cobra.Command, responses []*machineReporter) error {
headers := report.Headers(machineReporter{}, map[string]string{ headers := report.Headers(machineReporter{}, map[string]string{
"LastUp": "LAST UP", "LastUp": "LAST UP",
"VmType": "VM TYPE", "VmType": "VM TYPE",
"CPUs": "CPUS",
"Memory": "MEMORY",
}) })
row := report.NormalizeFormat(listFlag.format) row := report.NormalizeFormat(listFlag.format)
@ -136,6 +140,8 @@ func toHumanFormat(vms []*machine.ListResponse) ([]*machineReporter, error) {
} }
response.Created = units.HumanDuration(time.Since(vm.CreatedAt)) + " ago" response.Created = units.HumanDuration(time.Since(vm.CreatedAt)) + " ago"
response.VMType = vm.VMType response.VMType = vm.VMType
response.CPUs = vm.CPUs
response.Memory = units.HumanSize(float64(vm.Memory) * units.MiB)
humanResponses = append(humanResponses, response) humanResponses = append(humanResponses, response)
} }

2
pkg/machine/config.go
View File

@ -58,6 +58,8 @@ type ListResponse struct {
LastUp time.Time LastUp time.Time
Running bool Running bool
VMType string VMType string
CPUs uint64
Memory uint64
} }
type SSHOptions struct { type SSHOptions struct {

2
pkg/machine/qemu/machine.go
View File

@ -574,6 +574,8 @@ func GetVMInfos() ([]*machine.ListResponse, error) {
listEntry.Name = vm.Name listEntry.Name = vm.Name
listEntry.VMType = "qemu" listEntry.VMType = "qemu"
listEntry.CPUs = vm.CPUs
listEntry.Memory = vm.Memory
fi, err := os.Stat(fullPath) fi, err := os.Stat(fullPath)
if err != nil { if err != nil {
return err return err