kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

improve error message when using ineligible network with service create

Browse source 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal 2016-07-23 08:11:10 -07:00
parent 19ec73b8b5
commit 40c88b8c54
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
daemon/cluster/cluster.go
View file

@ -810,7 +810,7 @@ func (c *Cluster) CreateService(s types.ServiceSpec, encodedAuth string) (string
ctx, cancel := c.getRequestContext() ctx, cancel := c.getRequestContext()
defer cancel() defer cancel()
err := populateNetworkID(ctx, c.client, &s) err := c.populateNetworkID(ctx, c.client, &s)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -867,7 +867,7 @@ func (c *Cluster) UpdateService(serviceID string, version uint64, spec types.Ser
ctx, cancel := c.getRequestContext() ctx, cancel := c.getRequestContext()
defer cancel() defer cancel()
err := populateNetworkID(ctx, c.client, &spec) err := c.populateNetworkID(ctx, c.client, &spec)
if err != nil { if err != nil {
return err return err
} }
@ -1208,10 +1208,14 @@ func (c *Cluster) RemoveNetwork(input string) error {
return nil return nil
} }
func populateNetworkID(ctx context.Context, c swarmapi.ControlClient, s *types.ServiceSpec) error { func (c *Cluster) populateNetworkID(ctx context.Context, client swarmapi.ControlClient, s *types.ServiceSpec) error {
for i, n := range s.Networks { for i, n := range s.Networks {
apiNetwork, err := getNetwork(ctx, c, n.Target) apiNetwork, err := getNetwork(ctx, client, n.Target)
if err != nil { if err != nil {
if ln, _ := c.config.Backend.FindNetwork(n.Target); ln != nil && !ln.Info().Dynamic() {
err = fmt.Errorf("network %s is not eligible for docker services", ln.Name())
return errors.NewRequestForbiddenError(err)
}
return err return err
} }
s.Networks[i].Target = apiNetwork.ID s.Networks[i].Target = apiNetwork.ID

2
daemon/cluster/executor/backend.go
View file

@ -10,6 +10,7 @@ import (
"github.com/docker/engine-api/types/events" "github.com/docker/engine-api/types/events"
"github.com/docker/engine-api/types/filters" "github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/network" "github.com/docker/engine-api/types/network"
"github.com/docker/libnetwork"
"github.com/docker/libnetwork/cluster" "github.com/docker/libnetwork/cluster"
networktypes "github.com/docker/libnetwork/types" networktypes "github.com/docker/libnetwork/types"
"golang.org/x/net/context" "golang.org/x/net/context"
@ -19,6 +20,7 @@ import (
type Backend interface { type Backend interface {
CreateManagedNetwork(clustertypes.NetworkCreateRequest) error CreateManagedNetwork(clustertypes.NetworkCreateRequest) error
DeleteManagedNetwork(name string) error DeleteManagedNetwork(name string) error
FindNetwork(idName string) (libnetwork.Network, error)
SetupIngress(req clustertypes.NetworkCreateRequest, nodeIP string) error SetupIngress(req clustertypes.NetworkCreateRequest, nodeIP string) error
PullImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error PullImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error
CreateManagedContainer(config types.ContainerCreateConfig, validateHostname bool) (types.ContainerCreateResponse, error) CreateManagedContainer(config types.ContainerCreateConfig, validateHostname bool) (types.ContainerCreateResponse, error)