podmanv2 volume create

add volume create

Signed-off-by: Brent Baude <bbaude@redhat.com>

2 files changed, 17 insertions, 18 deletions

diff --git a/pkg/bindings/test/volumes_test.go b/pkg/bindings/test/volumes_test.go
index 1d5ae1329..9da034d24 100644
--- a/pkg/bindings/test/volumes_test.go
+++ b/pkg/bindings/test/volumes_test.go
@@ -6,11 +6,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/containers/libpod/pkg/api/handlers"
+	"github.com/containers/libpod/pkg/bindings"
 	"github.com/containers/libpod/pkg/bindings/containers"
 	"github.com/containers/libpod/pkg/bindings/volumes"
-
-	"github.com/containers/libpod/pkg/bindings"
+	"github.com/containers/libpod/pkg/domain/entities"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
@@ -53,13 +52,13 @@ var _ = Describe("Podman volumes", func() {
 
 	It("create volume", func() {
 		// create a volume with blank config should work
-		_, err := volumes.Create(connText, handlers.VolumeCreateConfig{})
+		_, err := volumes.Create(connText, entities.VolumeCreateOptions{})
 		Expect(err).To(BeNil())
 
-		vcc := handlers.VolumeCreateConfig{
-			Name:  "foobar",
-			Label: nil,
-			Opts:  nil,
+		vcc := entities.VolumeCreateOptions{
+			Name:    "foobar",
+			Label:   nil,
+			Options: nil,
 		}
 		vol, err := volumes.Create(connText, vcc)
 		Expect(err).To(BeNil())
@@ -73,7 +72,7 @@ var _ = Describe("Podman volumes", func() {
 	})
 
 	It("inspect volume", func() {
-		vol, err := volumes.Create(connText, handlers.VolumeCreateConfig{})
+		vol, err := volumes.Create(connText, entities.VolumeCreateOptions{})
 		Expect(err).To(BeNil())
 		data, err := volumes.Inspect(connText, vol.Name)
 		Expect(err).To(BeNil())
@@ -87,13 +86,13 @@ var _ = Describe("Podman volumes", func() {
 		Expect(code).To(BeNumerically("==", http.StatusNotFound))
 
 		// Removing an unused volume should work
-		vol, err := volumes.Create(connText, handlers.VolumeCreateConfig{})
+		vol, err := volumes.Create(connText, entities.VolumeCreateOptions{})
 		Expect(err).To(BeNil())
 		err = volumes.Remove(connText, vol.Name, nil)
 		Expect(err).To(BeNil())
 
 		// Removing a volume that is being used without force should be 409
-		vol, err = volumes.Create(connText, handlers.VolumeCreateConfig{})
+		vol, err = volumes.Create(connText, entities.VolumeCreateOptions{})
 		Expect(err).To(BeNil())
 		session := bt.runPodman([]string{"run", "-dt", "-v", fmt.Sprintf("%s:/foobar", vol.Name), "--name", "vtest", alpine.name, "top"})
 		session.Wait(45)
@@ -119,7 +118,7 @@ var _ = Describe("Podman volumes", func() {
 		// create a bunch of named volumes and make verify with list
 		volNames := []string{"homer", "bart", "lisa", "maggie", "marge"}
 		for i := 0; i < 5; i++ {
-			_, err = volumes.Create(connText, handlers.VolumeCreateConfig{Name: volNames[i]})
+			_, err = volumes.Create(connText, entities.VolumeCreateOptions{Name: volNames[i]})
 			Expect(err).To(BeNil())
 		}
 		vols, err = volumes.List(connText, nil)
@@ -152,15 +151,15 @@ var _ = Describe("Podman volumes", func() {
 		Expect(err).To(BeNil())
 
 		// Removing an unused volume should work
-		_, err = volumes.Create(connText, handlers.VolumeCreateConfig{})
+		_, err = volumes.Create(connText, entities.VolumeCreateOptions{})
 		Expect(err).To(BeNil())
 		vols, err := volumes.Prune(connText)
 		Expect(err).To(BeNil())
 		Expect(len(vols)).To(BeNumerically("==", 1))
 
-		_, err = volumes.Create(connText, handlers.VolumeCreateConfig{Name: "homer"})
+		_, err = volumes.Create(connText, entities.VolumeCreateOptions{Name: "homer"})
 		Expect(err).To(BeNil())
-		_, err = volumes.Create(connText, handlers.VolumeCreateConfig{})
+		_, err = volumes.Create(connText, entities.VolumeCreateOptions{})
 		Expect(err).To(BeNil())
 		session := bt.runPodman([]string{"run", "-dt", "-v", fmt.Sprintf("%s:/homer", "homer"), "--name", "vtest", alpine.name, "top"})
 		session.Wait(45)
diff --git a/pkg/bindings/volumes/volumes.go b/pkg/bindings/volumes/volumes.go
index 0bc818605..a2164e0af 100644
--- a/pkg/bindings/volumes/volumes.go
+++ b/pkg/bindings/volumes/volumes.go
@@ -8,15 +8,15 @@ import (
 	"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"
 	jsoniter "github.com/json-iterator/go"
 )
 
 // Create creates a volume given its configuration.
-func Create(ctx context.Context, config handlers.VolumeCreateConfig) (*libpod.VolumeConfig, error) {
+func Create(ctx context.Context, config entities.VolumeCreateOptions) (*entities.VolumeConfigResponse, error) {
 	var (
-		v libpod.VolumeConfig
+		v entities.VolumeConfigResponse
 	)
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {