diff options
author | haircommander <pehunt@redhat.com> | 2018-08-14 17:16:22 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-16 20:31:50 +0000 |
commit | 8d5e0108d7c8b69abb9821bfe55475ae5d663b3a (patch) | |
tree | 6d8fa9c82a9181fad919bd797f64fe46440e7a4e /pkg/varlinkapi/containers.go | |
parent | 0059989783851ec536faf8a290eea863148dcb6c (diff) | |
download | podman-8d5e0108d7c8b69abb9821bfe55475ae5d663b3a.tar.gz podman-8d5e0108d7c8b69abb9821bfe55475ae5d663b3a.tar.bz2 podman-8d5e0108d7c8b69abb9821bfe55475ae5d663b3a.zip |
Change batchcontainer to shared
To better reflect it's usage: to share functions between podman and varlink.
Signed-off-by: haircommander <pehunt@redhat.com>
Closes: #1275
Approved by: mheon
Diffstat (limited to 'pkg/varlinkapi/containers.go')
-rw-r--r-- | pkg/varlinkapi/containers.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index df8b66996..58452716a 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - "github.com/containers/libpod/cmd/podman/batchcontainer" + "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/cmd/podman/varlink" "github.com/containers/libpod/libpod" "github.com/containers/storage/pkg/archive" @@ -26,12 +26,12 @@ func (i *LibpodAPI) ListContainers(call iopodman.VarlinkCall) error { if err != nil { return call.ReplyErrorOccurred(err.Error()) } - opts := batchcontainer.PsOptions{ + opts := shared.PsOptions{ Namespace: true, Size: true, } for _, ctr := range containers { - batchInfo, err := batchcontainer.BatchContainerOp(ctr, opts) + batchInfo, err := shared.BatchContainerOp(ctr, opts) if err != nil { return call.ReplyErrorOccurred(err.Error()) } @@ -47,11 +47,11 @@ func (i *LibpodAPI) GetContainer(call iopodman.VarlinkCall, name string) error { if err != nil { return call.ReplyContainerNotFound(name) } - opts := batchcontainer.PsOptions{ + opts := shared.PsOptions{ Namespace: true, Size: true, } - batchInfo, err := batchcontainer.BatchContainerOp(ctr, opts) + batchInfo, err := shared.BatchContainerOp(ctr, opts) if err != nil { return call.ReplyErrorOccurred(err.Error()) } @@ -68,7 +68,7 @@ func (i *LibpodAPI) InspectContainer(call iopodman.VarlinkCall, name string) err if err != nil { return call.ReplyErrorOccurred(err.Error()) } - data, err := batchcontainer.GetCtrInspectInfo(ctr, inspectInfo) + data, err := shared.GetCtrInspectInfo(ctr, inspectInfo) if err != nil { return call.ReplyErrorOccurred(err.Error()) } |