4 files changed, 71 insertions, 17 deletions
diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go
index 1899b98f7..0e1208b3b 100644
--- a/pkg/domain/entities/containers.go
+++ b/pkg/domain/entities/containers.go
@@ -1 +1,23 @@
 package entities
+
+import (
+	"time"
+
+	"github.com/containers/libpod/libpod/define"
+)
+
+type WaitOptions struct {
+	Condition define.ContainerStatus
+	Interval  time.Duration
+	Latest    bool
+}
+
+type WaitReport struct {
+	Id       string
+	Error    error
+	ExitCode int32
+}
+
+type BoolReport struct {
+	Value bool
+}
diff --git a/pkg/domain/entities/engine.go b/pkg/domain/entities/engine.go
index a1096f1f1..08ef1df92 100644
--- a/pkg/domain/entities/engine.go
+++ b/pkg/domain/entities/engine.go
@@ -1,7 +1,6 @@
 package entities
 
 import (
-	"net/url"
 	"os/user"
 	"path/filepath"
 
@@ -20,11 +19,13 @@ func (m EngineMode) String() string {
 	return string(m)
 }
 
+// FIXME: merge EngineOptions and EngineFlags
 type EngineOptions struct {
-	Uri        *url.URL
+	Uri        string
 	Identities []string
-	FlagSet    pflag.FlagSet
+	FlagSet    *pflag.FlagSet
 	Flags      EngineFlags
+	EngineMode EngineMode
 }
 
 type EngineFlags struct {
@@ -58,8 +59,6 @@ type EngineFlags struct {
 	Port                 int
 	IdentityFile         string
 	IgnoreHosts          bool
-
-	EngineMode EngineMode
 }
 
 func NewEngineOptions() (EngineFlags, error) {
diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go
index d08f37d44..5820c12c3 100644
--- a/pkg/domain/entities/engine_container.go
+++ b/pkg/domain/entities/engine_container.go
@@ -5,22 +5,14 @@ import (
 )
 
 type ContainerEngine interface {
-	ContainerRuntime
-	PodRuntime
-	VolumeRuntime
-}
-
-type ContainerRuntime interface {
 	ContainerDelete(ctx context.Context, opts ContainerDeleteOptions) (*ContainerDeleteReport, error)
 	ContainerPrune(ctx context.Context) (*ContainerPruneReport, error)
-}
-
-type PodRuntime interface {
+	ContainerExists(ctx context.Context, nameOrId string) (*BoolReport, error)
+	ContainerWait(ctx context.Context, namesOrIds []string, options WaitOptions) ([]WaitReport, error)
 	PodDelete(ctx context.Context, opts PodPruneOptions) (*PodDeleteReport, error)
+	PodExists(ctx context.Context, nameOrId string) (*BoolReport, error)
 	PodPrune(ctx context.Context) (*PodPruneReport, error)
-}
-
-type VolumeRuntime interface {
+	VolumeCreate(ctx context.Context, opts VolumeCreateOptions) (*IdOrNameResponse, error)
 	VolumeDelete(ctx context.Context, opts VolumeDeleteOptions) (*VolumeDeleteReport, error)
 	VolumePrune(ctx context.Context) (*VolumePruneReport, error)
 }
diff --git a/pkg/domain/entities/volumes.go b/pkg/domain/entities/volumes.go
new file mode 100644
index 000000000..ad12d0d01
--- /dev/null
+++ b/pkg/domain/entities/volumes.go
@@ -0,0 +1,41 @@
+package entities
+
+import "time"
+
+// swagger:model VolumeCreate
+type VolumeCreateOptions struct {
+	// New volume's name. Can be left blank
+	Name string `schema:"name"`
+	// Volume driver to use
+	Driver string `schema:"driver"`
+	// User-defined key/value metadata.
+	Label map[string]string `schema:"label"`
+	// Mapping of driver options and values.
+	Options map[string]string `schema:"opts"`
+}
+
+type IdOrNameResponse struct {
+	// The Id or Name of an object
+	IdOrName string
+}
+
+type VolumeConfigResponse struct {
+	// Name of the volume.
+	Name   string            `json:"name"`
+	Labels map[string]string `json:"labels"`
+	// The volume driver. Empty string or local does not activate a volume
+	// driver, all other volumes will.
+	Driver string `json:"volumeDriver"`
+	// The location the volume is mounted at.
+	MountPoint string `json:"mountPoint"`
+	// Time the volume was created.
+	CreatedTime time.Time `json:"createdAt,omitempty"`
+	// Options to pass to the volume driver. For the local driver, this is
+	// a list of mount options. For other drivers, they are passed to the
+	// volume driver handling the volume.
+	Options map[string]string `json:"volumeOptions,omitempty"`
+	// UID the volume will be created as.
+	UID int `json:"uid"`
+	// GID the volume will be created as.
+	GID int `json:"gid"`
+}