Merge branch 'main' of https://github.com/containerd/go-cni into arch…

…it-implementstatus
containerd · Sep 3, 2024 · 5edb69b · 5edb69b
2 parents af0eac1 + 1c1be5e
commit 5edb69b
Show file tree

Hide file tree

Showing 7 changed files with 145 additions and 113 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
 
       - name: Set env
         shell: bash
@@ -44,7 +44,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.19.x, 1.20.x]
+        go-version: ["1.21.8", "1.22.1"]
         os: [ubuntu-22.04]
 
     steps:
@@ -64,7 +64,7 @@ jobs:
 
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.1
+          version: v1.56.1
           working-directory: src/github.com/containerd/go-cni
 
   tests:
@@ -74,7 +74,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.19.x, 1.20.x]
+        go-version: ["1.21.8", "1.22.1"]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/cni_test.go b/cni_test.go
@@ -286,36 +286,126 @@ func TestLibCNIType100(t *testing.T) {
 	assert.NoError(t, err)
 }
 
+// TestLibCNIType120 tests the cni version 1.1.0 plugin
+// config and parses the result into structured data
+func TestLibCNIType120(t *testing.T) {
+	// Get the default CNI config
+	l := defaultCNIConfig()
+	// Create a fake cni config directory and file
+	cniDir, confDir := makeFakeCNIConfig(t)
+	defer tearDownCNIConfig(t, cniDir)
+	l.pluginConfDir = confDir
+	// Set the minimum network count as 2 for this test
+	l.networkCount = 2
+	err := l.Load(WithAllConf)
+	assert.NoError(t, err)
+
+	err = l.Status()
+	assert.NoError(t, err)
+
+	mockCNI := &MockCNI{}
+	l.networks[0].cni = mockCNI
+	l.networks[1].cni = mockCNI
+	ipv4, err := types.ParseCIDR("10.0.0.1/24")
+	assert.NoError(t, err)
+	expectedRT := &cnilibrary.RuntimeConf{
+		ContainerID:    "container-id1",
+		NetNS:          "/proc/12345/ns/net",
+		IfName:         "eth0",
+		Args:           [][2]string(nil),
+		CapabilityArgs: map[string]interface{}{},
+	}
+	mockCNI.On("AddNetworkList", l.networks[0].config, expectedRT).Return(&types100.Result{
+		CNIVersion: "1.1.0",
+		Interfaces: []*types100.Interface{
+			{
+				Name: "eth0",
+			},
+		},
+		IPs: []*types100.IPConfig{
+			{
+				Interface: types100.Int(0),
+				Address:   *ipv4,
+				Gateway:   net.ParseIP("10.0.0.255"),
+			},
+		},
+	}, nil)
+	mockCNI.On("DelNetworkList", l.networks[0].config, expectedRT).Return(nil)
+	mockCNI.On("CheckNetworkList", l.networks[0].config, expectedRT).Return(nil)
+	ipv4, err = types.ParseCIDR("10.0.0.2/24")
+	assert.NoError(t, err)
+	l.networks[1].cni = mockCNI
+	expectedRT = &cnilibrary.RuntimeConf{
+		ContainerID:    "container-id1",
+		NetNS:          "/proc/12345/ns/net",
+		IfName:         "eth1",
+		Args:           [][2]string(nil),
+		CapabilityArgs: map[string]interface{}{},
+	}
+	mockCNI.On("AddNetworkList", l.networks[1].config, expectedRT).Return(&types100.Result{
+		CNIVersion: "1.1.0",
+		Interfaces: []*types100.Interface{
+			{
+				Name: "eth1",
+			},
+		},
+		IPs: []*types100.IPConfig{
+			{
+				Interface: types100.Int(0),
+				Address:   *ipv4,
+				Gateway:   net.ParseIP("10.0.0.2"),
+			},
+		},
+	}, nil)
+	mockCNI.On("DelNetworkList", l.networks[1].config, expectedRT).Return(nil)
+	mockCNI.On("CheckNetworkList", l.networks[1].config, expectedRT).Return(nil)
+	ctx := context.Background()
+	r, err := l.Setup(ctx, "container-id1", "/proc/12345/ns/net")
+	assert.NoError(t, err)
+	assert.Contains(t, r.Interfaces, "eth0")
+	assert.NotNil(t, r.Interfaces["eth0"].IPConfigs)
+	assert.Equal(t, r.Interfaces["eth0"].IPConfigs[0].IP.String(), "10.0.0.1")
+	assert.Contains(t, r.Interfaces, "eth1")
+	assert.NotNil(t, r.Interfaces["eth1"].IPConfigs)
+	assert.Equal(t, r.Interfaces["eth1"].IPConfigs[0].IP.String(), "10.0.0.2")
+
+	err = l.Check(ctx, "container-id1", "/proc/12345/ns/net")
+	assert.NoError(t, err)
+
+	err = l.Remove(ctx, "container-id1", "/proc/12345/ns/net")
+	assert.NoError(t, err)
+}
+
 type MockCNI struct {
 	mock.Mock
 }
 
-func (m *MockCNI) AddNetwork(ctx context.Context, net *cnilibrary.NetworkConfig, rt *cnilibrary.RuntimeConf) (types.Result, error) {
+func (m *MockCNI) AddNetwork(_ context.Context, net *cnilibrary.NetworkConfig, rt *cnilibrary.RuntimeConf) (types.Result, error) {
 	args := m.Called(net, rt)
 	return args.Get(0).(types.Result), args.Error(1)
 }
 
-func (m *MockCNI) DelNetwork(ctx context.Context, net *cnilibrary.NetworkConfig, rt *cnilibrary.RuntimeConf) error {
+func (m *MockCNI) DelNetwork(_ context.Context, net *cnilibrary.NetworkConfig, rt *cnilibrary.RuntimeConf) error {
 	args := m.Called(net, rt)
 	return args.Error(0)
 }
 
-func (m *MockCNI) DelNetworkList(ctx context.Context, net *cnilibrary.NetworkConfigList, rt *cnilibrary.RuntimeConf) error {
+func (m *MockCNI) DelNetworkList(_ context.Context, net *cnilibrary.NetworkConfigList, rt *cnilibrary.RuntimeConf) error {
 	args := m.Called(net, rt)
 	return args.Error(0)
 }
 
-func (m *MockCNI) AddNetworkList(ctx context.Context, net *cnilibrary.NetworkConfigList, rt *cnilibrary.RuntimeConf) (types.Result, error) {
+func (m *MockCNI) AddNetworkList(_ context.Context, net *cnilibrary.NetworkConfigList, rt *cnilibrary.RuntimeConf) (types.Result, error) {
 	args := m.Called(net, rt)
 	return args.Get(0).(types.Result), args.Error(1)
 }
 
-func (m *MockCNI) CheckNetworkList(ctx context.Context, net *cnilibrary.NetworkConfigList, rt *cnilibrary.RuntimeConf) error {
+func (m *MockCNI) CheckNetworkList(_ context.Context, net *cnilibrary.NetworkConfigList, rt *cnilibrary.RuntimeConf) error {
 	args := m.Called(net, rt)
 	return args.Error(0)
 }
 
-func (m *MockCNI) CheckNetwork(ctx context.Context, net *cnilibrary.NetworkConfig, rt *cnilibrary.RuntimeConf) error {
+func (m *MockCNI) CheckNetwork(_ context.Context, net *cnilibrary.NetworkConfig, rt *cnilibrary.RuntimeConf) error {
 	args := m.Called(net, rt)
 	return args.Error(0)
 }
@@ -330,12 +420,12 @@ func (m *MockCNI) GetNetworkCachedResult(net *cnilibrary.NetworkConfig, rt *cnil
 	return args.Get(0).(types.Result), args.Error(1)
 }
 
-func (m *MockCNI) ValidateNetworkList(ctx context.Context, net *cnilibrary.NetworkConfigList) ([]string, error) {
+func (m *MockCNI) ValidateNetworkList(_ context.Context, net *cnilibrary.NetworkConfigList) ([]string, error) {
 	args := m.Called(net)
 	return args.Get(0).([]string), args.Error(1)
 }
 
-func (m *MockCNI) ValidateNetwork(ctx context.Context, net *cnilibrary.NetworkConfig) ([]string, error) {
+func (m *MockCNI) ValidateNetwork(_ context.Context, net *cnilibrary.NetworkConfig) ([]string, error) {
 	args := m.Called(net)
 	return args.Get(0).([]string), args.Error(1)
 }
@@ -350,12 +440,12 @@ func (m *MockCNI) GetNetworkListCachedResult(net *cnilibrary.NetworkConfigList,
 	return args.Get(0).(types.Result), args.Error(1)
 }
 
-func (m *MockCNI) GCNetworkList(ctx context.Context, net *cnilibrary.NetworkConfigList, gcargs *cnilibrary.GCArgs) error {
+func (m *MockCNI) GCNetworkList(_ context.Context, net *cnilibrary.NetworkConfigList, gcargs *cnilibrary.GCArgs) error {
 	args := m.Called(net, gcargs)
 	return args.Error(0)
 }
 
-func (m *MockCNI) GetStatusNetworkList(ctx context.Context, net *cnilibrary.NetworkConfigList) error {
+func (m *MockCNI) GetStatusNetworkList(_ context.Context, net *cnilibrary.NetworkConfigList) error {
 	args := m.Called(net)
 	return args.Error(0)
 }
@@ -365,7 +455,7 @@ func (m *MockCNI) GetCachedAttachments(containerID string) ([]*cnilibrary.Networ
 	return args.Get(0).([]*cnilibrary.NetworkAttachment), args.Error(1)
 }
 
-func (m *MockCNI) GetVersionInfo(ctx context.Context, pluginType string) (version.PluginInfo, error) {
+func (m *MockCNI) GetVersionInfo(_ context.Context, pluginType string) (version.PluginInfo, error) {
 	args := m.Called(pluginType)
 	return args.Get(0).(version.PluginInfo), args.Error(1)
 }
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/containerd/go-cni
 go 1.21
 
 require (
-	github.com/containernetworking/cni v1.2.3
+	github.com/containernetworking/cni v1.2.2
 	github.com/stretchr/testify v1.8.0
 )
 

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM=
-github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
+github.com/containernetworking/cni v1.2.2 h1:9IbP6KJQQxVKo4hhnm8r50YcVKrJbJu3Dqw+Rbt1vYk=
+github.com/containernetworking/cni v1.2.2/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/integration/go.mod b/integration/go.mod
@@ -1,6 +1,6 @@
 module github.com/containerd/go-cni/integration
 
-go 1.17
+go 1.21
 
 require (
 	github.com/containerd/continuity v0.2.2
@@ -10,12 +10,12 @@ require (
 
 require (
 	github.com/Microsoft/go-winio v0.5.1 // indirect
-	github.com/containernetworking/cni v1.1.2 // indirect
+	github.com/containernetworking/cni v1.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.7.0 // indirect
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
-	golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect
+	golang.org/x/sys v0.20.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )