beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46100 from thaJeztah/libnetwork_var_collide

Browse source 
libnetwork: rename vars that collided with builtin and type
This commit is contained in:
Sebastiaan van Stijn 2023-08-01 15:59:04 +02:00 committed by GitHub
commit a1202648ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libnetwork/network.go
View file

@ -891,7 +891,7 @@ func (n *Network) resolveDriver(name string, load bool) (driverapi.Driver, drive
c := n.getController() c := n.getController()
// Check if a driver for the specified network type is available // Check if a driver for the specified network type is available
d, cap := c.drvRegistry.Driver(name) d, capabilities := c.drvRegistry.Driver(name)
if d == nil { if d == nil {
if load { if load {
err := c.loadDriver(name) err := c.loadDriver(name)
@ -899,7 +899,7 @@ func (n *Network) resolveDriver(name string, load bool) (driverapi.Driver, drive
return nil, driverapi.Capability{}, err return nil, driverapi.Capability{}, err
} }
d, cap = c.drvRegistry.Driver(name) d, capabilities = c.drvRegistry.Driver(name)
if d == nil { if d == nil {
return nil, driverapi.Capability{}, fmt.Errorf("could not resolve driver %s in registry", name) return nil, driverapi.Capability{}, fmt.Errorf("could not resolve driver %s in registry", name)
} }
@ -909,19 +909,19 @@ func (n *Network) resolveDriver(name string, load bool) (driverapi.Driver, drive
} }
} }
return d, cap, nil return d, capabilities, nil
} }
func (n *Network) driverIsMultihost() bool { func (n *Network) driverIsMultihost() bool {
_, cap, err := n.resolveDriver(n.networkType, true) _, capabilities, err := n.resolveDriver(n.networkType, true)
if err != nil { if err != nil {
return false return false
} }
return cap.ConnectivityScope == scope.Global return capabilities.ConnectivityScope == scope.Global
} }
func (n *Network) driver(load bool) (driverapi.Driver, error) { func (n *Network) driver(load bool) (driverapi.Driver, error) {
d, cap, err := n.resolveDriver(n.networkType, load) d, capabilities, err := n.resolveDriver(n.networkType, load)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -929,7 +929,7 @@ func (n *Network) driver(load bool) (driverapi.Driver, error) {
n.mu.Lock() n.mu.Lock()
// If load is not required, driver, cap and err may all be nil // If load is not required, driver, cap and err may all be nil
if n.scope == "" { if n.scope == "" {
n.scope = cap.DataScope n.scope = capabilities.DataScope
} }
if n.dynamic { if n.dynamic {
// If the network is dynamic, then it is swarm // If the network is dynamic, then it is swarm
@ -1769,12 +1769,12 @@ func (n *Network) Peers() []networkdb.PeerInfo {
return []networkdb.PeerInfo{} return []networkdb.PeerInfo{}
} }
agent := n.getController().getAgent() a := n.getController().getAgent()
if agent == nil { if a == nil {
return []networkdb.PeerInfo{} return []networkdb.PeerInfo{}
} }
return agent.networkDB.Peers(n.ID()) return a.networkDB.Peers(n.ID())
} }
func (n *Network) DriverOptions() map[string]string { func (n *Network) DriverOptions() map[string]string {