diff options
| author | baude <bbaude@redhat.com> | 2018-02-02 11:02:09 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-02-02 22:44:40 +0000 |
| commit | 6ba6ecf59b9204d36388de07b866f157a4d13957 (patch) | |
| tree | 53bc85dd3e9820eb09014b1db2f8d136e86f6799 /libpod/container_inspect.go | |
| parent | 3ea23f84818a816104ccdcf6b836ac4bb3a7c366 (diff) | |
| download | podman-6ba6ecf59b9204d36388de07b866f157a4d13957.tar.gz podman-6ba6ecf59b9204d36388de07b866f157a4d13957.tar.bz2 podman-6ba6ecf59b9204d36388de07b866f157a4d13957.zip | |
Migrate Create|Commit to ginkgo
Migrate create and commit bats tests to the ginkgo
test suite. In doing so, some structures had to be
moved to pkg/podmanstructs/podmanstructs.go so we
could do better verification of test results.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #286
Approved by: rhatdan
Diffstat (limited to 'libpod/container_inspect.go')
| -rw-r--r-- | libpod/container_inspect.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 78dd00c16..b07dafa00 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -2,11 +2,11 @@ package libpod import ( "github.com/cri-o/ocicni/pkg/ocicni" - "github.com/projectatomic/libpod/libpod/driver" + "github.com/projectatomic/libpod/pkg/inspect" "github.com/sirupsen/logrus" ) -func (c *Container) getContainerInspectData(size bool, driverData *driver.Data) (*ContainerInspectData, error) { +func (c *Container) getContainerInspectData(size bool, driverData *inspect.Data) (*inspect.ContainerInspectData, error) { config := c.config runtimeInfo := c.state spec := c.config.Spec @@ -20,12 +20,12 @@ func (c *Container) getContainerInspectData(size bool, driverData *driver.Data) args = args[1:] } - data := &ContainerInspectData{ + data := &inspect.ContainerInspectData{ ID: config.ID, Created: config.CreatedTime, Path: path, Args: args, - State: &ContainerInspectState{ + State: &inspect.ContainerInspectState{ OciVersion: spec.Version, Status: runtimeInfo.State.String(), Running: runtimeInfo.State == ContainerStateRunning, @@ -53,7 +53,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *driver.Data) ExecIDs: []string{}, //TODO GraphDriver: driverData, Mounts: spec.Mounts, - NetworkSettings: &NetworkSettings{ + NetworkSettings: &inspect.NetworkSettings{ Bridge: "", // TODO SandboxID: "", // TODO - is this even relevant? HairpinMode: false, // TODO |