ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

IPAM plugin: improve error messages

Browse Source 
Make it more clear that we failed to find an IPAM plugin.
Check for a missing plugin name and issue a more helpful error.
This commit is contained in:
Neil Wilson
2015-09-07 15:15:23 +00:00
parent fb9b8ad1bc
commit 8462a3f607
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/plugin/ipam.go
View File

@ -63,10 +63,13 @@ func ExecAdd(plugin string, netconf []byte) (*Result, error) {
if os.Getenv("CNI_COMMAND") != "ADD" { if os.Getenv("CNI_COMMAND") != "ADD" {
return nil, fmt.Errorf("CNI_COMMAND is not ADD") return nil, fmt.Errorf("CNI_COMMAND is not ADD")
} }
if plugin == "" {
return nil, fmt.Errorf(`Name of IPAM plugin is missing. Specify a "type" field in the "ipam" section`)
}
pluginPath := Find(plugin) pluginPath := Find(plugin)
if pluginPath == "" { if pluginPath == "" {
return nil, fmt.Errorf("could not find %q plugin", plugin) return nil, fmt.Errorf("could not find %q IPAM plugin", plugin)
} }
stdout := &bytes.Buffer{} stdout := &bytes.Buffer{}