diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-22 18:47:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 18:47:48 -0400 |
| commit | 1dba601b56551b301490b36b198477ee0a58d137 (patch) | |
| tree | 1e651e0e532ff44727eb8cc92bfbbb5eb98a6f6a /cmd | |
| parent | 626df0a54e5dc2e11e287586c9e10c52e0dffe96 (diff) | |
| parent | 0baee2cc33000aa8d311d987308849cb2e8420d9 (diff) | |
| download | podman-1dba601b56551b301490b36b198477ee0a58d137.tar.gz podman-1dba601b56551b301490b36b198477ee0a58d137.tar.bz2 podman-1dba601b56551b301490b36b198477ee0a58d137.zip | |
Merge pull request #11691 from afbjorklund/machine-list
Add more information about the VM to podman machine list
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/machine/list.go | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go index d4360bb9b..fe9d712e3 100644 --- a/cmd/podman/machine/list.go +++ b/cmd/podman/machine/list.go @@ -40,10 +40,13 @@ type listFlagType struct { } type machineReporter struct { - Name string - Created string - LastUp string - VMType string + Name string + Created string + LastUp string + VMType string + CPUs uint64 + Memory string + DiskSize string } func init() { @@ -54,7 +57,7 @@ func init() { flags := lsCmd.Flags() 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}}\t{{.DiskSize}}\n", "Format volume output using Go template") _ = lsCmd.RegisterFlagCompletionFunc(formatFlagName, completion.AutocompleteNone) flags.BoolVar(&listFlag.noHeading, "noheading", false, "Do not print headers") } @@ -85,8 +88,11 @@ func list(cmd *cobra.Command, args []string) error { func outputTemplate(cmd *cobra.Command, responses []*machineReporter) error { headers := report.Headers(machineReporter{}, map[string]string{ - "LastUp": "LAST UP", - "VmType": "VM TYPE", + "LastUp": "LAST UP", + "VmType": "VM TYPE", + "CPUs": "CPUS", + "Memory": "MEMORY", + "DiskSize": "DISK SIZE", }) row := report.NormalizeFormat(listFlag.format) @@ -136,6 +142,9 @@ func toHumanFormat(vms []*machine.ListResponse) ([]*machineReporter, error) { } response.Created = units.HumanDuration(time.Since(vm.CreatedAt)) + " ago" response.VMType = vm.VMType + response.CPUs = vm.CPUs + response.Memory = units.HumanSize(float64(vm.Memory) * units.MiB) + response.DiskSize = units.HumanSize(float64(vm.DiskSize) * units.GiB) humanResponses = append(humanResponses, response) } |