summaryrefslogtreecommitdiff
path: root/pkg/machine
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-01-11 16:42:54 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2022-01-11 16:42:56 -0500
commit6e208c2226f856ed67d6ab807f3baf5bf9611135 (patch)
tree8d74da71869337114cc2fa915412809d904952a4 /pkg/machine
parent3404ad042def1c02872f66836feae19c814901a4 (diff)
downloadpodman-6e208c2226f856ed67d6ab807f3baf5bf9611135.tar.gz
podman-6e208c2226f856ed67d6ab807f3baf5bf9611135.tar.bz2
podman-6e208c2226f856ed67d6ab807f3baf5bf9611135.zip
add additional fields to podman machine ls --json
[NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/machine')
-rw-r--r--pkg/machine/config.go21
-rw-r--r--pkg/machine/qemu/machine.go3
2 files changed, 15 insertions, 9 deletions
diff --git a/pkg/machine/config.go b/pkg/machine/config.go
index 33a352898..27a7c1b1f 100644
--- a/pkg/machine/config.go
+++ b/pkg/machine/config.go
@@ -66,15 +66,18 @@ type Download struct {
type ListOptions struct{}
type ListResponse struct {
- Name string
- CreatedAt time.Time
- LastUp time.Time
- Running bool
- Stream string
- VMType string
- CPUs uint64
- Memory uint64
- DiskSize uint64
+ Name string
+ CreatedAt time.Time
+ LastUp time.Time
+ Running bool
+ Stream string
+ VMType string
+ CPUs uint64
+ Memory uint64
+ DiskSize uint64
+ Port int
+ RemoteUsername string
+ IdentityPath string
}
type SSHOptions struct {
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index f09107c71..a43d78665 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -696,6 +696,9 @@ func GetVMInfos() ([]*machine.ListResponse, error) {
listEntry.CPUs = vm.CPUs
listEntry.Memory = vm.Memory * units.MiB
listEntry.DiskSize = vm.DiskSize * units.GiB
+ listEntry.Port = vm.Port
+ listEntry.RemoteUsername = vm.RemoteUsername
+ listEntry.IdentityPath = vm.IdentityPath
fi, err := os.Stat(fullPath)
if err != nil {
return err