Skip to content

Commit ccc2ed0

Browse files
yongtangyongtang
committed
Rename FindUniqueNetwork to FindNetwork
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>
1 parent 947eb28 commit ccc2ed0

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

‎api/server/router/network/backend.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
// Backend is all the methods that need to be implemented
1313
// to provide network specific functionality.
1414
type Backend interface {
15-
FindUniqueNetwork(idName string) (libnetwork.Network, error)
15+
FindNetwork(idName string) (libnetwork.Network, error)
1616
GetNetworks() []libnetwork.Network
1717
CreateNetwork(nc types.NetworkCreateRequest) (*types.NetworkCreateResponse, error)
1818
ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error

‎api/server/router/network/network_routes.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ func (n *networkRouter) postNetworkConnect(ctx context.Context, w http.ResponseW
290290
}
291291

292292
// 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"])
294294
if err != nil {
295295
return err
296296
}
@@ -530,7 +530,7 @@ func (n *networkRouter) postNetworksPrune(ctx context.Context, w http.ResponseWr
530530
}
531531

532532
// 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.
534534
// In case multiple networks have duplicate names, return error.
535535
// First find based on full ID, return immediately once one is found.
536536
// If a network appears both in swarm and local, assume it is in local first

‎daemon/cluster/executor/backend.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
type Backend interface {
2929
CreateManagedNetwork(clustertypes.NetworkCreateRequest) error
3030
DeleteManagedNetwork(networkID string) error
31-
FindUniqueNetwork(idName string) (libnetwork.Network, error)
31+
FindNetwork(idName string) (libnetwork.Network, error)
3232
SetupIngress(clustertypes.NetworkCreateRequest, string) (<-chan struct{}, error)
3333
ReleaseIngress() (<-chan struct{}, error)
3434
PullImage(ctx context.Context, image, tag, platform string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error

‎daemon/cluster/executor/container/container.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ func getEndpointConfig(na *api.NetworkAttachment, b executorpkg.Backend) *networ
507507
DriverOpts: na.DriverAttachmentOpts,
508508
}
509509
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 {
511511
n.NetworkID = ln.ID()
512512
}
513513
}

‎daemon/cluster/networks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ func (c *Cluster) populateNetworkID(ctx context.Context, client swarmapi.Control
292292
for i, n := range networks {
293293
apiNetwork, err := getNetwork(ctx, client, n.Target)
294294
if err != nil {
295-
ln, _ := c.config.Backend.FindUniqueNetwork(n.Target)
295+
ln, _ := c.config.Backend.FindNetwork(n.Target)
296296
if ln != nil && runconfig.IsPreDefinedNetwork(ln.Name()) {
297297
// Need to retrieve the corresponding predefined swarm network
298298
// and use its id for the request.

‎daemon/container_operations.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func (daemon *Daemon) updateNetworkSettings(container *container.Container, n li
252252
}
253253

254254
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))
256256
if err != nil {
257257
continue
258258
}
@@ -309,7 +309,7 @@ func (daemon *Daemon) updateNetwork(container *container.Container) error {
309309
// Find if container is connected to the default bridge network
310310
var n libnetwork.Network
311311
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))
313313
if err != nil {
314314
continue
315315
}
@@ -339,7 +339,7 @@ func (daemon *Daemon) updateNetwork(container *container.Container) error {
339339
}
340340

341341
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))
343343
if err != nil {
344344
// We should always be able to find the network for a
345345
// managed container.
@@ -383,7 +383,7 @@ func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrN
383383
}
384384
}
385385

386-
n, err = daemon.FindUniqueNetwork(getNetworkID(idOrName, epConfig))
386+
n, err = daemon.FindNetwork(getNetworkID(idOrName, epConfig))
387387
if err != nil {
388388
if daemon.clusterProvider != nil {
389389
if err := daemon.clusterProvider.DetachNetwork(getNetworkID(idOrName, epConfig), container.ID); err != nil {
@@ -437,7 +437,7 @@ func (daemon *Daemon) updateContainerNetworkSettings(container *container.Contai
437437
if mode.IsUserDefined() {
438438
var err error
439439

440-
n, err = daemon.FindUniqueNetwork(networkName)
440+
n, err = daemon.FindNetwork(networkName)
441441
if err == nil {
442442
networkName = n.Name()
443443
}
@@ -797,7 +797,7 @@ func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName
797797

798798
// ForceEndpointDelete deletes an endpoint from a network forcefully
799799
func (daemon *Daemon) ForceEndpointDelete(name string, networkName string) error {
800-
n, err := daemon.FindUniqueNetwork(networkName)
800+
n, err := daemon.FindNetwork(networkName)
801801
if err != nil {
802802
return err
803803
}
@@ -949,7 +949,7 @@ func (daemon *Daemon) releaseNetwork(container *container.Container) {
949949

950950
var networks []libnetwork.Network
951951
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 {
953953
networks = append(networks, nw)
954954
}
955955

@@ -993,7 +993,7 @@ func (daemon *Daemon) ConnectToNetwork(container *container.Container, idOrName
993993
return errRemovalContainer(container.ID)
994994
}
995995

996-
n, err := daemon.FindUniqueNetwork(idOrName)
996+
n, err := daemon.FindNetwork(idOrName)
997997
if err == nil && n != nil {
998998
if err := daemon.updateNetworkConfig(container, n, endpointConfig, true); err != nil {
999999
return err
@@ -1016,7 +1016,7 @@ func (daemon *Daemon) ConnectToNetwork(container *container.Container, idOrName
10161016

10171017
// DisconnectFromNetwork disconnects container from network n.
10181018
func (daemon *Daemon) DisconnectFromNetwork(container *container.Container, networkName string, force bool) error {
1019-
n, err := daemon.FindUniqueNetwork(networkName)
1019+
n, err := daemon.FindNetwork(networkName)
10201020
container.Lock()
10211021
defer container.Unlock()
10221022

‎daemon/container_operations_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func (daemon *Daemon) initializeNetworkingPaths(container *container.Container,
170170

171171
if nc.NetworkSettings != nil {
172172
for n := range nc.NetworkSettings.Networks {
173-
sn, err := daemon.FindUniqueNetwork(n)
173+
sn, err := daemon.FindNetwork(n)
174174
if err != nil {
175175
continue
176176
}

‎daemon/daemon_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ func TestValidateContainerIsolation(t *testing.T) {
317317

318318
func TestFindNetworkErrorType(t *testing.T) {
319319
d := Daemon{}
320-
_, err := d.FindUniqueNetwork("fakeNet")
320+
_, err := d.FindNetwork("fakeNet")
321321
_, ok := errors.Cause(err).(libnetwork.ErrNoSuchNetwork)
322322
if !errdefs.IsNotFound(err) || !ok {
323323
assert.Fail(t, "The FindNetwork method MUST always return an error that implements the NotFound interface and is ErrNoSuchNetwork")

‎daemon/network.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ func (daemon *Daemon) NetworkControllerEnabled() bool {
2929
return daemon.netController != nil
3030
}
3131

32-
// FindUniqueNetwork returns a network based on:
32+
// FindNetwork returns a network based on:
3333
// 1. Full ID
3434
// 2. Full Name
3535
// 3. Partial ID
3636
// 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) {
3838
listByFullName := []libnetwork.Network{}
3939
listByPartialID := []libnetwork.Network{}
4040
for _, nw := range daemon.GetNetworks() {

‎daemon/oci_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
159159
gwHNSID := ""
160160
if c.NetworkSettings != nil {
161161
for n := range c.NetworkSettings.Networks {
162-
sn, err := daemon.FindUniqueNetwork(n)
162+
sn, err := daemon.FindNetwork(n)
163163
if err != nil {
164164
continue
165165
}

0 commit comments

Comments
 (0)