diff --git a/types/conf_test.go b/types/conf_test.go index 7db2ce878..fd3902a40 100644 --- a/types/conf_test.go +++ b/types/conf_test.go @@ -469,51 +469,3 @@ var _ = Describe("config operations", func() { }) }) - -// type Result struct { -// CNIVersion string `json:"cniVersion,omitempty"` -// IP4 *types020.IPConfig `json:"ip4,omitempty"` -// IP6 *types020.IPConfig `json:"ip6,omitempty"` -// DNS types.DNS `json:"dns,omitempty"` -// } - -// func (r *Result) Version() string { -// return r.CNIVersion -// } - -// func (r *Result) GetAsVersion(version string) (types.Result, error) { -// for _, supportedVersion := range types020.SupportedVersions { -// if version == supportedVersion { -// r.CNIVersion = version -// return r, nil -// } -// } -// return nil, fmt.Errorf("cannot convert version %q to %s", types020.SupportedVersions, version) -// } - -// 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 = writer.Write(data) -// return err -// } - -// // String returns a formatted string in the form of "[IP4: $1,][ IP6: $2,] DNS: $3" where -// // $1 represents the receiver's IPv4, $2 represents the receiver's IPv6 and $3 the -// // receiver's DNS. If $1 or $2 are nil, they won't be present in the returned string. -// func (r *Result) String() string { -// var str string -// if r.IP4 != nil { -// str = fmt.Sprintf("IP4:%+v, ", *r.IP4) -// } -// if r.IP6 != nil { -// str += fmt.Sprintf("IP6:%+v, ", *r.IP6) -// } -// return fmt.Sprintf("%sDNS:%+v", str, r.DNS) -// } diff --git a/vendor/github.com/containernetworking/cni/pkg/types/current/types.go b/vendor/github.com/containernetworking/cni/pkg/types/current/types.go index 7267a2e6d..dc3e145e1 100644 --- a/vendor/github.com/containernetworking/cni/pkg/types/current/types.go +++ b/vendor/github.com/containernetworking/cni/pkg/types/current/types.go @@ -22,7 +22,7 @@ import ( "os" "github.com/containernetworking/cni/pkg/types" - "github.com/containernetworking/cni/pkg/types/020" + types020 "github.com/containernetworking/cni/pkg/types/020" ) const ImplementedSpecVersion string = "0.4.0"