From a11be4d7596203874b742b6597caf255204c56c3 Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Wed, 3 May 2017 23:21:44 +0800 Subject: [PATCH] Fix testings accross the project Signed-off-by: Pengfei Ni --- types/current/types.go | 14 +++++++------- types/current/types_test.go | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/types/current/types.go b/types/current/types.go index 26e1dd96..b5715fe6 100644 --- a/types/current/types.go +++ b/types/current/types.go @@ -24,9 +24,9 @@ import ( "github.com/containernetworking/cni/pkg/types/020" ) -const implementedSpecVersion string = "0.3.1" +const ImplementedSpecVersion string = "0.3.1" -var SupportedVersions = []string{"0.3.0", implementedSpecVersion} +var SupportedVersions = []string{"0.3.0", ImplementedSpecVersion} func NewResult(data []byte) (types.Result, error) { result := &Result{} @@ -37,7 +37,7 @@ func NewResult(data []byte) (types.Result, error) { } func GetResult(r types.Result) (*Result, error) { - resultCurrent, err := r.GetAsVersion(implementedSpecVersion) + resultCurrent, err := r.GetAsVersion(ImplementedSpecVersion) if err != nil { return nil, err } @@ -63,7 +63,7 @@ func convertFrom020(result types.Result) (*Result, error) { } newResult := &Result{ - CNIVersion: implementedSpecVersion, + CNIVersion: ImplementedSpecVersion, DNS: oldResult.DNS, Routes: []*types.Route{}, } @@ -118,7 +118,7 @@ func convertFrom030(result types.Result) (*Result, error) { if !ok { return nil, fmt.Errorf("failed to convert result") } - newResult.CNIVersion = implementedSpecVersion + newResult.CNIVersion = ImplementedSpecVersion return newResult, nil } @@ -193,12 +193,12 @@ func (r *Result) convertTo020() (*types020.Result, error) { } func (r *Result) Version() string { - return implementedSpecVersion + return ImplementedSpecVersion } func (r *Result) GetAsVersion(version string) (types.Result, error) { switch version { - case "0.3.0", implementedSpecVersion: + case "0.3.0", ImplementedSpecVersion: r.CNIVersion = version return r, nil case types020.SupportedVersions[0], types020.SupportedVersions[1], types020.SupportedVersions[2]: diff --git a/types/current/types_test.go b/types/current/types_test.go index eb7e7c62..afc68670 100644 --- a/types/current/types_test.go +++ b/types/current/types_test.go @@ -174,7 +174,7 @@ var _ = Describe("Current types operations", func() { Expect(err).NotTo(HaveOccurred()) Expect(string(out)).To(Equal(`{ - "cniVersion": "0.1.0", + "cniVersion": "0.2.0", "ip4": { "ip": "1.2.3.30/24", "gateway": "1.2.3.1",