vendor: bump libcni to v0.7.0-rc2

Godeps/Godeps.json

@@ -1,7 +1,7 @@
 {
 	"ImportPath": "github.com/containernetworking/plugins",
 	"GoVersion": "go1.7",
-	"GodepVersion": "v79",
+	"GodepVersion": "v80",
 	"Packages": [
 		"./..."
 	],
@@ -14,7 +14,7 @@
 		{
 			"ImportPath": "github.com/Microsoft/hcsshim",
 			"Comment": "v0.7.6",
-			"Rev": "6efef912cc0ecd8778bab95d105662d4f73f8ccd"
+			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
 		},
 		{
 			"ImportPath": "github.com/Microsoft/hcsshim/internal/guid",
@@ -81,38 +81,38 @@
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/libcni",
-			"Comment": "v0.7.0-alpha1",
-			"Rev": "07c1a6da47b7fbf8b357f4949ecce2113e598491"
+			"Comment": "v0.7.0-rc2",
+			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/invoke",
-			"Comment": "v0.7.0-alpha1",
-			"Rev": "07c1a6da47b7fbf8b357f4949ecce2113e598491"
+			"Comment": "v0.7.0-rc2",
+			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/skel",
-			"Comment": "v0.7.0-alpha1",
-			"Rev": "07c1a6da47b7fbf8b357f4949ecce2113e598491"
+			"Comment": "v0.7.0-rc2",
+			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/types",
-			"Comment": "v0.7.0-alpha1",
-			"Rev": "07c1a6da47b7fbf8b357f4949ecce2113e598491"
+			"Comment": "v0.7.0-rc2",
+			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/types/020",
-			"Comment": "v0.7.0-alpha1",
-			"Rev": "07c1a6da47b7fbf8b357f4949ecce2113e598491"
+			"Comment": "v0.7.0-rc2",
+			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/types/current",
-			"Comment": "v0.7.0-alpha1",
-			"Rev": "07c1a6da47b7fbf8b357f4949ecce2113e598491"
+			"Comment": "v0.7.0-rc2",
+			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
 		},
 		{
 			"ImportPath": "github.com/containernetworking/cni/pkg/version",
-			"Comment": "v0.7.0-alpha1",
-			"Rev": "07c1a6da47b7fbf8b357f4949ecce2113e598491"
+			"Comment": "v0.7.0-rc2",
+			"Rev": "fbb95fff8a5239a4295c991efa8a397d43118f7e"
 		},
 		{
 			"ImportPath": "github.com/coreos/go-iptables/iptables",

vendor/github.com/containernetworking/cni/libcni/api.go

@@ -126,7 +126,7 @@ func buildOneConfig(name, cniVersion string, orig *NetworkConfig, prevResult typ
 // These capabilities arguments are filtered through the plugin's advertised
 // capabilities from its config JSON, and any keys in the CapabilityArgs
 // matching plugin capabilities are added to the "runtimeConfig" dictionary
-// sent to the plugin via JSON on stdin.  For exmaple, if the plugin's
+// sent to the plugin via JSON on stdin.  For example, if the plugin's
 // capabilities include "portMappings", and the CapabilityArgs map includes a
 // "portMappings" key, that key and its value are added to the "runtimeConfig"
 // dictionary to be passed to the plugin's stdin.

vendor/github.com/containernetworking/cni/pkg/invoke/os_unix.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin dragonfly freebsd linux netbsd opensbd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package invoke
 

vendor/github.com/containernetworking/cni/pkg/skel/skel.go

@@ -291,7 +291,7 @@ func PluginMainWithError(cmdAdd, cmdCheck, cmdDel func(_ *CmdArgs) error, versio
 // The caller must also specify what CNI spec versions the plugin supports.
 //
 // The caller can specify an "about" string, which is printed on stderr
-// when no CNI_COMMAND is specified. The reccomended output is "CNI plugin <foo> v<version>"
+// when no CNI_COMMAND is specified. The recommended output is "CNI plugin <foo> v<version>"
 //
 // When an error occurs in either cmdAdd, cmdCheck, or cmdDel, PluginMain will print the error
 // as JSON to stdout and call os.Exit(1).

vendor/github.com/containernetworking/cni/pkg/types/020/types.go

@@ -17,6 +17,7 @@ package types020
 import (
 	"encoding/json"
 	"fmt"
+	"io"
 	"net"
 	"os"
 
@@ -73,11 +74,15 @@ func (r *Result) GetAsVersion(version string) (types.Result, error) {
 }
 
 func (r *Result) Print() error {
+	return r.PrintTo(os.Stdout)
+}
+
+func (r *Result) PrintTo(writer io.Writer) error {
 	data, err := json.MarshalIndent(r, "", "    ")
 	if err != nil {
 		return err
 	}
-	_, err = os.Stdout.Write(data)
+	_, err = writer.Write(data)
 	return err
 }
 

vendor/github.com/containernetworking/cni/pkg/types/current/types.go

@@ -17,6 +17,7 @@ package current
 import (
 	"encoding/json"
 	"fmt"
+	"io"
 	"net"
 	"os"
 
@@ -75,13 +76,9 @@ func convertFrom020(result types.Result) (*Result, error) {
 			Gateway: oldResult.IP4.Gateway,
 		})
 		for _, route := range oldResult.IP4.Routes {
-			gw := route.GW
-			if gw == nil {
-				gw = oldResult.IP4.Gateway
-			}
 			newResult.Routes = append(newResult.Routes, &types.Route{
 				Dst: route.Dst,
-				GW:  gw,
+				GW:  route.GW,
 			})
 		}
 	}
@@ -93,13 +90,9 @@ func convertFrom020(result types.Result) (*Result, error) {
 			Gateway: oldResult.IP6.Gateway,
 		})
 		for _, route := range oldResult.IP6.Routes {
-			gw := route.GW
-			if gw == nil {
-				gw = oldResult.IP6.Gateway
-			}
 			newResult.Routes = append(newResult.Routes, &types.Route{
 				Dst: route.Dst,
-				GW:  gw,
+				GW:  route.GW,
 			})
 		}
 	}
@@ -202,11 +195,15 @@ func (r *Result) GetAsVersion(version string) (types.Result, error) {
 }
 
 func (r *Result) Print() error {
+	return r.PrintTo(os.Stdout)
+}
+
+func (r *Result) PrintTo(writer io.Writer) error {
 	data, err := json.MarshalIndent(r, "", "    ")
 	if err != nil {
 		return err
 	}
-	_, err = os.Stdout.Write(data)
+	_, err = writer.Write(data)
 	return err
 }
 

vendor/github.com/containernetworking/cni/pkg/types/types.go

@@ -18,6 +18,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net"
 	"os"
 )
@@ -87,7 +88,7 @@ type ResultFactoryFunc func([]byte) (Result, error)
 
 // Result is an interface that provides the result of plugin execution
 type Result interface {
-	// The highest CNI specification result verison the result supports
+	// The highest CNI specification result version the result supports
 	// without having to convert
 	Version() string
 
@@ -98,6 +99,9 @@ type Result interface {
 	// Prints the result in JSON format to stdout
 	Print() error
 
+	// Prints the result in JSON format to provided writer
+	PrintTo(writer io.Writer) error
+
 	// Returns a JSON string representation of the result
 	String() string
 }

vendor/github.com/containernetworking/cni/pkg/version/plugin.go

@@ -86,9 +86,13 @@ func (*PluginDecoder) Decode(jsonBytes []byte) (PluginInfo, error) {
 // minor, and micro numbers or returns an error
 func ParseVersion(version string) (int, int, int, error) {
 	var major, minor, micro int
+	if version == "" {
+		return -1, -1, -1, fmt.Errorf("invalid version %q: the version is empty", version)
+	}
+
 	parts := strings.Split(version, ".")
-	if len(parts) == 0 || len(parts) >= 4 {
-		return -1, -1, -1, fmt.Errorf("invalid version %q: too many or too few parts", version)
+	if len(parts) >= 4 {
+		return -1, -1, -1, fmt.Errorf("invalid version %q: too many parts", version)
 	}
 
 	major, err := strconv.Atoi(parts[0])
@@ -114,7 +118,7 @@ func ParseVersion(version string) (int, int, int, error) {
 }
 
 // GreaterThanOrEqualTo takes two string versions, parses them into major/minor/micro
-// nubmers, and compares them to determine whether the first version is greater
+// numbers, and compares them to determine whether the first version is greater
 // than or equal to the second
 func GreaterThanOrEqualTo(version, otherVersion string) (bool, error) {
 	firstMajor, firstMinor, firstMicro, err := ParseVersion(version)