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

versioning: misc cleanups

Browse Source 
highlights:
 - NetConf struct finally includes cniVersion field
 - improve test coverage of current version report behavior
 - godoc a few key functions
 - allow tests to control version list reported by no-op plugin
This commit is contained in:
Gabe Rosenhouse
2016-09-06 11:22:27 -04:00
parent bf31ed1591
commit d5e2e375d4
10 changed files with 162 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/test/noop/main.go
View File

@ -63,6 +63,23 @@ func debugBehavior(args *skel.CmdArgs, command string) error {
return nil
}
func debugGetSupportedVersions() []string {
vers := []string{"0.-42.0", "0.1.0", "0.2.0", "0.3.0"}
cniArgs := os.Getenv("CNI_ARGS")
if cniArgs == "" {
return vers
}
debugFilePath := strings.TrimPrefix(cniArgs, "DEBUG=")
debug, err := debug.ReadDebug(debugFilePath)
if err != nil {
panic("test setup error: unable to read debug file: " + err.Error())
}
if debug.ReportVersionSupport == nil {
return vers
}
return debug.ReportVersionSupport
}
func cmdAdd(args *skel.CmdArgs) error {
return debugBehavior(args, "ADD")
}
@ -72,6 +89,6 @@ func cmdDel(args *skel.CmdArgs) error {
}
func main() {
skel.PluginMain(cmdAdd, cmdDel,
version.PluginSupports("0.-42.0", "0.1.0", "0.2.0", "0.3.0"))
supportedVersions := debugGetSupportedVersions()
skel.PluginMain(cmdAdd, cmdDel, version.PluginSupports(supportedVersions...))
}