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

 	"net/http"

 	"github.com/docker/libnetwork"

+	"github.com/docker/libnetwork/types"

 	"github.com/gorilla/mux"

 )

@@ -434,7 +435,7 @@ func findNetwork(c libnetwork.NetworkController, s string, by int) (libnetwork.N

 		panic(fmt.Sprintf("unexpected selector for network search: %d", by))

 	}

 	if err != nil {

-		if err == libnetwork.ErrNoSuchNetwork {

+		if _, ok := err.(libnetwork.ErrNoSuchNetwork); ok {

 			return nil, &responseStatus{Status: "Resource not found: Network", StatusCode: http.StatusNotFound}

 		}

 		return nil, &responseStatus{Status: err.Error(), StatusCode: http.StatusBadRequest}

@@ -460,7 +461,7 @@ func findEndpoint(c libnetwork.NetworkController, ns, es string, nwBy, epBy int)

 		panic(fmt.Sprintf("unexpected selector for endpoint search: %d", epBy))

 	}

 	if err != nil {

-		if err == libnetwork.ErrNoSuchEndpoint {

+		if _, ok := err.(libnetwork.ErrNoSuchEndpoint); ok {

 			return nil, &responseStatus{Status: "Resource not found: Endpoint", StatusCode: http.StatusNotFound}

 		}

 		return nil, &responseStatus{Status: err.Error(), StatusCode: http.StatusBadRequest}

@@ -469,9 +470,26 @@ func findEndpoint(c libnetwork.NetworkController, ns, es string, nwBy, epBy int)

 }

 func convertNetworkError(err error) *responseStatus {

-	// No real libnetwork error => http error code conversion for now.

-	// Will came in later when new interface for libnetwork error is vailable

-	return &responseStatus{Status: err.Error(), StatusCode: http.StatusBadRequest}

+	var code int

+	switch err.(type) {

+	case types.BadRequestError:

+		code = http.StatusBadRequest

+	case types.ForbiddenError:

+		code = http.StatusForbidden

+	case types.NotFoundError:

+		code = http.StatusNotFound

+	case types.TimeoutError:

+		code = http.StatusRequestTimeout

+	case types.NotImplementedError:

+		code = http.StatusNotImplemented

+	case types.NoServiceError:

+		code = http.StatusServiceUnavailable

+	case types.InternalError:

+		code = http.StatusInternalServerError

+	default:

+		code = http.StatusInternalServerError

+	}

+	return &responseStatus{Status: err.Error(), StatusCode: code}

 }

 func writeJSON(w http.ResponseWriter, code int, v interface{}) error {

@@ -193,8 +193,8 @@ func TestCreateDeleteNetwork(t *testing.T) {

 	if errRsp == &createdResponse {

 		t.Fatalf("Expected to fail but succeeded")

 	}

-	if errRsp.StatusCode != http.StatusBadRequest {

-		t.Fatalf("Expected StatusBadRequest status code, got: %v", errRsp.StatusCode)

+	if errRsp.StatusCode != http.StatusNotFound {

+		t.Fatalf("Expected StatusNotFound status code, got: %v", errRsp)

 	}

 	ops := make(map[string]interface{})

@@ -1305,3 +1305,92 @@ func TestHttpHandlerGood(t *testing.T) {

 		t.Fatalf("Incongruent resource found")

 	}

 }

+

+type bre struct{}

+

+func (b *bre) Error() string {

+	return "I am a bad request error"

+}

+func (b *bre) BadRequest() {}

+

+type nfe struct{}

+

+func (n *nfe) Error() string {

+	return "I am a not found error"

+}

+func (n *nfe) NotFound() {}

+

+type forb struct{}

+

+func (f *forb) Error() string {

+	return "I am a bad request error"

+}

+func (f *forb) Forbidden() {}

+

+type notimpl struct{}

+

+func (nip *notimpl) Error() string {

+	return "I am a not implemented error"

+}

+func (nip *notimpl) NotImplemented() {}

+

+type inter struct{}

+

+func (it *inter) Error() string {

+	return "I am a internal error"

+}

+func (it *inter) Internal() {}

+

+type tout struct{}

+

+func (to *tout) Error() string {

+	return "I am a timeout error"

+}

+func (to *tout) Timeout() {}

+

+type noserv struct{}

+

+func (nos *noserv) Error() string {

+	return "I am a no service error"

+}

+func (nos *noserv) NoService() {}

+

+type notclassified struct{}

+

+func (noc *notclassified) Error() string {

+	return "I am a non classified error"

+}

+

+func TestErrorConversion(t *testing.T) {

+	if convertNetworkError(new(bre)).StatusCode != http.StatusBadRequest {

+		t.Fatalf("Failed to recognize BadRequest error")

+	}

+

+	if convertNetworkError(new(nfe)).StatusCode != http.StatusNotFound {

+		t.Fatalf("Failed to recognize NotFound error")

+	}

+

+	if convertNetworkError(new(forb)).StatusCode != http.StatusForbidden {

+		t.Fatalf("Failed to recognize Forbidden error")

+	}

+

+	if convertNetworkError(new(notimpl)).StatusCode != http.StatusNotImplemented {

+		t.Fatalf("Failed to recognize NotImplemented error")

+	}

+

+	if convertNetworkError(new(inter)).StatusCode != http.StatusInternalServerError {

+		t.Fatalf("Failed to recognize Internal error")

+	}

+

+	if convertNetworkError(new(tout)).StatusCode != http.StatusRequestTimeout {

+		t.Fatalf("Failed to recognize Timeout error")

+	}

+

+	if convertNetworkError(new(noserv)).StatusCode != http.StatusServiceUnavailable {

+		t.Fatalf("Failed to recognize No Service error")

+	}

+

+	if convertNetworkError(new(notclassified)).StatusCode != http.StatusInternalServerError {

+		t.Fatalf("Failed to recognize not classified error as Internal error")

+	}

+}

@@ -134,7 +134,7 @@ func (c *controller) RegisterDriver(networkType string, driver driverapi.Driver)

 // are network specific and modeled in a generic way.

 func (c *controller) NewNetwork(networkType, name string, options ...NetworkOption) (Network, error) {

 	if name == "" {

-		return nil, ErrInvalidName

+		return nil, ErrInvalidName(name)

 	}

 	// Check if a driver for the specified network type is available

 	c.Lock()

@@ -203,7 +203,7 @@ func (c *controller) WalkNetworks(walker NetworkWalker) {

 func (c *controller) NetworkByName(name string) (Network, error) {

 	if name == "" {

-		return nil, ErrInvalidName

+		return nil, ErrInvalidName(name)

 	}

 	var n Network

@@ -218,7 +218,7 @@ func (c *controller) NetworkByName(name string) (Network, error) {

 	c.WalkNetworks(s)

 	if n == nil {

-		return nil, ErrNoSuchNetwork

+		return nil, ErrNoSuchNetwork(name)

 	}

 	return n, nil

@@ -226,14 +226,14 @@ func (c *controller) NetworkByName(name string) (Network, error) {

 func (c *controller) NetworkByID(id string) (Network, error) {

 	if id == "" {

-		return nil, ErrInvalidID

+		return nil, ErrInvalidID(id)

 	}

 	c.Lock()

 	defer c.Unlock()

 	if n, ok := c.networks[types.UUID(id)]; ok {

 		return n, nil

 	}

-	return nil, ErrNoSuchNetwork

+	return nil, ErrNoSuchNetwork(id)

 }

 func (c *controller) sandboxAdd(key string, create bool) (sandbox.Sandbox, error) {

@@ -286,13 +286,16 @@ func (c *controller) loadDriver(networkType string) (driverapi.Driver, error) {

 	// As per the design, this Get call will result in remote driver discovery if there is a corresponding plugin available.

 	_, err := plugins.Get(networkType, driverapi.NetworkPluginEndpointType)

 	if err != nil {

+		if err == plugins.ErrNotFound {

+			return nil, types.NotFoundErrorf(err.Error())

+		}

 		return nil, err

 	}

 	c.Lock()

 	defer c.Unlock()

 	d, ok := c.drivers[networkType]

 	if !ok {

-		return nil, ErrInvalidNetworkDriver

+		return nil, ErrInvalidNetworkDriver(networkType)

 	}

 	return d, nil

 }

@@ -1,24 +1,11 @@

 package driverapi

 import (

-	"errors"

-	"fmt"

 	"net"

 	"github.com/docker/libnetwork/types"

 )

-var (

-	// ErrEndpointExists is returned if more than one endpoint is added to the network

-	ErrEndpointExists = errors.New("Endpoint already exists (Only one endpoint allowed)")

-	// ErrNoNetwork is returned if no network with the specified id exists

-	ErrNoNetwork = errors.New("No network exists")

-	// ErrNoEndpoint is returned if no endpoint with the specified id exists

-	ErrNoEndpoint = errors.New("No endpoint exists")

-	// ErrNotImplemented is returned when a Driver has not implemented an API yet

-	ErrNotImplemented = errors.New("The API is not implemented yet")

-)

-

 // NetworkPluginEndpointType represents the Endpoint Type used by Plugin system

 const NetworkPluginEndpointType = "NetworkDriver"

@@ -124,14 +111,6 @@ type JoinInfo interface {

 	SetResolvConfPath(string) error

 }

-// ErrActiveRegistration represents an error when a driver is registered to a networkType that is previously registered

-type ErrActiveRegistration string

-

-// Error interface for ErrActiveRegistration

-func (ar ErrActiveRegistration) Error() string {

-	return fmt.Sprintf("Driver already registered for type %q", string(ar))

-}

-

 // DriverCallback provides a Callback interface for Drivers into LibNetwork

 type DriverCallback interface {

 	// RegisterDriver provides a way for Remote drivers to dynamically register new NetworkType and associate with a driver instance

new file mode 100644

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

+package driverapi

+

+import (

+	"fmt"

+)

+

+// ErrNoNetwork is returned if no network with the specified id exists

+type ErrNoNetwork string

+

+func (enn ErrNoNetwork) Error() string {

+	return fmt.Sprintf("No network (%s) exists", string(enn))

+}

+

+// NotFound denotes the type of this error

+func (enn ErrNoNetwork) NotFound() {}

+

+// ErrEndpointExists is returned if more than one endpoint is added to the network

+type ErrEndpointExists string

+

+func (ee ErrEndpointExists) Error() string {

+	return fmt.Sprintf("Endpoint (%s) already exists (Only one endpoint allowed)", string(ee))

+}

+

+// Forbidden denotes the type of this error

+func (ee ErrEndpointExists) Forbidden() {}

+

+// ErrNotImplemented is returned when a Driver has not implemented an API yet

+type ErrNotImplemented struct{}

+

+func (eni *ErrNotImplemented) Error() string {

+	return "The API is not implemented yet"

+}

+

+// NotImplemented denotes the type of this error

+func (eni *ErrNotImplemented) NotImplemented() {}

+

+// ErrNoEndpoint is returned if no endpoint with the specified id exists

+type ErrNoEndpoint string

+

+func (ene ErrNoEndpoint) Error() string {

+	return fmt.Sprintf("No endpoint (%s) exists", string(ene))

+}

+

+// NotFound denotes the type of this error

+func (ene ErrNoEndpoint) NotFound() {}

+

+// ErrActiveRegistration represents an error when a driver is registered to a networkType that is previously registered

+type ErrActiveRegistration string

+

+// Error interface for ErrActiveRegistration

+func (ar ErrActiveRegistration) Error() string {

+	return fmt.Sprintf("Driver already registered for type %q", string(ar))

+}

+

+// Forbidden denotes the type of this error

+func (ar ErrActiveRegistration) Forbidden() {}

@@ -109,7 +109,7 @@ func Init(dc driverapi.DriverCallback) error {

 // Whatever can be assessed a priori before attempting any programming.

 func (c *NetworkConfiguration) Validate() error {

 	if c.Mtu < 0 {

-		return ErrInvalidMtu

+		return ErrInvalidMtu(c.Mtu)

 	}

 	// If bridge v4 subnet is specified

@@ -118,19 +118,19 @@ func (c *NetworkConfiguration) Validate() error {

 		if c.FixedCIDR != nil {

 			// Check Network address

 			if !c.AddressIPv4.Contains(c.FixedCIDR.IP) {

-				return ErrInvalidContainerSubnet

+				return &ErrInvalidContainerSubnet{}

 			}

 			// Check it is effectively a subset

 			brNetLen, _ := c.AddressIPv4.Mask.Size()

 			cnNetLen, _ := c.FixedCIDR.Mask.Size()

 			if brNetLen > cnNetLen {

-				return ErrInvalidContainerSubnet

+				return &ErrInvalidContainerSubnet{}

 			}

 		}

 		// If default gw is specified, it must be part of bridge subnet

 		if c.DefaultGatewayIPv4 != nil {

 			if !c.AddressIPv4.Contains(c.DefaultGatewayIPv4) {

-				return ErrInvalidGateway

+				return &ErrInvalidGateway{}

 			}

 		}

 	}

@@ -138,7 +138,7 @@ func (c *NetworkConfiguration) Validate() error {

 	// If default v6 gw is specified, FixedCIDRv6 must be specified and gw must belong to FixedCIDRv6 subnet

 	if c.EnableIPv6 && c.DefaultGatewayIPv6 != nil {

 		if c.FixedCIDRv6 == nil || !c.FixedCIDRv6.Contains(c.DefaultGatewayIPv6) {

-			return ErrInvalidGateway

+			return &ErrInvalidGateway{}

 		}

 	}

@@ -167,7 +167,7 @@ func (d *driver) Config(option map[string]interface{}) error {

 	defer d.Unlock()

 	if d.config != nil {

-		return ErrConfigExists

+		return &ErrConfigExists{}

 	}

 	genericData, ok := option[netlabel.GenericData]

@@ -182,7 +182,7 @@ func (d *driver) Config(option map[string]interface{}) error {

 		case *Configuration:

 			config = opt

 		default:

-			return ErrInvalidDriverConfig

+			return &ErrInvalidDriverConfig{}

 		}

 		d.config = config

@@ -220,7 +220,7 @@ func parseNetworkOptions(option options.Generic) (*NetworkConfiguration, error)

 		case *NetworkConfiguration:

 			config = opt

 		default:

-			return nil, ErrInvalidNetworkConfig

+			return nil, &ErrInvalidNetworkConfig{}

 		}

 		if err := config.Validate(); err != nil {

@@ -247,7 +247,7 @@ func (d *driver) CreateNetwork(id types.UUID, option map[string]interface{}) err

 	// Sanity checks

 	if d.network != nil {

 		d.Unlock()

-		return ErrNetworkExists

+		return &ErrNetworkExists{}

 	}

 	// Create and set network handler in driver

@@ -361,7 +361,7 @@ func (d *driver) DeleteNetwork(nid types.UUID) error {

 	// Sanity check

 	if n == nil {

-		err = driverapi.ErrNoNetwork

+		err = driverapi.ErrNoNetwork(nid)

 		return err

 	}

@@ -397,7 +397,7 @@ func (d *driver) CreateEndpoint(nid, eid types.UUID, epInfo driverapi.EndpointIn

 	config := n.config

 	d.Unlock()

 	if n == nil {

-		return driverapi.ErrNoNetwork

+		return driverapi.ErrNoNetwork(nid)

 	}

 	// Sanity check

@@ -416,7 +416,7 @@ func (d *driver) CreateEndpoint(nid, eid types.UUID, epInfo driverapi.EndpointIn

 	// Endpoint with that id exists either on desired or other sandbox

 	if ep != nil {

-		return driverapi.ErrEndpointExists

+		return driverapi.ErrEndpointExists(eid)

 	}

 	// Try to convert the options to endpoint configuration

@@ -578,7 +578,7 @@ func (d *driver) DeleteEndpoint(nid, eid types.UUID) error {

 	config := n.config

 	d.Unlock()

 	if n == nil {

-		return driverapi.ErrNoNetwork

+		return driverapi.ErrNoNetwork(nid)

 	}

 	// Sanity Check

@@ -648,7 +648,7 @@ func (d *driver) EndpointOperInfo(nid, eid types.UUID) (map[string]interface{},

 	n := d.network

 	d.Unlock()

 	if n == nil {

-		return nil, driverapi.ErrNoNetwork

+		return nil, driverapi.ErrNoNetwork(nid)

 	}

 	// Sanity check

@@ -665,7 +665,7 @@ func (d *driver) EndpointOperInfo(nid, eid types.UUID) (map[string]interface{},

 		return nil, err

 	}

 	if ep == nil {

-		return nil, driverapi.ErrNoEndpoint

+		return nil, driverapi.ErrNoEndpoint(eid)

 	}

 	m := make(map[string]interface{})

@@ -856,7 +856,7 @@ func parseEndpointOptions(epOptions map[string]interface{}) (*EndpointConfigurat

 		if mac, ok := opt.(net.HardwareAddr); ok {

 			ec.MacAddress = mac

 		} else {

-			return nil, ErrInvalidEndpointConfig

+			return nil, &ErrInvalidEndpointConfig{}

 		}

 	}

@@ -864,7 +864,7 @@ func parseEndpointOptions(epOptions map[string]interface{}) (*EndpointConfigurat

 		if bs, ok := opt.([]types.PortBinding); ok {

 			ec.PortBindings = bs

 		} else {

-			return nil, ErrInvalidEndpointConfig

+			return nil, &ErrInvalidEndpointConfig{}

 		}

 	}

@@ -872,7 +872,7 @@ func parseEndpointOptions(epOptions map[string]interface{}) (*EndpointConfigurat

 		if ports, ok := opt.([]types.TransportPort); ok {

 			ec.ExposedPorts = ports

 		} else {

-			return nil, ErrInvalidEndpointConfig

+			return nil, &ErrInvalidEndpointConfig{}

 		}

 	}

@@ -924,5 +924,5 @@ func generateIfaceName() (string, error) {

 			return "", err

 		}

 	}

-	return "", ErrIfaceName

+	return "", &ErrIfaceName{}

 }

deleted file mode 100644

@@ -1,201 +0,0 @@

-package bridge

-

-import (

-	"errors"

-	"fmt"

-	"net"

-)

-

-var (

-	// ErrConfigExists error is returned when driver already has a config applied.

-	ErrConfigExists = errors.New("configuration already exists, bridge configuration can be applied only once")

-

-	// ErrInvalidDriverConfig error is returned when Bridge Driver is passed an invalid config

-	ErrInvalidDriverConfig = errors.New("Invalid configuration passed to Bridge Driver")

-

-	// ErrInvalidNetworkConfig error is returned when a network is created on a driver without valid config.

-	ErrInvalidNetworkConfig = errors.New("trying to create a network on a driver without valid config")

-

-	// ErrInvalidContainerConfig error is returned when a endpoint create is attempted with an invalid configuration.

-	ErrInvalidContainerConfig = errors.New("Error in joining a container due to invalid configuration")

-

-	// ErrInvalidEndpointConfig error is returned when a endpoint create is attempted with an invalid endpoint configuration.

-	ErrInvalidEndpointConfig = errors.New("trying to create an endpoint with an invalid endpoint configuration")

-

-	// ErrNetworkExists error is returned when a network already exists and another network is created.

-	ErrNetworkExists = errors.New("network already exists, bridge can only have one network")

-

-	// ErrIfaceName error is returned when a new name could not be generated.

-	ErrIfaceName = errors.New("failed to find name for new interface")

-

-	// ErrNoIPAddr error is returned when bridge has no IPv4 address configured.

-	ErrNoIPAddr = errors.New("bridge has no IPv4 address configured")

-

-	// ErrInvalidGateway is returned when the user provided default gateway (v4/v6) is not not valid.

-	ErrInvalidGateway = errors.New("default gateway ip must be part of the network")

-

-	// ErrInvalidContainerSubnet is returned when the container subnet (FixedCIDR) is not valid.

-	ErrInvalidContainerSubnet = errors.New("container subnet must be a subset of bridge network")

-

-	// ErrInvalidMtu is returned when the user provided MTU is not valid.

-	ErrInvalidMtu = errors.New("invalid MTU number")

-

-	// ErrIPFwdCfg is returned when ip forwarding setup is invoked when the configuration

-	// not enabled.

-	ErrIPFwdCfg = errors.New("unexpected request to enable IP Forwarding")

-)

-

-// ErrInvalidPort is returned when the container or host port specified in the port binding is not valid.

-type ErrInvalidPort string

-

-func (ip ErrInvalidPort) Error() string {

-	return fmt.Sprintf("invalid transport port: %s", string(ip))

-}

-

-// ErrUnsupportedAddressType is returned when the specified address type is not supported.

-type ErrUnsupportedAddressType string

-

-func (uat ErrUnsupportedAddressType) Error() string {

-	return fmt.Sprintf("unsupported address type: %s", string(uat))

-}

-

-// ErrInvalidAddressBinding is returned when the host address specified in the port binding is not valid.

-type ErrInvalidAddressBinding string

-

-func (iab ErrInvalidAddressBinding) Error() string {

-	return fmt.Sprintf("invalid host address in port binding: %s", string(iab))

-}

-

-// ActiveEndpointsError is returned when there are

-// still active endpoints in the network being deleted.

-type ActiveEndpointsError string

-

-func (aee ActiveEndpointsError) Error() string {

-	return fmt.Sprintf("network %s has active endpoint", string(aee))

-}

-

-// InvalidNetworkIDError is returned when the passed

-// network id for an existing network is not a known id.

-type InvalidNetworkIDError string

-

-func (inie InvalidNetworkIDError) Error() string {

-	return fmt.Sprintf("invalid network id %s", string(inie))

-}

-

-// InvalidEndpointIDError is returned when the passed

-// endpoint id is not valid.

-type InvalidEndpointIDError string

-

-func (ieie InvalidEndpointIDError) Error() string {

-	return fmt.Sprintf("invalid endpoint id: %s", string(ieie))

-}

-

-// InvalidSandboxIDError is returned when the passed

-// sandbox id valid.

-type InvalidSandboxIDError string

-

-func (isie InvalidSandboxIDError) Error() string {

-	return fmt.Sprintf("invalid sanbox id: %s", string(isie))

-}

-

-// EndpointNotFoundError is returned when the no endpoint

-// with the passed endpoint id is found.

-type EndpointNotFoundError string

-

-func (enfe EndpointNotFoundError) Error() string {

-	return fmt.Sprintf("endpoint not found: %s", string(enfe))

-}

-

-// NonDefaultBridgeExistError is returned when a non-default

-// bridge config is passed but it does not already exist.

-type NonDefaultBridgeExistError string

-

-func (ndbee NonDefaultBridgeExistError) Error() string {

-	return fmt.Sprintf("bridge device with non default name %s must be created manually", string(ndbee))

-}

-

-// FixedCIDRv4Error is returned when fixed-cidrv4 configuration

-// failed.

-type FixedCIDRv4Error struct {

-	net    *net.IPNet

-	subnet *net.IPNet

-	err    error

-}

-

-func (fcv4 *FixedCIDRv4Error) Error() string {

-	return fmt.Sprintf("setup FixedCIDRv4 failed for subnet %s in %s: %v", fcv4.subnet, fcv4.net, fcv4.err)

-}

-

-// FixedCIDRv6Error is returned when fixed-cidrv6 configuration

-// failed.

-type FixedCIDRv6Error struct {

-	net *net.IPNet

-	err error

-}

-

-func (fcv6 *FixedCIDRv6Error) Error() string {

-	return fmt.Sprintf("setup FixedCIDRv6 failed for subnet %s in %s: %v", fcv6.net, fcv6.net, fcv6.err)

-}

-

-type ipTableCfgError string

-

-func (name ipTableCfgError) Error() string {

-	return fmt.Sprintf("unexpected request to set IP tables for interface: %s", string(name))

-}

-

-type invalidIPTablesCfgError string

-

-func (action invalidIPTablesCfgError) Error() string {

-	return fmt.Sprintf("Invalid IPTables action '%s'", string(action))

-}

-

-// IPv4AddrRangeError is returned when a valid IP address range couldn't be found.

-type IPv4AddrRangeError string

-

-func (name IPv4AddrRangeError) Error() string {

-	return fmt.Sprintf("can't find an address range for interface %q", string(name))

-}

-

-// IPv4AddrAddError is returned when IPv4 address could not be added to the bridge.

-type IPv4AddrAddError struct {

-	ip  *net.IPNet

-	err error

-}

-

-func (ipv4 *IPv4AddrAddError) Error() string {

-	return fmt.Sprintf("failed to add IPv4 address %s to bridge: %v", ipv4.ip, ipv4.err)

-}

-

-// IPv6AddrAddError is returned when IPv6 address could not be added to the bridge.

-type IPv6AddrAddError struct {

-	ip  *net.IPNet

-	err error

-}

-

-func (ipv6 *IPv6AddrAddError) Error() string {

-	return fmt.Sprintf("failed to add IPv6 address %s to bridge: %v", ipv6.ip, ipv6.err)

-}

-

-// IPv4AddrNoMatchError is returned when the bridge's IPv4 address does not match configured.

-type IPv4AddrNoMatchError struct {

-	ip    net.IP

-	cfgIP net.IP

-}

-

-func (ipv4 *IPv4AddrNoMatchError) Error() string {

-	return fmt.Sprintf("bridge IPv4 (%s) does not match requested configuration %s", ipv4.ip, ipv4.cfgIP)

-}

-

-// IPv6AddrNoMatchError is returned when the bridge's IPv6 address does not match configured.

-type IPv6AddrNoMatchError net.IPNet

-

-func (ipv6 *IPv6AddrNoMatchError) Error() string {

-	return fmt.Sprintf("bridge IPv6 addresses do not match the expected bridge configuration %s", (*net.IPNet)(ipv6).String())

-}

-

-// InvalidLinkIPAddrError is returned when a link is configured to a container with an invalid ip address

-type InvalidLinkIPAddrError string

-

-func (address InvalidLinkIPAddrError) Error() string {

-	return fmt.Sprintf("Cannot link to a container with Invalid IP Address '%s'", string(address))

-}

new file mode 100644

@@ -0,0 +1,341 @@

+package bridge

+

+import (

+	"fmt"

+	"net"

+)

+

+// ErrConfigExists error is returned when driver already has a config applied.

+type ErrConfigExists struct{}

+

+func (ece *ErrConfigExists) Error() string {

+	return "configuration already exists, bridge configuration can be applied only once"

+}

+

+// Forbidden denotes the type of this error

+func (ece *ErrConfigExists) Forbidden() {}

+

+// ErrInvalidDriverConfig error is returned when Bridge Driver is passed an invalid config

+type ErrInvalidDriverConfig struct{}

+

+func (eidc *ErrInvalidDriverConfig) Error() string {

+	return "Invalid configuration passed to Bridge Driver"

+}

+

+// BadRequest denotes the type of this error

+func (eidc *ErrInvalidDriverConfig) BadRequest() {}

+

+// ErrInvalidNetworkConfig error is returned when a network is created on a driver without valid config.

+type ErrInvalidNetworkConfig struct{}

+

+func (einc *ErrInvalidNetworkConfig) Error() string {

+	return "trying to create a network on a driver without valid config"

+}

+

+// Forbidden denotes the type of this error

+func (einc *ErrInvalidNetworkConfig) Forbidden() {}

+

+// ErrInvalidContainerConfig error is returned when a endpoint create is attempted with an invalid configuration.

+type ErrInvalidContainerConfig struct{}

+

+func (eicc *ErrInvalidContainerConfig) Error() string {

+	return "Error in joining a container due to invalid configuration"

+}

+

+// BadRequest denotes the type of this error

+func (eicc *ErrInvalidContainerConfig) BadRequest() {}

+

+// ErrInvalidEndpointConfig error is returned when a endpoint create is attempted with an invalid endpoint configuration.

+type ErrInvalidEndpointConfig struct{}

+

+func (eiec *ErrInvalidEndpointConfig) Error() string {

+	return "trying to create an endpoint with an invalid endpoint configuration"

+}

+

+// BadRequest denotes the type of this error

+func (eiec *ErrInvalidEndpointConfig) BadRequest() {}

+

+// ErrNetworkExists error is returned when a network already exists and another network is created.

+type ErrNetworkExists struct{}

+

+func (ene *ErrNetworkExists) Error() string {

+	return "network already exists, bridge can only have one network"

+}

+

+// Forbidden denotes the type of this error

+func (ene *ErrNetworkExists) Forbidden() {}

+

+// ErrIfaceName error is returned when a new name could not be generated.

+type ErrIfaceName struct{}

+

+func (ein *ErrIfaceName) Error() string {

+	return "failed to find name for new interface"

+}

+

+// InternalError denotes the type of this error

+func (ein *ErrIfaceName) InternalError() {}

+

+// ErrNoIPAddr error is returned when bridge has no IPv4 address configured.

+type ErrNoIPAddr struct{}

+

+func (enip *ErrNoIPAddr) Error() string {

+	return "bridge has no IPv4 address configured"

+}

+

+// InternalError denotes the type of this error

+func (enip *ErrNoIPAddr) InternalError() {}

+

+// ErrInvalidGateway is returned when the user provided default gateway (v4/v6) is not not valid.

+type ErrInvalidGateway struct{}

+

+func (eig *ErrInvalidGateway) Error() string {

+	return "default gateway ip must be part of the network"

+}

+

+// BadRequest denotes the type of this error

+func (eig *ErrInvalidGateway) BadRequest() {}

+

+// ErrInvalidContainerSubnet is returned when the container subnet (FixedCIDR) is not valid.

+type ErrInvalidContainerSubnet struct{}

+

+func (eis *ErrInvalidContainerSubnet) Error() string {

+	return "container subnet must be a subset of bridge network"

+}

+

+// BadRequest denotes the type of this error

+func (eis *ErrInvalidContainerSubnet) BadRequest() {}

+

+// ErrInvalidMtu is returned when the user provided MTU is not valid.

+type ErrInvalidMtu int

+

+func (eim ErrInvalidMtu) Error() string {

+	return fmt.Sprintf("invalid MTU number: %d", int(eim))

+}

+

+// BadRequest denotes the type of this error

+func (eim ErrInvalidMtu) BadRequest() {}

+

+// ErrIPFwdCfg is returned when ip forwarding setup is invoked when the configuration

+// not enabled.

+type ErrIPFwdCfg struct{}

+

+func (eipf *ErrIPFwdCfg) Error() string {

+	return "unexpected request to enable IP Forwarding"

+}

+

+// BadRequest denotes the type of this error

+func (eipf *ErrIPFwdCfg) BadRequest() {}

+

+// ErrInvalidPort is returned when the container or host port specified in the port binding is not valid.

+type ErrInvalidPort string

+

+func (ip ErrInvalidPort) Error() string {

+	return fmt.Sprintf("invalid transport port: %s", string(ip))

+}

+

+// BadRequest denotes the type of this error

+func (ip ErrInvalidPort) BadRequest() {}

+

+// ErrUnsupportedAddressType is returned when the specified address type is not supported.

+type ErrUnsupportedAddressType string

+

+func (uat ErrUnsupportedAddressType) Error() string {

+	return fmt.Sprintf("unsupported address type: %s", string(uat))

+}

+

+// BadRequest denotes the type of this error

+func (uat ErrUnsupportedAddressType) BadRequest() {}

+

+// ErrInvalidAddressBinding is returned when the host address specified in the port binding is not valid.

+type ErrInvalidAddressBinding string

+

+func (iab ErrInvalidAddressBinding) Error() string {

+	return fmt.Sprintf("invalid host address in port binding: %s", string(iab))

+}

+

+// BadRequest denotes the type of this error

+func (iab ErrInvalidAddressBinding) BadRequest() {}

+

+// ActiveEndpointsError is returned when there are

+// still active endpoints in the network being deleted.

+type ActiveEndpointsError string

+

+func (aee ActiveEndpointsError) Error() string {

+	return fmt.Sprintf("network %s has active endpoint", string(aee))

+}

+

+// Forbidden denotes the type of this error

+func (aee ActiveEndpointsError) Forbidden() {}

+

+// InvalidNetworkIDError is returned when the passed

+// network id for an existing network is not a known id.

+type InvalidNetworkIDError string

+

+func (inie InvalidNetworkIDError) Error() string {

+	return fmt.Sprintf("invalid network id %s", string(inie))

+}

+

+// NotFound denotes the type of this error

+func (inie InvalidNetworkIDError) NotFound() {}

+

+// InvalidEndpointIDError is returned when the passed

+// endpoint id is not valid.

+type InvalidEndpointIDError string

+

+func (ieie InvalidEndpointIDError) Error() string {