This fix is a follow up to 30397, with `FindUniqueNetwork`
changed to `FindNetwork` based on the review feedback.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
... | ... |
@@ -12,7 +12,7 @@ import ( |
12 | 12 |
// Backend is all the methods that need to be implemented |
13 | 13 |
// to provide network specific functionality. |
14 | 14 |
type Backend interface { |
15 |
- FindUniqueNetwork(idName string) (libnetwork.Network, error) |
|
15 |
+ FindNetwork(idName string) (libnetwork.Network, error) |
|
16 | 16 |
GetNetworks() []libnetwork.Network |
17 | 17 |
CreateNetwork(nc types.NetworkCreateRequest) (*types.NetworkCreateResponse, error) |
18 | 18 |
ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error |
... | ... |
@@ -290,7 +290,7 @@ func (n *networkRouter) postNetworkConnect(ctx context.Context, w http.ResponseW |
290 | 290 |
} |
291 | 291 |
|
292 | 292 |
// Always make sure there is no ambiguity with respect to the network ID/name |
293 |
- nw, err := n.backend.FindUniqueNetwork(vars["id"]) |
|
293 |
+ nw, err := n.backend.FindNetwork(vars["id"]) |
|
294 | 294 |
if err != nil { |
295 | 295 |
return err |
296 | 296 |
} |
... | ... |
@@ -530,7 +530,7 @@ func (n *networkRouter) postNetworksPrune(ctx context.Context, w http.ResponseWr |
530 | 530 |
} |
531 | 531 |
|
532 | 532 |
// findUniqueNetwork will search network across different scopes (both local and swarm). |
533 |
-// NOTE: This findUniqueNetwork is different from FindUniqueNetwork in the daemon. |
|
533 |
+// NOTE: This findUniqueNetwork is different from FindNetwork in the daemon. |
|
534 | 534 |
// In case multiple networks have duplicate names, return error. |
535 | 535 |
// First find based on full ID, return immediately once one is found. |
536 | 536 |
// If a network appears both in swarm and local, assume it is in local first |
... | ... |
@@ -28,7 +28,7 @@ import ( |
28 | 28 |
type Backend interface { |
29 | 29 |
CreateManagedNetwork(clustertypes.NetworkCreateRequest) error |
30 | 30 |
DeleteManagedNetwork(networkID string) error |
31 |
- FindUniqueNetwork(idName string) (libnetwork.Network, error) |
|
31 |
+ FindNetwork(idName string) (libnetwork.Network, error) |
|
32 | 32 |
SetupIngress(clustertypes.NetworkCreateRequest, string) (<-chan struct{}, error) |
33 | 33 |
ReleaseIngress() (<-chan struct{}, error) |
34 | 34 |
PullImage(ctx context.Context, image, tag, platform string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error |
... | ... |
@@ -507,7 +507,7 @@ func getEndpointConfig(na *api.NetworkAttachment, b executorpkg.Backend) *networ |
507 | 507 |
DriverOpts: na.DriverAttachmentOpts, |
508 | 508 |
} |
509 | 509 |
if v, ok := na.Network.Spec.Annotations.Labels["com.docker.swarm.predefined"]; ok && v == "true" { |
510 |
- if ln, err := b.FindUniqueNetwork(na.Network.Spec.Annotations.Name); err == nil { |
|
510 |
+ if ln, err := b.FindNetwork(na.Network.Spec.Annotations.Name); err == nil { |
|
511 | 511 |
n.NetworkID = ln.ID() |
512 | 512 |
} |
513 | 513 |
} |
... | ... |
@@ -292,7 +292,7 @@ func (c *Cluster) populateNetworkID(ctx context.Context, client swarmapi.Control |
292 | 292 |
for i, n := range networks { |
293 | 293 |
apiNetwork, err := getNetwork(ctx, client, n.Target) |
294 | 294 |
if err != nil { |
295 |
- ln, _ := c.config.Backend.FindUniqueNetwork(n.Target) |
|
295 |
+ ln, _ := c.config.Backend.FindNetwork(n.Target) |
|
296 | 296 |
if ln != nil && runconfig.IsPreDefinedNetwork(ln.Name()) { |
297 | 297 |
// Need to retrieve the corresponding predefined swarm network |
298 | 298 |
// and use its id for the request. |
... | ... |
@@ -252,7 +252,7 @@ func (daemon *Daemon) updateNetworkSettings(container *container.Container, n li |
252 | 252 |
} |
253 | 253 |
|
254 | 254 |
for s, v := range container.NetworkSettings.Networks { |
255 |
- sn, err := daemon.FindUniqueNetwork(getNetworkID(s, v.EndpointSettings)) |
|
255 |
+ sn, err := daemon.FindNetwork(getNetworkID(s, v.EndpointSettings)) |
|
256 | 256 |
if err != nil { |
257 | 257 |
continue |
258 | 258 |
} |
... | ... |
@@ -309,7 +309,7 @@ func (daemon *Daemon) updateNetwork(container *container.Container) error { |
309 | 309 |
// Find if container is connected to the default bridge network |
310 | 310 |
var n libnetwork.Network |
311 | 311 |
for name, v := range container.NetworkSettings.Networks { |
312 |
- sn, err := daemon.FindUniqueNetwork(getNetworkID(name, v.EndpointSettings)) |
|
312 |
+ sn, err := daemon.FindNetwork(getNetworkID(name, v.EndpointSettings)) |
|
313 | 313 |
if err != nil { |
314 | 314 |
continue |
315 | 315 |
} |
... | ... |
@@ -339,7 +339,7 @@ func (daemon *Daemon) updateNetwork(container *container.Container) error { |
339 | 339 |
} |
340 | 340 |
|
341 | 341 |
func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrName string, epConfig *networktypes.EndpointSettings) (libnetwork.Network, *networktypes.NetworkingConfig, error) { |
342 |
- n, err := daemon.FindUniqueNetwork(getNetworkID(idOrName, epConfig)) |
|
342 |
+ n, err := daemon.FindNetwork(getNetworkID(idOrName, epConfig)) |
|
343 | 343 |
if err != nil { |
344 | 344 |
// We should always be able to find the network for a |
345 | 345 |
// managed container. |
... | ... |
@@ -383,7 +383,7 @@ func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrN |
383 | 383 |
} |
384 | 384 |
} |
385 | 385 |
|
386 |
- n, err = daemon.FindUniqueNetwork(getNetworkID(idOrName, epConfig)) |
|
386 |
+ n, err = daemon.FindNetwork(getNetworkID(idOrName, epConfig)) |
|
387 | 387 |
if err != nil { |
388 | 388 |
if daemon.clusterProvider != nil { |
389 | 389 |
if err := daemon.clusterProvider.DetachNetwork(getNetworkID(idOrName, epConfig), container.ID); err != nil { |
... | ... |
@@ -437,7 +437,7 @@ func (daemon *Daemon) updateContainerNetworkSettings(container *container.Contai |
437 | 437 |
if mode.IsUserDefined() { |
438 | 438 |
var err error |
439 | 439 |
|
440 |
- n, err = daemon.FindUniqueNetwork(networkName) |
|
440 |
+ n, err = daemon.FindNetwork(networkName) |
|
441 | 441 |
if err == nil { |
442 | 442 |
networkName = n.Name() |
443 | 443 |
} |
... | ... |
@@ -797,7 +797,7 @@ func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName |
797 | 797 |
|
798 | 798 |
// ForceEndpointDelete deletes an endpoint from a network forcefully |
799 | 799 |
func (daemon *Daemon) ForceEndpointDelete(name string, networkName string) error { |
800 |
- n, err := daemon.FindUniqueNetwork(networkName) |
|
800 |
+ n, err := daemon.FindNetwork(networkName) |
|
801 | 801 |
if err != nil { |
802 | 802 |
return err |
803 | 803 |
} |
... | ... |
@@ -949,7 +949,7 @@ func (daemon *Daemon) releaseNetwork(container *container.Container) { |
949 | 949 |
|
950 | 950 |
var networks []libnetwork.Network |
951 | 951 |
for n, epSettings := range settings { |
952 |
- if nw, err := daemon.FindUniqueNetwork(getNetworkID(n, epSettings.EndpointSettings)); err == nil { |
|
952 |
+ if nw, err := daemon.FindNetwork(getNetworkID(n, epSettings.EndpointSettings)); err == nil { |
|
953 | 953 |
networks = append(networks, nw) |
954 | 954 |
} |
955 | 955 |
|
... | ... |
@@ -993,7 +993,7 @@ func (daemon *Daemon) ConnectToNetwork(container *container.Container, idOrName |
993 | 993 |
return errRemovalContainer(container.ID) |
994 | 994 |
} |
995 | 995 |
|
996 |
- n, err := daemon.FindUniqueNetwork(idOrName) |
|
996 |
+ n, err := daemon.FindNetwork(idOrName) |
|
997 | 997 |
if err == nil && n != nil { |
998 | 998 |
if err := daemon.updateNetworkConfig(container, n, endpointConfig, true); err != nil { |
999 | 999 |
return err |
... | ... |
@@ -1016,7 +1016,7 @@ func (daemon *Daemon) ConnectToNetwork(container *container.Container, idOrName |
1016 | 1016 |
|
1017 | 1017 |
// DisconnectFromNetwork disconnects container from network n. |
1018 | 1018 |
func (daemon *Daemon) DisconnectFromNetwork(container *container.Container, networkName string, force bool) error { |
1019 |
- n, err := daemon.FindUniqueNetwork(networkName) |
|
1019 |
+ n, err := daemon.FindNetwork(networkName) |
|
1020 | 1020 |
container.Lock() |
1021 | 1021 |
defer container.Unlock() |
1022 | 1022 |
|
... | ... |
@@ -170,7 +170,7 @@ func (daemon *Daemon) initializeNetworkingPaths(container *container.Container, |
170 | 170 |
|
171 | 171 |
if nc.NetworkSettings != nil { |
172 | 172 |
for n := range nc.NetworkSettings.Networks { |
173 |
- sn, err := daemon.FindUniqueNetwork(n) |
|
173 |
+ sn, err := daemon.FindNetwork(n) |
|
174 | 174 |
if err != nil { |
175 | 175 |
continue |
176 | 176 |
} |
... | ... |
@@ -317,7 +317,7 @@ func TestValidateContainerIsolation(t *testing.T) { |
317 | 317 |
|
318 | 318 |
func TestFindNetworkErrorType(t *testing.T) { |
319 | 319 |
d := Daemon{} |
320 |
- _, err := d.FindUniqueNetwork("fakeNet") |
|
320 |
+ _, err := d.FindNetwork("fakeNet") |
|
321 | 321 |
_, ok := errors.Cause(err).(libnetwork.ErrNoSuchNetwork) |
322 | 322 |
if !errdefs.IsNotFound(err) || !ok { |
323 | 323 |
assert.Fail(t, "The FindNetwork method MUST always return an error that implements the NotFound interface and is ErrNoSuchNetwork") |
... | ... |
@@ -29,12 +29,12 @@ func (daemon *Daemon) NetworkControllerEnabled() bool { |
29 | 29 |
return daemon.netController != nil |
30 | 30 |
} |
31 | 31 |
|
32 |
-// FindUniqueNetwork returns a network based on: |
|
32 |
+// FindNetwork returns a network based on: |
|
33 | 33 |
// 1. Full ID |
34 | 34 |
// 2. Full Name |
35 | 35 |
// 3. Partial ID |
36 | 36 |
// as long as there is no ambiguity |
37 |
-func (daemon *Daemon) FindUniqueNetwork(term string) (libnetwork.Network, error) { |
|
37 |
+func (daemon *Daemon) FindNetwork(term string) (libnetwork.Network, error) { |
|
38 | 38 |
listByFullName := []libnetwork.Network{} |
39 | 39 |
listByPartialID := []libnetwork.Network{} |
40 | 40 |
for _, nw := range daemon.GetNetworks() { |
... | ... |
@@ -159,7 +159,7 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) { |
159 | 159 |
gwHNSID := "" |
160 | 160 |
if c.NetworkSettings != nil { |
161 | 161 |
for n := range c.NetworkSettings.Networks { |
162 |
- sn, err := daemon.FindUniqueNetwork(n) |
|
162 |
+ sn, err := daemon.FindNetwork(n) |
|
163 | 163 |
if err != nil { |
164 | 164 |
continue |
165 | 165 |
} |