podman-remote make --size optional in ps

Close #3578 Add `size` field to PsOpts in podman remote to receive size as an option.

Signed-off-by: Qi Wang <qiwan@redhat.com>
This commit is contained in:
Qi Wang
2019-07-16 16:17:59 -04:00
parent 1c02905ec7
commit c244c347b1
5 changed files with 37 additions and 31 deletions

2
API.md
View File

@ -1894,6 +1894,8 @@ pod [?bool](#?bool)
quiet [?bool](#?bool)
size [?bool](#?bool)
sort [?string](#?string)
sync [?bool](#?bool)

View File

@ -146,6 +146,7 @@ type PsOpts (
noTrunc: ?bool,
pod: ?bool,
quiet: ?bool,
size: ?bool,
sort: ?string,
sync: ?bool
)

View File

@ -493,6 +493,7 @@ func (r *LocalRuntime) Ps(c *cliconfig.PsValues, opts shared.PsOptions) ([]share
NoTrunc: &c.NoTrunct,
Pod: &c.Pod,
Quiet: &c.Quiet,
Size: &c.Size,
Sort: &c.Sort,
Sync: &c.Sync,
}

View File

@ -76,8 +76,6 @@ func (i *LibpodAPI) Ps(call iopodman.VarlinkCall, opts iopodman.PsOpts) error {
Status: ctr.Status,
State: ctr.State.String(),
PidNum: int64(ctr.Pid),
RootFsSize: ctr.Size.RootFsSize,
RwSize: ctr.Size.RwSize,
Pod: ctr.Pod,
CreatedAt: ctr.CreatedAt.Format(time.RFC3339Nano),
ExitedAt: ctr.ExitedAt.Format(time.RFC3339Nano),
@ -93,6 +91,10 @@ func (i *LibpodAPI) Ps(call iopodman.VarlinkCall, opts iopodman.PsOpts) error {
Uts: ctr.UTS,
Mounts: ctr.Mounts,
}
if ctr.Size != nil {
container.RootFsSize = ctr.Size.RootFsSize
container.RwSize = ctr.Size.RwSize
}
containers = append(containers, container)
}
return call.ReplyPs(containers)

View File

@ -191,7 +191,7 @@ func makePsOpts(inOpts iopodman.PsOpts) shared.PsOptions {
Latest: derefBool(inOpts.Latest),
NoTrunc: derefBool(inOpts.NoTrunc),
Pod: derefBool(inOpts.Pod),
Size: true,
Size: derefBool(inOpts.Size),
Sort: derefString(inOpts.Sort),
Namespace: true,
Sync: derefBool(inOpts.Sync),