a2ea2996f3
Previous commit "Use ip address from CNI output" introduces ability to run pod which can havn't eth0. But also it add problem: after kubelet restart, if we have already started pod w/o eth0, kubelet can't find proper interface (it's normal for vhostuser type of cni plugin when eth0 doesn't exist) and kubelet restarts "broken" pod. Fix of this issue requeres new feature of libcni - caching results. Looks like new libcni requires cniVersion in CNI output. This patch specifies version both for CNI conf and CNI output. Signed-off-by: Alexey Perevalov <a.perevalov@samsung.com>
81 lines
2.7 KiB
Go
81 lines
2.7 KiB
Go
/*
|
|
Copyright 2014 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
// mock_cni is a mock of the `libcni.CNI` interface. It's a handwritten mock
|
|
// because there are only two functions to deal with.
|
|
package mock_cni
|
|
|
|
import (
|
|
"context"
|
|
"github.com/containernetworking/cni/libcni"
|
|
"github.com/containernetworking/cni/pkg/types"
|
|
"github.com/stretchr/testify/mock"
|
|
)
|
|
|
|
type MockCNI struct {
|
|
mock.Mock
|
|
}
|
|
|
|
func (m *MockCNI) AddNetwork(ctx context.Context, net *libcni.NetworkConfig, rt *libcni.RuntimeConf) (types.Result, error) {
|
|
args := m.Called(ctx, net, rt)
|
|
return args.Get(0).(types.Result), args.Error(1)
|
|
}
|
|
|
|
func (m *MockCNI) DelNetwork(ctx context.Context, net *libcni.NetworkConfig, rt *libcni.RuntimeConf) error {
|
|
args := m.Called(ctx, net, rt)
|
|
return args.Error(0)
|
|
}
|
|
|
|
func (m *MockCNI) DelNetworkList(ctx context.Context, net *libcni.NetworkConfigList, rt *libcni.RuntimeConf) error {
|
|
args := m.Called(ctx, net, rt)
|
|
return args.Error(0)
|
|
}
|
|
|
|
func (m *MockCNI) GetNetworkListCachedResult(net *libcni.NetworkConfigList, rt *libcni.RuntimeConf) (types.Result, error) {
|
|
args := m.Called(net, rt)
|
|
return args.Get(0).(types.Result), args.Error(1)
|
|
}
|
|
|
|
func (m *MockCNI) AddNetworkList(ctx context.Context, net *libcni.NetworkConfigList, rt *libcni.RuntimeConf) (types.Result, error) {
|
|
args := m.Called(ctx, net, rt)
|
|
return args.Get(0).(types.Result), args.Error(1)
|
|
}
|
|
|
|
func (m *MockCNI) CheckNetworkList(ctx context.Context, net *libcni.NetworkConfigList, rt *libcni.RuntimeConf) error {
|
|
args := m.Called(ctx, net, rt)
|
|
return args.Error(0)
|
|
}
|
|
|
|
func (m *MockCNI) CheckNetwork(ctx context.Context, net *libcni.NetworkConfig, rt *libcni.RuntimeConf) error {
|
|
args := m.Called(ctx, net, rt)
|
|
return args.Error(0)
|
|
}
|
|
|
|
func (m *MockCNI) GetNetworkCachedResult(net *libcni.NetworkConfig, rt *libcni.RuntimeConf) (types.Result, error) {
|
|
args := m.Called(net, rt)
|
|
return args.Get(0).(types.Result), args.Error(0)
|
|
}
|
|
|
|
func (m *MockCNI) ValidateNetworkList(ctx context.Context, net *libcni.NetworkConfigList) ([]string, error) {
|
|
args := m.Called(ctx, net)
|
|
return args.Get(0).([]string), args.Error(0)
|
|
}
|
|
|
|
func (m *MockCNI) ValidateNetwork(ctx context.Context, net *libcni.NetworkConfig) ([]string, error) {
|
|
args := m.Called(ctx, net)
|
|
return args.Get(0).([]string), args.Error(0)
|
|
}
|