github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-08-31 08:33:06 +00:00
Code Issues Projects Releases Wiki Activity

hopefully resolved merge conflicts

Browse Source
This commit is contained in:
Nikhil
2019-07-11 15:03:53 -04:00
committed by Tomofumi Hayashi
parent d4a7aae89c
commit 989daf4091
2 changed files with 1 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
types/conf_test.go
View File

@@ -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)
// }

2
vendor/github.com/containernetworking/cni/pkg/types/current/types.go generated vendored
View File

@@ -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"