Simplify network scope setting logic

- in driver(), no need to check for isAgent

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2017-05-18 15:06:27 -07:00
parent 57c6fab2cc
commit c7d77e9e89

View file

@ -904,17 +904,14 @@ func (n *network) driver(load bool) (driverapi.Driver, error) {
return nil, err
}
c := n.getController()
isAgent := c.isAgent()
n.Lock()
// If load is not required, driver, cap and err may all be nil
if n.scope == "" && cap != nil {
n.scope = cap.DataScope
}
if isAgent || n.dynamic {
// If we are running in agent mode or the network
// is dynamic, then the networks are swarm scoped
// regardless of the backing driver.
if n.dynamic {
// If the network is dynamic, then it is swarm
// scoped regardless of the backing driver.
n.scope = datastore.SwarmScope
}
n.Unlock()