add additional fields to podman machine ls --json

[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2022-01-11 16:42:54 -05:00
parent 3404ad042d
commit 6e208c2226
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
4 changed files with 34 additions and 19 deletions

View File

@ -54,6 +54,9 @@ type machineReporter struct {
CPUs uint64 CPUs uint64
Memory string Memory string
DiskSize string DiskSize string
Port int
RemoteUsername string
IdentityPath string
} }
func init() { func init() {
@ -190,6 +193,9 @@ func toMachineFormat(vms []*machine.ListResponse) ([]*machineReporter, error) {
response.CPUs = vm.CPUs response.CPUs = vm.CPUs
response.Memory = strUint(vm.Memory) response.Memory = strUint(vm.Memory)
response.DiskSize = strUint(vm.DiskSize) response.DiskSize = strUint(vm.DiskSize)
response.Port = vm.Port
response.RemoteUsername = vm.RemoteUsername
response.IdentityPath = vm.IdentityPath
machineResponses = append(machineResponses, response) machineResponses = append(machineResponses, response)
} }

View File

@ -37,6 +37,9 @@ Valid placeholders for the Go template are listed below:
| .Running | Is machine running | | .Running | Is machine running |
| .Stream | Stream name | | .Stream | Stream name |
| .VMType | VM type | | .VMType | VM type |
| .Port | SSH Port to use to connect to VM|
| .RemoteUsername | VM Username for rootless Podman |
| .IdentityPath | Path to ssh identify file |
#### **--help** #### **--help**

View File

@ -75,6 +75,9 @@ type ListResponse struct {
CPUs uint64 CPUs uint64
Memory uint64 Memory uint64
DiskSize uint64 DiskSize uint64
Port int
RemoteUsername string
IdentityPath string
} }
type SSHOptions struct { type SSHOptions struct {

View File

@ -696,6 +696,9 @@ func GetVMInfos() ([]*machine.ListResponse, error) {
listEntry.CPUs = vm.CPUs listEntry.CPUs = vm.CPUs
listEntry.Memory = vm.Memory * units.MiB listEntry.Memory = vm.Memory * units.MiB
listEntry.DiskSize = vm.DiskSize * units.GiB listEntry.DiskSize = vm.DiskSize * units.GiB
listEntry.Port = vm.Port
listEntry.RemoteUsername = vm.RemoteUsername
listEntry.IdentityPath = vm.IdentityPath
fi, err := os.Stat(fullPath) fi, err := os.Stat(fullPath)
if err != nil { if err != nil {
return err return err