5 files changed, 105 insertions, 11 deletions
diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go
index 49a2dfd58..a188d73a0 100644
--- a/pkg/bindings/containers/containers.go
+++ b/pkg/bindings/containers/containers.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/api/handlers"
-	lpapiv2 "github.com/containers/libpod/pkg/api/handlers/libpod"
 	"github.com/containers/libpod/pkg/bindings"
+	"github.com/containers/libpod/pkg/domain/entities"
 )
 
 // List obtains a list of containers in local storage.  All parameters to this method are optional.
@@ -19,12 +19,12 @@ import (
 // the most recent number of containers.  The pod and size booleans indicate that pod information and rootfs
 // size information should also be included.  Finally, the sync bool synchronizes the OCI runtime and
 // container state.
-func List(ctx context.Context, filters map[string][]string, all *bool, last *int, pod, size, sync *bool) ([]lpapiv2.ListContainer, error) { // nolint:typecheck
+func List(ctx context.Context, filters map[string][]string, all *bool, last *int, pod, size, sync *bool) ([]entities.ListContainer, error) { // nolint:typecheck
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
 		return nil, err
 	}
-	var containers []lpapiv2.ListContainer
+	var containers []entities.ListContainer
 	params := url.Values{}
 	if all != nil {
 		params.Set("all", strconv.FormatBool(*all))
diff --git a/pkg/bindings/info.go b/pkg/bindings/info.go
deleted file mode 100644
index 5f318d652..000000000
--- a/pkg/bindings/info.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package bindings
-
-func (c Connection) Info() {}
diff --git a/pkg/bindings/pods/pods.go b/pkg/bindings/pods/pods.go
index ae87c00e9..83847614a 100644
--- a/pkg/bindings/pods/pods.go
+++ b/pkg/bindings/pods/pods.go
@@ -7,7 +7,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/api/handlers"
 	"github.com/containers/libpod/pkg/bindings"
 	"github.com/containers/libpod/pkg/domain/entities"
@@ -49,17 +48,19 @@ func Exists(ctx context.Context, nameOrID string) (bool, error) {
 }
 
 // Inspect returns low-level information about the given pod.
-func Inspect(ctx context.Context, nameOrID string) (*libpod.PodInspect, error) {
+func Inspect(ctx context.Context, nameOrID string) (*entities.PodInspectReport, error) {
+	var (
+		report entities.PodInspectReport
+	)
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
 		return nil, err
 	}
-	inspect := libpod.PodInspect{}
 	response, err := conn.DoRequest(nil, http.MethodGet, "/pods/%s/json", nil, nameOrID)
 	if err != nil {
-		return &inspect, err
+		return nil, err
 	}
-	return &inspect, response.Process(&inspect)
+	return &report, response.Process(&report)
 }
 
 // Kill sends a SIGTERM to all the containers in a pod.  The optional signal parameter
diff --git a/pkg/bindings/system/info.go b/pkg/bindings/system/info.go
new file mode 100644
index 000000000..f8269cfd8
--- /dev/null
+++ b/pkg/bindings/system/info.go
@@ -0,0 +1,23 @@
+package system
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/bindings"
+)
+
+// Info returns information about the libpod environment and its stores
+func Info(ctx context.Context) (define.Info, error) {
+	info := define.Info{}
+	conn, err := bindings.GetClient(ctx)
+	if err != nil {
+		return info, err
+	}
+	response, err := conn.DoRequest(nil, http.MethodGet, "/info", nil)
+	if err != nil {
+		return info, err
+	}
+	return info, response.Process(&info)
+}
diff --git a/pkg/bindings/test/info_test.go b/pkg/bindings/test/info_test.go
new file mode 100644
index 000000000..d0e651134
--- /dev/null
+++ b/pkg/bindings/test/info_test.go
@@ -0,0 +1,73 @@
+package test_bindings
+
+import (
+	"runtime"
+	"time"
+
+	"github.com/containers/libpod/pkg/bindings/containers"
+	"github.com/containers/libpod/pkg/bindings/images"
+	"github.com/containers/libpod/pkg/bindings/system"
+	"github.com/containers/libpod/pkg/specgen"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega/gexec"
+)
+
+var _ = Describe("Podman info", func() {
+	var (
+		bt *bindingTest
+		s  *gexec.Session
+		t  bool = true
+	)
+
+	BeforeEach(func() {
+		bt = newBindingTest()
+		bt.RestoreImagesFromCache()
+		s = bt.startAPIService()
+		time.Sleep(1 * time.Second)
+		err := bt.NewConnection()
+		Expect(err).To(BeNil())
+	})
+
+	AfterEach(func() {
+		s.Kill()
+		bt.cleanup()
+	})
+
+	It("podman info", func() {
+		info, err := system.Info(bt.conn)
+		Expect(err).To(BeNil())
+		Expect(info.Host.Arch).To(Equal(runtime.GOARCH))
+		Expect(info.Host.OS).To(Equal(runtime.GOOS))
+		i, err := images.List(bt.conn, &t, nil)
+		Expect(err).To(BeNil())
+		Expect(info.Store.ImageStore.Number).To(Equal(len(i)))
+	})
+
+	It("podman info container counts", func() {
+		s := specgen.NewSpecGenerator(alpine.name)
+		_, err := containers.CreateWithSpec(bt.conn, s)
+		Expect(err).To(BeNil())
+
+		idPause, err := bt.RunTopContainer(nil, nil, nil)
+		Expect(err).To(BeNil())
+		err = containers.Pause(bt.conn, idPause)
+		Expect(err).To(BeNil())
+
+		idStop, err := bt.RunTopContainer(nil, nil, nil)
+		Expect(err).To(BeNil())
+		err = containers.Stop(bt.conn, idStop, nil)
+		Expect(err).To(BeNil())
+
+		_, err = bt.RunTopContainer(nil, nil, nil)
+		Expect(err).To(BeNil())
+
+		info, err := system.Info(bt.conn)
+		Expect(err).To(BeNil())
+
+		Expect(info.Store.ContainerStore.Number).To(BeNumerically("==", 4))
+		Expect(info.Store.ContainerStore.Paused).To(Equal(1))
+		Expect(info.Store.ContainerStore.Stopped).To(Equal(2))
+		Expect(info.Store.ContainerStore.Running).To(Equal(1))
+	})
+})