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

invoke: better name and unit test coverage for GetVersionInfo

Browse Source
This commit is contained in:
Gabe Rosenhouse
2016-09-02 16:39:01 -04:00
parent 97192fc979
commit bf31ed1591
4 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/invoke/exec.go
View File

@ -30,8 +30,8 @@ func ExecPluginWithoutResult(pluginPath string, netconf []byte, args CNIArgs) er
return defaultPluginExec.WithoutResult(pluginPath, netconf, args)
}
func ExecPluginForVersion(pluginPath string) (version.PluginInfo, error) {
return defaultPluginExec.GetVersion(pluginPath)
func GetVersionInfo(pluginPath string) (version.PluginInfo, error) {
return defaultPluginExec.GetVersionInfo(pluginPath)
}
var defaultPluginExec = &PluginExec{
@ -64,14 +64,14 @@ func (e *PluginExec) WithoutResult(pluginPath string, netconf []byte, args CNIAr
return err
}
func (e *PluginExec) GetVersion(pluginPath string) (version.PluginInfo, error) {
func (e *PluginExec) GetVersionInfo(pluginPath string) (version.PluginInfo, error) {
args := &Args{
Command: "VERSION",
// set fake values required by plugins built against an older version of skel
NetNS: "/tmp/not/a/container",
IfName: "not-an-interface",
Path: "/tmp/not/a/path",
NetNS: "dummy",
IfName: "dummy",
Path: "dummy",
}
stdoutBytes, err := e.RawExec.ExecPlugin(pluginPath, nil, args.AsEnv())
if err != nil {