kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #1511 from anusha-ragunathan/fix-drvLoad 

Update loadDriver to use pluginv2.
This commit is contained in:
Madhu Venugopal 2016-10-24 10:43:55 -07:00 committed by GitHub
parent 0b2dd7ce5a 3504ed88d9
commit 1a8fe1208a
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libnetwork/controller.go
View File

@ -1062,9 +1062,14 @@ func SandboxKeyWalker(out *Sandbox, key string) SandboxWalker {
} }
func (c *controller) loadDriver(networkType string) error { func (c *controller) loadDriver(networkType string) error {
// Plugins pkg performs lazy loading of plugins that acts as remote drivers. var err error
// As per the design, this Get call will result in remote driver discovery if there is a corresponding plugin available.
_, err := plugins.Get(networkType, driverapi.NetworkPluginEndpointType) if pg := c.GetPluginGetter(); pg != nil {
_, err = pg.Get(networkType, driverapi.NetworkPluginEndpointType, plugingetter.LOOKUP)
} else {
_, err = plugins.Get(networkType, driverapi.NetworkPluginEndpointType)
}
if err != nil { if err != nil {
if err == plugins.ErrNotFound { if err == plugins.ErrNotFound {
return types.NotFoundErrorf(err.Error()) return types.NotFoundErrorf(err.Error())
@ -1076,7 +1081,15 @@ func (c *controller) loadDriver(networkType string) error {
} }
func (c *controller) loadIPAMDriver(name string) error { func (c *controller) loadIPAMDriver(name string) error {
if _, err := c.GetPluginGetter().Get(name, ipamapi.PluginEndpointType, plugingetter.LOOKUP); err != nil { var err error
if pg := c.GetPluginGetter(); pg != nil {
_, err = pg.Get(name, ipamapi.PluginEndpointType, plugingetter.LOOKUP)
} else {
_, err = plugins.Get(name, ipamapi.PluginEndpointType)
}
if err != nil {
if err == plugins.ErrNotFound { if err == plugins.ErrNotFound {
return types.NotFoundErrorf(err.Error()) return types.NotFoundErrorf(err.Error())
} }