github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

nri: update mock plugin handlers

Browse Source 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
This commit is contained in:
Samuel Karp 2023-09-12 17:51:27 -07:00
parent 6f9de91efc
commit 9656b8c0d0
No known key found for this signature in database
GPG Key ID: 997C5A3CD3167CB5
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
integration/nri_test.go
View File

@ -29,15 +29,17 @@ import (
"testing" "testing"
"time" "time"
cri "github.com/containerd/containerd/integration/cri-api/pkg/apis"
"github.com/containerd/nri/pkg/api" "github.com/containerd/nri/pkg/api"
"github.com/containerd/nri/pkg/stub" "github.com/containerd/nri/pkg/stub"
"github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/integration/images" cri "github.com/containerd/containerd/integration/cri-api/pkg/apis"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/containerd/containerd/integration/images"
) )
const ( const (
@ -808,11 +810,11 @@ func (m *mockPlugin) Log(format string, args ...interface{}) {
m.logf(fmt.Sprintf("[plugin:%s-%s] ", m.idx, m.name)+format, args...) m.logf(fmt.Sprintf("[plugin:%s-%s] ", m.idx, m.name)+format, args...)
} }
func (m *mockPlugin) Configure(cfg string) (stub.EventMask, error) { func (m *mockPlugin) Configure(ctx context.Context, cfg string) (stub.EventMask, error) {
return m.mask, nil return m.mask, nil
} }
func (m *mockPlugin) Synchronize(pods []*api.PodSandbox, ctrs []*api.Container) ([]*api.ContainerUpdate, error) { func (m *mockPlugin) Synchronize(ctx context.Context, pods []*api.PodSandbox, ctrs []*api.Container) ([]*api.ContainerUpdate, error) {
m.Log("Synchronize") m.Log("Synchronize")
for _, pod := range pods { for _, pod := range pods {
m.Log(" - pod %s", pod.Id) m.Log(" - pod %s", pod.Id)
@ -828,11 +830,11 @@ func (m *mockPlugin) Synchronize(pods []*api.PodSandbox, ctrs []*api.Container)
return m.synchronize(m, pods, ctrs) return m.synchronize(m, pods, ctrs)
} }
func (m *mockPlugin) Shutdown() { func (m *mockPlugin) Shutdown(ctx context.Context) {
m.Log("Shutdown") m.Log("Shutdown")
} }
func (m *mockPlugin) RunPodSandbox(pod *api.PodSandbox) error { func (m *mockPlugin) RunPodSandbox(ctx context.Context, pod *api.PodSandbox) error {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil return nil
} }
@ -843,7 +845,7 @@ func (m *mockPlugin) RunPodSandbox(pod *api.PodSandbox) error {
return nil return nil
} }
func (m *mockPlugin) StopPodSandbox(pod *api.PodSandbox) error { func (m *mockPlugin) StopPodSandbox(ctx context.Context, pod *api.PodSandbox) error {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil return nil
} }
@ -854,7 +856,7 @@ func (m *mockPlugin) StopPodSandbox(pod *api.PodSandbox) error {
return nil return nil
} }
func (m *mockPlugin) RemovePodSandbox(pod *api.PodSandbox) error { func (m *mockPlugin) RemovePodSandbox(ctx context.Context, pod *api.PodSandbox) error {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil return nil
} }
@ -865,7 +867,7 @@ func (m *mockPlugin) RemovePodSandbox(pod *api.PodSandbox) error {
return nil return nil
} }
func (m *mockPlugin) CreateContainer(pod *api.PodSandbox, ctr *api.Container) (*api.ContainerAdjustment, []*api.ContainerUpdate, error) { func (m *mockPlugin) CreateContainer(ctx context.Context, pod *api.PodSandbox, ctr *api.Container) (*api.ContainerAdjustment, []*api.ContainerUpdate, error) {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil, nil, nil return nil, nil, nil
} }
@ -878,7 +880,7 @@ func (m *mockPlugin) CreateContainer(pod *api.PodSandbox, ctr *api.Container) (*
return m.createContainer(m, pod, ctr) return m.createContainer(m, pod, ctr)
} }
func (m *mockPlugin) PostCreateContainer(pod *api.PodSandbox, ctr *api.Container) error { func (m *mockPlugin) PostCreateContainer(ctx context.Context, pod *api.PodSandbox, ctr *api.Container) error {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil return nil
} }
@ -891,7 +893,7 @@ func (m *mockPlugin) PostCreateContainer(pod *api.PodSandbox, ctr *api.Container
return nil return nil
} }
func (m *mockPlugin) StartContainer(pod *api.PodSandbox, ctr *api.Container) error { func (m *mockPlugin) StartContainer(ctx context.Context, pod *api.PodSandbox, ctr *api.Container) error {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil return nil
} }
@ -903,7 +905,7 @@ func (m *mockPlugin) StartContainer(pod *api.PodSandbox, ctr *api.Container) err
return nil return nil
} }
func (m *mockPlugin) PostStartContainer(pod *api.PodSandbox, ctr *api.Container) error { func (m *mockPlugin) PostStartContainer(ctx context.Context, pod *api.PodSandbox, ctr *api.Container) error {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil return nil
} }
@ -915,7 +917,7 @@ func (m *mockPlugin) PostStartContainer(pod *api.PodSandbox, ctr *api.Container)
return nil return nil
} }
func (m *mockPlugin) UpdateContainer(pod *api.PodSandbox, ctr *api.Container) ([]*api.ContainerUpdate, error) { func (m *mockPlugin) UpdateContainer(ctx context.Context, pod *api.PodSandbox, ctr *api.Container) ([]*api.ContainerUpdate, error) {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil, nil return nil, nil
} }
@ -927,7 +929,7 @@ func (m *mockPlugin) UpdateContainer(pod *api.PodSandbox, ctr *api.Container) ([
return m.updateContainer(m, pod, ctr) return m.updateContainer(m, pod, ctr)
} }
func (m *mockPlugin) PostUpdateContainer(pod *api.PodSandbox, ctr *api.Container) error { func (m *mockPlugin) PostUpdateContainer(ctx context.Context, pod *api.PodSandbox, ctr *api.Container) error {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil return nil
} }
@ -940,7 +942,7 @@ func (m *mockPlugin) PostUpdateContainer(pod *api.PodSandbox, ctr *api.Container
return nil return nil
} }
func (m *mockPlugin) StopContainer(pod *api.PodSandbox, ctr *api.Container) ([]*api.ContainerUpdate, error) { func (m *mockPlugin) StopContainer(ctx context.Context, pod *api.PodSandbox, ctr *api.Container) ([]*api.ContainerUpdate, error) {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil, nil return nil, nil
} }
@ -952,7 +954,7 @@ func (m *mockPlugin) StopContainer(pod *api.PodSandbox, ctr *api.Container) ([]*
return m.stopContainer(m, pod, ctr) return m.stopContainer(m, pod, ctr)
} }
func (m *mockPlugin) RemoveContainer(pod *api.PodSandbox, ctr *api.Container) error { func (m *mockPlugin) RemoveContainer(ctx context.Context, pod *api.PodSandbox, ctr *api.Container) error {
if !m.inNamespace(pod.Namespace) { if !m.inNamespace(pod.Namespace) {
return nil return nil
} }