@@ -5,8 +5,8 @@ import (

 	"net/http"

 	"github.com/docker/docker/api/server/httputils"

-	volumetypes "github.com/docker/docker/api/server/types/volume"

 	"github.com/docker/docker/api/types"

+	volumetypes "github.com/docker/docker/api/types/volume"

 	"golang.org/x/net/context"

 )

deleted file mode 100644

@@ -1,29 +0,0 @@

-package volume

-

-// ----------------------------------------------------------------------------

-// DO NOT EDIT THIS FILE

-// This file was generated by `swagger generate operation`

-//

-// See hack/swagger-gen.sh

-// ----------------------------------------------------------------------------

-

-// VolumesCreateBody volumes create body

-// swagger:model VolumesCreateBody

-type VolumesCreateBody struct {

-

-	// Name of the volume driver to use.

-	// Required: true

-	Driver string `json:"Driver"`

-

-	// A mapping of driver options and values. These options are passed directly to the driver and are driver specific.

-	// Required: true

-	DriverOpts map[string]string `json:"DriverOpts"`

-

-	// A mapping of arbitrary key/value data to set on the volume.

-	// Required: true

-	Labels map[string]string `json:"Labels"`

-

-	// The new volume's name. If not specified, Docker generates a name.

-	// Required: true

-	Name string `json:"Name"`

-}

deleted file mode 100644

@@ -1,23 +0,0 @@

-package volume

-

-// ----------------------------------------------------------------------------

-// DO NOT EDIT THIS FILE

-// This file was generated by `swagger generate operation`

-//

-// See hack/swagger-gen.sh

-// ----------------------------------------------------------------------------

-

-import "github.com/docker/docker/api/types"

-

-// VolumesListOKBody volumes list o k body

-// swagger:model VolumesListOKBody

-type VolumesListOKBody struct {

-

-	// List of volumes

-	// Required: true

-	Volumes []*types.Volume `json:"Volumes"`

-

-	// Warnings that occurred when fetching the list of volumes

-	// Required: true

-	Warnings []string `json:"Warnings"`

-}

new file mode 100644

@@ -0,0 +1,12 @@

+

+layout:

+  models:

+    - name: definition

+      source: asset:model

+      target: "{{ joinFilePath .Target .ModelPackage }}"

+      file_name: "{{ (snakize (pascalize .Name)) }}.go"

+  operations:

+    - name: handler

+      source: asset:serverOperation

+      target: "{{ joinFilePath .Target .APIPackage .Package }}"

+      file_name: "{{ (snakize (pascalize .Name)) }}.go"

new file mode 100644

@@ -0,0 +1,29 @@

+package volume

+

+// ----------------------------------------------------------------------------

+// DO NOT EDIT THIS FILE

+// This file was generated by `swagger generate operation`

+//

+// See hack/swagger-gen.sh

+// ----------------------------------------------------------------------------

+

+// VolumesCreateBody volumes create body

+// swagger:model VolumesCreateBody

+type VolumesCreateBody struct {

+

+	// Name of the volume driver to use.

+	// Required: true

+	Driver string `json:"Driver"`

+

+	// A mapping of driver options and values. These options are passed directly to the driver and are driver specific.

+	// Required: true

+	DriverOpts map[string]string `json:"DriverOpts"`

+

+	// A mapping of arbitrary key/value data to set on the volume.

+	// Required: true

+	Labels map[string]string `json:"Labels"`

+

+	// The new volume's name. If not specified, Docker generates a name.

+	// Required: true

+	Name string `json:"Name"`

+}

new file mode 100644

@@ -0,0 +1,23 @@

+package volume

+

+// ----------------------------------------------------------------------------

+// DO NOT EDIT THIS FILE

+// This file was generated by `swagger generate operation`

+//

+// See hack/swagger-gen.sh

+// ----------------------------------------------------------------------------

+

+import "github.com/docker/docker/api/types"

+

+// VolumesListOKBody volumes list o k body

+// swagger:model VolumesListOKBody

+type VolumesListOKBody struct {

+

+	// List of volumes

+	// Required: true

+	Volumes []*types.Volume `json:"Volumes"`

+

+	// Warnings that occurred when fetching the list of volumes

+	// Required: true

+	Warnings []string `json:"Warnings"`

+}

@@ -5,7 +5,7 @@ import (

 	"golang.org/x/net/context"

-	volumetypes "github.com/docker/docker/api/server/types/volume"

+	volumetypes "github.com/docker/docker/api/types/volume"

 	"github.com/docker/docker/cli"

 	"github.com/docker/docker/cli/command"

 	"github.com/docker/docker/opts"

@@ -4,7 +4,6 @@ import (

 	"io"

 	"time"

-	volumetypes "github.com/docker/docker/api/server/types/volume"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/events"

@@ -12,6 +11,7 @@ import (

 	"github.com/docker/docker/api/types/network"

 	"github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/api/types/swarm"

+	volumetypes "github.com/docker/docker/api/types/volume"

 	"golang.org/x/net/context"

 )

@@ -3,8 +3,8 @@ package client

 import (

 	"encoding/json"

-	volumetypes "github.com/docker/docker/api/server/types/volume"

 	"github.com/docker/docker/api/types"

+	volumetypes "github.com/docker/docker/api/types/volume"

 	"golang.org/x/net/context"

 )

@@ -9,8 +9,8 @@ import (

 	"strings"

 	"testing"

-	volumetypes "github.com/docker/docker/api/server/types/volume"

 	"github.com/docker/docker/api/types"

+	volumetypes "github.com/docker/docker/api/types/volume"

 	"golang.org/x/net/context"

 )

@@ -4,8 +4,8 @@ import (

 	"encoding/json"

 	"net/url"

-	volumetypes "github.com/docker/docker/api/server/types/volume"

 	"github.com/docker/docker/api/types/filters"

+	volumetypes "github.com/docker/docker/api/types/volume"

 	"golang.org/x/net/context"

 )

@@ -9,9 +9,9 @@ import (

 	"strings"

 	"testing"

-	volumetypes "github.com/docker/docker/api/server/types/volume"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/filters"

+	volumetypes "github.com/docker/docker/api/types/volume"

 	"golang.org/x/net/context"

 )

@@ -9,12 +9,12 @@ import (

 	"github.com/Sirupsen/logrus"

-	volumetypes "github.com/docker/docker/api/server/types/volume"

 	"github.com/docker/docker/api/types"

 	enginecontainer "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/network"

+	volumetypes "github.com/docker/docker/api/types/volume"

 	clustertypes "github.com/docker/docker/daemon/cluster/provider"

 	"github.com/docker/docker/reference"

 	"github.com/docker/swarmkit/agent/exec"

@@ -2,7 +2,7 @@

 set -eu

 swagger generate model -f api/swagger.yaml \

-    -t api -m types --skip-validator \

+    -t api -m types --skip-validator -C api/swagger-gen.yaml \

     -n Volume \

     -n Port \

     -n ImageSummary \

@@ -10,7 +10,7 @@ swagger generate model -f api/swagger.yaml \

     -n ErrorResponse

 swagger generate operation -f api/swagger.yaml \

-    -t api -s server -a types -m types \

+    -t api -a types -m types -C api/swagger-gen.yaml \

     -T api/templates --skip-responses --skip-parameters --skip-validator \

     -n VolumesList \

     -n VolumesCreate

@@ -5,8 +5,8 @@ import (

 	"net/http"

 	"path/filepath"

-	volumetypes "github.com/docker/docker/api/server/types/volume"

 	"github.com/docker/docker/api/types"

+	volumetypes "github.com/docker/docker/api/types/volume"

 	"github.com/docker/docker/pkg/integration/checker"

 	"github.com/go-check/check"

 )

@@ -22,8 +22,8 @@ import (

 	"strings"

 	"time"

-	volumetypes "github.com/docker/docker/api/server/types/volume"

 	"github.com/docker/docker/api/types"

+	volumetypes "github.com/docker/docker/api/types/volume"

 	"github.com/docker/docker/opts"

 	"github.com/docker/docker/pkg/httputils"

 	icmd "github.com/docker/docker/pkg/integration/cmd"