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

 	"net"

 	"os"

 	"regexp"

-	"strconv"

 	"strings"

-

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

-	"github.com/docker/go-units"

 )

 var (

@@ -153,12 +149,6 @@ func NewMapOpts(values map[string]string, validator ValidatorFctType) *MapOpts {

 // ValidatorFctType defines a validator function that returns a validated string and/or an error.

 type ValidatorFctType func(val string) (string, error)

-// ValidatorWeightFctType defines a validator function that returns a validated struct and/or an error.

-type ValidatorWeightFctType func(val string) (*blkiodev.WeightDevice, error)

-

-// ValidatorThrottleFctType defines a validator function that returns a validated struct and/or an error.

-type ValidatorThrottleFctType func(val string) (*blkiodev.ThrottleDevice, error)

-

 // ValidatorFctListType defines a validator function that returns a validated list of string and/or an error

 type ValidatorFctListType func(val string) ([]string, error)

@@ -173,75 +163,6 @@ func ValidateAttach(val string) (string, error) {

 	return val, fmt.Errorf("valid streams are STDIN, STDOUT and STDERR")

 }

-// ValidateWeightDevice validates that the specified string has a valid device-weight format.

-func ValidateWeightDevice(val string) (*blkiodev.WeightDevice, error) {

-	split := strings.SplitN(val, ":", 2)

-	if len(split) != 2 {

-		return nil, fmt.Errorf("bad format: %s", val)

-	}

-	if !strings.HasPrefix(split[0], "/dev/") {

-		return nil, fmt.Errorf("bad format for device path: %s", val)

-	}

-	weight, err := strconv.ParseUint(split[1], 10, 0)

-	if err != nil {

-		return nil, fmt.Errorf("invalid weight for device: %s", val)

-	}

-	if weight > 0 && (weight < 10 || weight > 1000) {

-		return nil, fmt.Errorf("invalid weight for device: %s", val)

-	}

-

-	return &blkiodev.WeightDevice{

-		Path:   split[0],

-		Weight: uint16(weight),

-	}, nil

-}

-

-// ValidateThrottleBpsDevice validates that the specified string has a valid device-rate format.

-func ValidateThrottleBpsDevice(val string) (*blkiodev.ThrottleDevice, error) {

-	split := strings.SplitN(val, ":", 2)

-	if len(split) != 2 {

-		return nil, fmt.Errorf("bad format: %s", val)

-	}

-	if !strings.HasPrefix(split[0], "/dev/") {

-		return nil, fmt.Errorf("bad format for device path: %s", val)

-	}

-	rate, err := units.RAMInBytes(split[1])

-	if err != nil {

-		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>[<unit>]. Number must be a positive integer. Unit is optional and can be kb, mb, or gb", val)

-	}

-	if rate < 0 {

-		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>[<unit>]. Number must be a positive integer. Unit is optional and can be kb, mb, or gb", val)

-	}

-

-	return &blkiodev.ThrottleDevice{

-		Path: split[0],

-		Rate: uint64(rate),

-	}, nil

-}

-

-// ValidateThrottleIOpsDevice validates that the specified string has a valid device-rate format.

-func ValidateThrottleIOpsDevice(val string) (*blkiodev.ThrottleDevice, error) {

-	split := strings.SplitN(val, ":", 2)

-	if len(split) != 2 {

-		return nil, fmt.Errorf("bad format: %s", val)

-	}

-	if !strings.HasPrefix(split[0], "/dev/") {

-		return nil, fmt.Errorf("bad format for device path: %s", val)

-	}

-	rate, err := strconv.ParseUint(split[1], 10, 64)

-	if err != nil {

-		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>. Number must be a positive integer", val)

-	}

-	if rate < 0 {

-		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>. Number must be a positive integer", val)

-	}

-

-	return &blkiodev.ThrottleDevice{

-		Path: split[0],

-		Rate: uint64(rate),

-	}, nil

-}

-

 // ValidateEnv validates an environment variable and returns it.

 // If no value is specified, it returns the current value using os.Getenv.

 //

deleted file mode 100644

@@ -1,56 +0,0 @@

-package opts

-

-import (

-	"fmt"

-

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

-)

-

-// ThrottledeviceOpt defines a map of ThrottleDevices

-type ThrottledeviceOpt struct {

-	values    []*blkiodev.ThrottleDevice

-	validator ValidatorThrottleFctType

-}

-

-// NewThrottledeviceOpt creates a new ThrottledeviceOpt

-func NewThrottledeviceOpt(validator ValidatorThrottleFctType) ThrottledeviceOpt {

-	values := []*blkiodev.ThrottleDevice{}

-	return ThrottledeviceOpt{

-		values:    values,

-		validator: validator,

-	}

-}

-

-// Set validates a ThrottleDevice and sets its name as a key in ThrottledeviceOpt

-func (opt *ThrottledeviceOpt) Set(val string) error {

-	var value *blkiodev.ThrottleDevice

-	if opt.validator != nil {

-		v, err := opt.validator(val)

-		if err != nil {

-			return err

-		}

-		value = v

-	}

-	(opt.values) = append((opt.values), value)

-	return nil

-}

-

-// String returns ThrottledeviceOpt values as a string.

-func (opt *ThrottledeviceOpt) String() string {

-	var out []string

-	for _, v := range opt.values {

-		out = append(out, v.String())

-	}

-

-	return fmt.Sprintf("%v", out)

-}

-

-// GetList returns a slice of pointers to ThrottleDevices.

-func (opt *ThrottledeviceOpt) GetList() []*blkiodev.ThrottleDevice {

-	var throttledevice []*blkiodev.ThrottleDevice

-	for _, v := range opt.values {

-		throttledevice = append(throttledevice, v)

-	}

-

-	return throttledevice

-}

deleted file mode 100644

@@ -1,56 +0,0 @@

-package opts

-

-import (

-	"fmt"

-

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

-)

-

-// WeightdeviceOpt defines a map of WeightDevices

-type WeightdeviceOpt struct {

-	values    []*blkiodev.WeightDevice

-	validator ValidatorWeightFctType

-}

-

-// NewWeightdeviceOpt creates a new WeightdeviceOpt

-func NewWeightdeviceOpt(validator ValidatorWeightFctType) WeightdeviceOpt {

-	values := []*blkiodev.WeightDevice{}

-	return WeightdeviceOpt{

-		values:    values,

-		validator: validator,

-	}

-}

-

-// Set validates a WeightDevice and sets its name as a key in WeightdeviceOpt

-func (opt *WeightdeviceOpt) Set(val string) error {

-	var value *blkiodev.WeightDevice

-	if opt.validator != nil {

-		v, err := opt.validator(val)

-		if err != nil {

-			return err

-		}

-		value = v

-	}

-	(opt.values) = append((opt.values), value)

-	return nil

-}

-

-// String returns WeightdeviceOpt values as a string.

-func (opt *WeightdeviceOpt) String() string {

-	var out []string

-	for _, v := range opt.values {

-		out = append(out, v.String())

-	}

-

-	return fmt.Sprintf("%v", out)

-}

-

-// GetList returns a slice of pointers to WeightDevices.

-func (opt *WeightdeviceOpt) GetList() []*blkiodev.WeightDevice {

-	var weightdevice []*blkiodev.WeightDevice

-	for _, v := range opt.values {

-		weightdevice = append(weightdevice, v)

-	}

-

-	return weightdevice

-}

new file mode 100644

@@ -0,0 +1,108 @@

+package opts

+

+import (

+	"fmt"

+	"strconv"

+	"strings"

+

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

+	"github.com/docker/go-units"

+)

+

+// ValidatorThrottleFctType defines a validator function that returns a validated struct and/or an error.

+type ValidatorThrottleFctType func(val string) (*blkiodev.ThrottleDevice, error)

+

+// ValidateThrottleBpsDevice validates that the specified string has a valid device-rate format.

+func ValidateThrottleBpsDevice(val string) (*blkiodev.ThrottleDevice, error) {

+	split := strings.SplitN(val, ":", 2)

+	if len(split) != 2 {

+		return nil, fmt.Errorf("bad format: %s", val)

+	}

+	if !strings.HasPrefix(split[0], "/dev/") {

+		return nil, fmt.Errorf("bad format for device path: %s", val)

+	}

+	rate, err := units.RAMInBytes(split[1])

+	if err != nil {

+		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>[<unit>]. Number must be a positive integer. Unit is optional and can be kb, mb, or gb", val)

+	}

+	if rate < 0 {

+		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>[<unit>]. Number must be a positive integer. Unit is optional and can be kb, mb, or gb", val)

+	}

+

+	return &blkiodev.ThrottleDevice{

+		Path: split[0],

+		Rate: uint64(rate),

+	}, nil

+}

+

+// ValidateThrottleIOpsDevice validates that the specified string has a valid device-rate format.

+func ValidateThrottleIOpsDevice(val string) (*blkiodev.ThrottleDevice, error) {

+	split := strings.SplitN(val, ":", 2)

+	if len(split) != 2 {

+		return nil, fmt.Errorf("bad format: %s", val)

+	}

+	if !strings.HasPrefix(split[0], "/dev/") {

+		return nil, fmt.Errorf("bad format for device path: %s", val)

+	}

+	rate, err := strconv.ParseUint(split[1], 10, 64)

+	if err != nil {

+		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>. Number must be a positive integer", val)

+	}

+	if rate < 0 {

+		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>. Number must be a positive integer", val)

+	}

+

+	return &blkiodev.ThrottleDevice{

+		Path: split[0],

+		Rate: uint64(rate),

+	}, nil

+}

+

+// ThrottledeviceOpt defines a map of ThrottleDevices

+type ThrottledeviceOpt struct {

+	values    []*blkiodev.ThrottleDevice

+	validator ValidatorThrottleFctType

+}

+

+// NewThrottledeviceOpt creates a new ThrottledeviceOpt

+func NewThrottledeviceOpt(validator ValidatorThrottleFctType) ThrottledeviceOpt {

+	values := []*blkiodev.ThrottleDevice{}

+	return ThrottledeviceOpt{

+		values:    values,

+		validator: validator,

+	}

+}

+

+// Set validates a ThrottleDevice and sets its name as a key in ThrottledeviceOpt

+func (opt *ThrottledeviceOpt) Set(val string) error {

+	var value *blkiodev.ThrottleDevice

+	if opt.validator != nil {

+		v, err := opt.validator(val)

+		if err != nil {

+			return err

+		}

+		value = v

+	}

+	(opt.values) = append((opt.values), value)

+	return nil

+}

+

+// String returns ThrottledeviceOpt values as a string.

+func (opt *ThrottledeviceOpt) String() string {

+	var out []string

+	for _, v := range opt.values {

+		out = append(out, v.String())

+	}

+

+	return fmt.Sprintf("%v", out)

+}

+

+// GetList returns a slice of pointers to ThrottleDevices.

+func (opt *ThrottledeviceOpt) GetList() []*blkiodev.ThrottleDevice {

+	var throttledevice []*blkiodev.ThrottleDevice

+	for _, v := range opt.values {

+		throttledevice = append(throttledevice, v)

+	}

+

+	return throttledevice

+}

new file mode 100644

@@ -0,0 +1,84 @@

+package opts

+

+import (

+	"fmt"

+	"strconv"

+	"strings"

+

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

+)

+

+// ValidatorWeightFctType defines a validator function that returns a validated struct and/or an error.

+type ValidatorWeightFctType func(val string) (*blkiodev.WeightDevice, error)

+

+// ValidateWeightDevice validates that the specified string has a valid device-weight format.

+func ValidateWeightDevice(val string) (*blkiodev.WeightDevice, error) {

+	split := strings.SplitN(val, ":", 2)

+	if len(split) != 2 {

+		return nil, fmt.Errorf("bad format: %s", val)

+	}

+	if !strings.HasPrefix(split[0], "/dev/") {

+		return nil, fmt.Errorf("bad format for device path: %s", val)

+	}

+	weight, err := strconv.ParseUint(split[1], 10, 0)

+	if err != nil {

+		return nil, fmt.Errorf("invalid weight for device: %s", val)

+	}

+	if weight > 0 && (weight < 10 || weight > 1000) {

+		return nil, fmt.Errorf("invalid weight for device: %s", val)

+	}

+

+	return &blkiodev.WeightDevice{

+		Path:   split[0],

+		Weight: uint16(weight),

+	}, nil

+}

+

+// WeightdeviceOpt defines a map of WeightDevices

+type WeightdeviceOpt struct {

+	values    []*blkiodev.WeightDevice

+	validator ValidatorWeightFctType

+}

+

+// NewWeightdeviceOpt creates a new WeightdeviceOpt

+func NewWeightdeviceOpt(validator ValidatorWeightFctType) WeightdeviceOpt {

+	values := []*blkiodev.WeightDevice{}

+	return WeightdeviceOpt{

+		values:    values,

+		validator: validator,

+	}

+}

+

+// Set validates a WeightDevice and sets its name as a key in WeightdeviceOpt

+func (opt *WeightdeviceOpt) Set(val string) error {

+	var value *blkiodev.WeightDevice

+	if opt.validator != nil {

+		v, err := opt.validator(val)

+		if err != nil {

+			return err

+		}

+		value = v

+	}

+	(opt.values) = append((opt.values), value)

+	return nil

+}

+

+// String returns WeightdeviceOpt values as a string.

+func (opt *WeightdeviceOpt) String() string {

+	var out []string

+	for _, v := range opt.values {

+		out = append(out, v.String())

+	}

+

+	return fmt.Sprintf("%v", out)

+}

+

+// GetList returns a slice of pointers to WeightDevices.

+func (opt *WeightdeviceOpt) GetList() []*blkiodev.WeightDevice {

+	var weightdevice []*blkiodev.WeightDevice

+	for _, v := range opt.values {

+		weightdevice = append(weightdevice, v)

+	}

+

+	return weightdevice

+}

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

 	"github.com/docker/docker/pkg/mount"

 	"github.com/docker/docker/pkg/parsers"

 	"github.com/docker/docker/pkg/signal"

+	runconfigopts "github.com/docker/docker/runconfig/opts"

 	"github.com/docker/docker/volume"

 	"github.com/docker/go-connections/nat"

 	"github.com/docker/go-units"

@@ -54,12 +55,12 @@ func Parse(cmd *flag.FlagSet, args []string) (*container.Config, *container.Host

 		flAttach            = opts.NewListOpts(opts.ValidateAttach)

 		flVolumes           = opts.NewListOpts(nil)

 		flTmpfs             = opts.NewListOpts(nil)

-		flBlkioWeightDevice = opts.NewWeightdeviceOpt(opts.ValidateWeightDevice)

-		flDeviceReadBps     = opts.NewThrottledeviceOpt(opts.ValidateThrottleBpsDevice)

-		flDeviceWriteBps    = opts.NewThrottledeviceOpt(opts.ValidateThrottleBpsDevice)

+		flBlkioWeightDevice = runconfigopts.NewWeightdeviceOpt(runconfigopts.ValidateWeightDevice)

+		flDeviceReadBps     = runconfigopts.NewThrottledeviceOpt(runconfigopts.ValidateThrottleBpsDevice)

+		flDeviceWriteBps    = runconfigopts.NewThrottledeviceOpt(runconfigopts.ValidateThrottleBpsDevice)

 		flLinks             = opts.NewListOpts(ValidateLink)

-		flDeviceReadIOps    = opts.NewThrottledeviceOpt(opts.ValidateThrottleIOpsDevice)

-		flDeviceWriteIOps   = opts.NewThrottledeviceOpt(opts.ValidateThrottleIOpsDevice)

+		flDeviceReadIOps    = runconfigopts.NewThrottledeviceOpt(runconfigopts.ValidateThrottleIOpsDevice)

+		flDeviceWriteIOps   = runconfigopts.NewThrottledeviceOpt(runconfigopts.ValidateThrottleIOpsDevice)

 		flEnv               = opts.NewListOpts(opts.ValidateEnv)

 		flLabels            = opts.NewListOpts(opts.ValidateEnv)

 		flDevices           = opts.NewListOpts(ValidateDevice)