diff --git a/test/functional/e2e_test.go b/test/functional/e2e_test.go index ff97164176..827ce8224f 100644 --- a/test/functional/e2e_test.go +++ b/test/functional/e2e_test.go @@ -31,7 +31,7 @@ import ( "github.com/intel/cri-resource-manager/pkg/cri/resource-manager/cache" "github.com/intel/cri-resource-manager/pkg/dump" "google.golang.org/grpc" - api "k8s.io/cri-api/pkg/apis/runtime/v1" + criv1 "k8s.io/cri-api/pkg/apis/runtime/v1" logger "github.com/intel/cri-resource-manager/pkg/log" ) @@ -52,7 +52,7 @@ func init() { type testEnv struct { t *testing.T handlers map[string]interface{} - client api.RuntimeServiceClient + client criv1.RuntimeServiceClient forceConfig string mgr resmgr.ResourceManager cache cache.Cache @@ -132,7 +132,7 @@ func (env *testEnv) Run(name string, testFunction func(context.Context, *testEnv } defer conn.Close() - client := api.NewRuntimeServiceClient(conn) + client := criv1.NewRuntimeServiceClient(conn) env.client = client env.mgr = resMgr @@ -149,7 +149,7 @@ func (env *testEnv) Run(name string, testFunction func(context.Context, *testEnv func TestListPodSandbox(t *testing.T) { tcases := []struct { name string - pods []*api.PodSandbox + pods []*criv1.PodSandbox expectedPods int }{ { @@ -157,14 +157,14 @@ func TestListPodSandbox(t *testing.T) { }, { name: "list one pod", - pods: []*api.PodSandbox{{}}, + pods: []*criv1.PodSandbox{{}}, expectedPods: 1, }, } for _, tc := range tcases { criHandlers := map[string]interface{}{ - "ListPodSandbox": func(*fakeCriServer, context.Context, *api.ListPodSandboxRequest) (*api.ListPodSandboxResponse, error) { - return &api.ListPodSandboxResponse{ + "ListPodSandbox": func(*fakeCriServer, context.Context, *criv1.ListPodSandboxRequest) (*criv1.ListPodSandboxResponse, error) { + return &criv1.ListPodSandboxResponse{ Items: tc.pods, }, nil }, @@ -176,7 +176,7 @@ func TestListPodSandbox(t *testing.T) { env.Run(tc.name, func(ctx context.Context, env *testEnv) { t := env.t client := env.client - resp, err := client.ListPodSandbox(ctx, &api.ListPodSandboxRequest{}) + resp, err := client.ListPodSandbox(ctx, &criv1.ListPodSandboxRequest{}) if err != nil { t.Errorf("Unexpected error: %+v", err) return @@ -191,7 +191,7 @@ func TestListPodSandbox(t *testing.T) { func TestListContainers(t *testing.T) { tcases := []struct { name string - containers []*api.Container + containers []*criv1.Container expectedContainers int }{ { @@ -199,14 +199,14 @@ func TestListContainers(t *testing.T) { }, { name: "list one container", - containers: []*api.Container{{}}, + containers: []*criv1.Container{{}}, expectedContainers: 1, }, } for _, tc := range tcases { criHandlers := map[string]interface{}{ - "ListContainers": func(*fakeCriServer, context.Context, *api.ListContainersRequest) (*api.ListContainersResponse, error) { - return &api.ListContainersResponse{ + "ListContainers": func(*fakeCriServer, context.Context, *criv1.ListContainersRequest) (*criv1.ListContainersResponse, error) { + return &criv1.ListContainersResponse{ Containers: tc.containers, }, nil }, @@ -218,7 +218,7 @@ func TestListContainers(t *testing.T) { env.Run(tc.name, func(ctx context.Context, env *testEnv) { t := env.t client := env.client - resp, err := client.ListContainers(ctx, &api.ListContainersRequest{}) + resp, err := client.ListContainers(ctx, &criv1.ListContainersRequest{}) if err != nil { t.Errorf("Unexpected error: %+v", err) return @@ -239,19 +239,19 @@ policy: ` tcases := []struct { name string - reqs []*api.RunPodSandboxRequest + reqs []*criv1.RunPodSandboxRequest expectedPods int }{ { name: "create Pod #1", - reqs: []*api.RunPodSandboxRequest{ + reqs: []*criv1.RunPodSandboxRequest{ createPodRequest("Pod#1", "UID#1", "", nil, nil, ""), }, expectedPods: 1, }, { name: "create Pods #1 and #2", - reqs: []*api.RunPodSandboxRequest{ + reqs: []*criv1.RunPodSandboxRequest{ createPodRequest("Pod#1", "UID#1", "", nil, nil, ""), createPodRequest("Pod#2", "UID#2", "", nil, nil, ""), }, @@ -259,7 +259,7 @@ policy: }, { name: "create Pods #1, #2, and #3", - reqs: []*api.RunPodSandboxRequest{ + reqs: []*criv1.RunPodSandboxRequest{ createPodRequest("Pod#1", "UID#1", "", nil, nil, ""), createPodRequest("Pod#2", "UID#2", "", nil, nil, ""), createPodRequest("Pod#3", "UID#3", "", nil, nil, ""), @@ -268,7 +268,7 @@ policy: }, { name: "create Pods #1, #2, #3, #4, '1, '2, '3", - reqs: []*api.RunPodSandboxRequest{ + reqs: []*criv1.RunPodSandboxRequest{ createPodRequest("Pod#1", "UID#1", "", nil, nil, ""), createPodRequest("Pod#2", "UID#2", "", nil, nil, ""), createPodRequest("Pod#3", "UID#3", "", nil, nil, ""), @@ -291,9 +291,9 @@ policy: numPods := 0 for _, tc := range tcases { criHandlers := map[string]interface{}{ - "RunPodSandbox": func(*fakeCriServer, context.Context, *api.RunPodSandboxRequest) (*api.RunPodSandboxResponse, error) { + "RunPodSandbox": func(*fakeCriServer, context.Context, *criv1.RunPodSandboxRequest) (*criv1.RunPodSandboxResponse, error) { numPods++ - return &api.RunPodSandboxResponse{ + return &criv1.RunPodSandboxResponse{ PodSandboxId: fmt.Sprintf("Pod#%d", numPods), }, nil }, @@ -331,25 +331,25 @@ policy: type pod struct { UID string ID string - req *api.RunPodSandboxRequest + req *criv1.RunPodSandboxRequest } type container struct { pod string name string expect int - req *api.CreateContainerRequest + req *criv1.CreateContainerRequest ID string } tcases := []struct { name string - pods []*api.RunPodSandboxRequest + pods []*criv1.RunPodSandboxRequest containers []*container }{ { name: "create containers per one pod", - pods: []*api.RunPodSandboxRequest{ + pods: []*criv1.RunPodSandboxRequest{ createPodRequest("Pod#1", "UID#1", "", nil, nil, ""), }, containers: []*container{ @@ -359,7 +359,7 @@ policy: }, { name: "create lingering containers per one pod", - pods: []*api.RunPodSandboxRequest{ + pods: []*criv1.RunPodSandboxRequest{ createPodRequest("Pod#1", "UID#1", "", nil, nil, ""), }, containers: []*container{ @@ -377,15 +377,15 @@ policy: numContainers := 0 for _, tc := range tcases { criHandlers := map[string]interface{}{ - "RunPodSandbox": func(*fakeCriServer, context.Context, *api.RunPodSandboxRequest) (*api.RunPodSandboxResponse, error) { + "RunPodSandbox": func(*fakeCriServer, context.Context, *criv1.RunPodSandboxRequest) (*criv1.RunPodSandboxResponse, error) { numPods++ - return &api.RunPodSandboxResponse{ + return &criv1.RunPodSandboxResponse{ PodSandboxId: fmt.Sprintf("Pod#%d", numPods), }, nil }, - "CreateContainer": func(*fakeCriServer, context.Context, *api.CreateContainerRequest) (*api.CreateContainerResponse, error) { + "CreateContainer": func(*fakeCriServer, context.Context, *criv1.CreateContainerRequest) (*criv1.CreateContainerResponse, error) { numContainers++ - return &api.CreateContainerResponse{ + return &criv1.CreateContainerResponse{ ContainerId: fmt.Sprintf("Container#%d", numContainers), }, nil }, @@ -442,7 +442,7 @@ policy: func createPodRequest(name, uid, namespace string, labels, annotations map[string]string, - cgroupParent string) *api.RunPodSandboxRequest { + cgroupParent string) *criv1.RunPodSandboxRequest { if namespace == "" { namespace = "default" } @@ -450,16 +450,16 @@ func createPodRequest(name, uid, namespace string, labels = map[string]string{} } labels[kubetypes.KubernetesPodUIDLabel] = uid - return &api.RunPodSandboxRequest{ - Config: &api.PodSandboxConfig{ - Metadata: &api.PodSandboxMetadata{ + return &criv1.RunPodSandboxRequest{ + Config: &criv1.PodSandboxConfig{ + Metadata: &criv1.PodSandboxMetadata{ Name: name, Uid: uid, Namespace: namespace, }, Labels: labels, Annotations: annotations, - Linux: &api.LinuxPodSandboxConfig{ + Linux: &criv1.LinuxPodSandboxConfig{ CgroupParent: cgroupParent, }, }, @@ -467,14 +467,14 @@ func createPodRequest(name, uid, namespace string, } func createContainerRequest(podID, name string, - podReq *api.RunPodSandboxRequest) *api.CreateContainerRequest { - return &api.CreateContainerRequest{ + podReq *criv1.RunPodSandboxRequest) *criv1.CreateContainerRequest { + return &criv1.CreateContainerRequest{ PodSandboxId: podID, - Config: &api.ContainerConfig{ - Metadata: &api.ContainerMetadata{ + Config: &criv1.ContainerConfig{ + Metadata: &criv1.ContainerMetadata{ Name: name, }, - Linux: &api.LinuxContainerConfig{}, + Linux: &criv1.LinuxContainerConfig{}, }, SandboxConfig: podReq.Config, } diff --git a/test/functional/fake_cri_server_test.go b/test/functional/fake_cri_server_test.go index bd89f4466e..be86a534c4 100644 --- a/test/functional/fake_cri_server_test.go +++ b/test/functional/fake_cri_server_test.go @@ -28,7 +28,7 @@ import ( "github.com/intel/cri-resource-manager/pkg/utils" "google.golang.org/grpc" - api "k8s.io/cri-api/pkg/apis/runtime/v1" + criv1 "k8s.io/cri-api/pkg/apis/runtime/v1" ) const ( @@ -63,8 +63,8 @@ func newFakeCriServer(t *testing.T, socket string, fakeHandlers map[string]inter fakeHandlers: fakeHandlers, } - api.RegisterRuntimeServiceServer(srv.grpcServer, srv) - api.RegisterImageServiceServer(srv.grpcServer, srv) + criv1.RegisterRuntimeServiceServer(srv.grpcServer, srv) + criv1.RegisterImageServiceServer(srv.grpcServer, srv) lis, err := net.Listen("unix", socket) if err != nil { @@ -129,12 +129,12 @@ func (s *fakeCriServer) callHandler(ctx context.Context, request interface{}, de return out[0].Interface(), err } -// Implementation of api.RuntimeServiceServer +// Implementation of criv1.RuntimeServiceServer -func (s *fakeCriServer) Version(ctx context.Context, req *api.VersionRequest) (*api.VersionResponse, error) { +func (s *fakeCriServer) Version(ctx context.Context, req *criv1.VersionRequest) (*criv1.VersionResponse, error) { response, err := s.callHandler(ctx, req, - func(*fakeCriServer, context.Context, *api.VersionRequest) (*api.VersionResponse, error) { - return &api.VersionResponse{ + func(*fakeCriServer, context.Context, *criv1.VersionRequest) (*criv1.VersionResponse, error) { + return &criv1.VersionResponse{ Version: fakeKubeAPIVersion, RuntimeName: fakeRuntimeName, RuntimeVersion: fakeRuntimeVersion, @@ -142,159 +142,159 @@ func (s *fakeCriServer) Version(ctx context.Context, req *api.VersionRequest) (* }, nil }, ) - return response.(*api.VersionResponse), err + return response.(*criv1.VersionResponse), err } -func (s *fakeCriServer) RunPodSandbox(ctx context.Context, req *api.RunPodSandboxRequest) (*api.RunPodSandboxResponse, error) { +func (s *fakeCriServer) RunPodSandbox(ctx context.Context, req *criv1.RunPodSandboxRequest) (*criv1.RunPodSandboxResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.RunPodSandboxResponse), err + return response.(*criv1.RunPodSandboxResponse), err } -func (s *fakeCriServer) StopPodSandbox(ctx context.Context, req *api.StopPodSandboxRequest) (*api.StopPodSandboxResponse, error) { +func (s *fakeCriServer) StopPodSandbox(ctx context.Context, req *criv1.StopPodSandboxRequest) (*criv1.StopPodSandboxResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.StopPodSandboxResponse), err + return response.(*criv1.StopPodSandboxResponse), err } -func (s *fakeCriServer) RemovePodSandbox(ctx context.Context, req *api.RemovePodSandboxRequest) (*api.RemovePodSandboxResponse, error) { +func (s *fakeCriServer) RemovePodSandbox(ctx context.Context, req *criv1.RemovePodSandboxRequest) (*criv1.RemovePodSandboxResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.RemovePodSandboxResponse), err + return response.(*criv1.RemovePodSandboxResponse), err } -func (s *fakeCriServer) PodSandboxStatus(ctx context.Context, req *api.PodSandboxStatusRequest) (*api.PodSandboxStatusResponse, error) { +func (s *fakeCriServer) PodSandboxStatus(ctx context.Context, req *criv1.PodSandboxStatusRequest) (*criv1.PodSandboxStatusResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.PodSandboxStatusResponse), err + return response.(*criv1.PodSandboxStatusResponse), err } -func (s *fakeCriServer) ListPodSandbox(ctx context.Context, req *api.ListPodSandboxRequest) (*api.ListPodSandboxResponse, error) { - response, err := s.callHandler(ctx, req, func(*fakeCriServer, context.Context, *api.ListPodSandboxRequest) (*api.ListPodSandboxResponse, error) { - return &api.ListPodSandboxResponse{}, nil +func (s *fakeCriServer) ListPodSandbox(ctx context.Context, req *criv1.ListPodSandboxRequest) (*criv1.ListPodSandboxResponse, error) { + response, err := s.callHandler(ctx, req, func(*fakeCriServer, context.Context, *criv1.ListPodSandboxRequest) (*criv1.ListPodSandboxResponse, error) { + return &criv1.ListPodSandboxResponse{}, nil }) - return response.(*api.ListPodSandboxResponse), err + return response.(*criv1.ListPodSandboxResponse), err } -func (s *fakeCriServer) CreateContainer(ctx context.Context, req *api.CreateContainerRequest) (*api.CreateContainerResponse, error) { +func (s *fakeCriServer) CreateContainer(ctx context.Context, req *criv1.CreateContainerRequest) (*criv1.CreateContainerResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.CreateContainerResponse), err + return response.(*criv1.CreateContainerResponse), err } -func (s *fakeCriServer) StartContainer(ctx context.Context, req *api.StartContainerRequest) (*api.StartContainerResponse, error) { +func (s *fakeCriServer) StartContainer(ctx context.Context, req *criv1.StartContainerRequest) (*criv1.StartContainerResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.StartContainerResponse), err + return response.(*criv1.StartContainerResponse), err } -func (s *fakeCriServer) StopContainer(ctx context.Context, req *api.StopContainerRequest) (*api.StopContainerResponse, error) { +func (s *fakeCriServer) StopContainer(ctx context.Context, req *criv1.StopContainerRequest) (*criv1.StopContainerResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.StopContainerResponse), err + return response.(*criv1.StopContainerResponse), err } -func (s *fakeCriServer) RemoveContainer(ctx context.Context, req *api.RemoveContainerRequest) (*api.RemoveContainerResponse, error) { +func (s *fakeCriServer) RemoveContainer(ctx context.Context, req *criv1.RemoveContainerRequest) (*criv1.RemoveContainerResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.RemoveContainerResponse), err + return response.(*criv1.RemoveContainerResponse), err } -func (s *fakeCriServer) ListContainers(ctx context.Context, req *api.ListContainersRequest) (*api.ListContainersResponse, error) { - response, err := s.callHandler(ctx, req, func(*fakeCriServer, context.Context, *api.ListContainersRequest) (*api.ListContainersResponse, error) { - return &api.ListContainersResponse{}, nil +func (s *fakeCriServer) ListContainers(ctx context.Context, req *criv1.ListContainersRequest) (*criv1.ListContainersResponse, error) { + response, err := s.callHandler(ctx, req, func(*fakeCriServer, context.Context, *criv1.ListContainersRequest) (*criv1.ListContainersResponse, error) { + return &criv1.ListContainersResponse{}, nil }) - return response.(*api.ListContainersResponse), err + return response.(*criv1.ListContainersResponse), err } -func (s *fakeCriServer) ContainerStatus(ctx context.Context, req *api.ContainerStatusRequest) (*api.ContainerStatusResponse, error) { +func (s *fakeCriServer) ContainerStatus(ctx context.Context, req *criv1.ContainerStatusRequest) (*criv1.ContainerStatusResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.ContainerStatusResponse), err + return response.(*criv1.ContainerStatusResponse), err } -func (s *fakeCriServer) UpdateContainerResources(ctx context.Context, req *api.UpdateContainerResourcesRequest) (*api.UpdateContainerResourcesResponse, error) { +func (s *fakeCriServer) UpdateContainerResources(ctx context.Context, req *criv1.UpdateContainerResourcesRequest) (*criv1.UpdateContainerResourcesResponse, error) { response, err := s.callHandler(ctx, req, - func(*fakeCriServer, context.Context, *api.UpdateContainerResourcesRequest) (*api.UpdateContainerResourcesResponse, error) { - return &api.UpdateContainerResourcesResponse{}, nil + func(*fakeCriServer, context.Context, *criv1.UpdateContainerResourcesRequest) (*criv1.UpdateContainerResourcesResponse, error) { + return &criv1.UpdateContainerResourcesResponse{}, nil }, ) - return response.(*api.UpdateContainerResourcesResponse), err + return response.(*criv1.UpdateContainerResourcesResponse), err } -func (s *fakeCriServer) ReopenContainerLog(ctx context.Context, req *api.ReopenContainerLogRequest) (*api.ReopenContainerLogResponse, error) { +func (s *fakeCriServer) ReopenContainerLog(ctx context.Context, req *criv1.ReopenContainerLogRequest) (*criv1.ReopenContainerLogResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.ReopenContainerLogResponse), err + return response.(*criv1.ReopenContainerLogResponse), err } -func (s *fakeCriServer) ExecSync(ctx context.Context, req *api.ExecSyncRequest) (*api.ExecSyncResponse, error) { +func (s *fakeCriServer) ExecSync(ctx context.Context, req *criv1.ExecSyncRequest) (*criv1.ExecSyncResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.ExecSyncResponse), err + return response.(*criv1.ExecSyncResponse), err } -func (s *fakeCriServer) Exec(ctx context.Context, req *api.ExecRequest) (*api.ExecResponse, error) { +func (s *fakeCriServer) Exec(ctx context.Context, req *criv1.ExecRequest) (*criv1.ExecResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.ExecResponse), err + return response.(*criv1.ExecResponse), err } -func (s *fakeCriServer) Attach(ctx context.Context, req *api.AttachRequest) (*api.AttachResponse, error) { +func (s *fakeCriServer) Attach(ctx context.Context, req *criv1.AttachRequest) (*criv1.AttachResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.AttachResponse), err + return response.(*criv1.AttachResponse), err } -func (s *fakeCriServer) PortForward(ctx context.Context, req *api.PortForwardRequest) (*api.PortForwardResponse, error) { +func (s *fakeCriServer) PortForward(ctx context.Context, req *criv1.PortForwardRequest) (*criv1.PortForwardResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.PortForwardResponse), err + return response.(*criv1.PortForwardResponse), err } -func (s *fakeCriServer) ContainerStats(ctx context.Context, req *api.ContainerStatsRequest) (*api.ContainerStatsResponse, error) { +func (s *fakeCriServer) ContainerStats(ctx context.Context, req *criv1.ContainerStatsRequest) (*criv1.ContainerStatsResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.ContainerStatsResponse), err + return response.(*criv1.ContainerStatsResponse), err } -func (s *fakeCriServer) ListContainerStats(ctx context.Context, req *api.ListContainerStatsRequest) (*api.ListContainerStatsResponse, error) { +func (s *fakeCriServer) ListContainerStats(ctx context.Context, req *criv1.ListContainerStatsRequest) (*criv1.ListContainerStatsResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.ListContainerStatsResponse), err + return response.(*criv1.ListContainerStatsResponse), err } -func (s *fakeCriServer) PodSandboxStats(ctx context.Context, req *api.PodSandboxStatsRequest) (*api.PodSandboxStatsResponse, error) { +func (s *fakeCriServer) PodSandboxStats(ctx context.Context, req *criv1.PodSandboxStatsRequest) (*criv1.PodSandboxStatsResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.PodSandboxStatsResponse), err + return response.(*criv1.PodSandboxStatsResponse), err } -func (s *fakeCriServer) ListPodSandboxStats(ctx context.Context, req *api.ListPodSandboxStatsRequest) (*api.ListPodSandboxStatsResponse, error) { +func (s *fakeCriServer) ListPodSandboxStats(ctx context.Context, req *criv1.ListPodSandboxStatsRequest) (*criv1.ListPodSandboxStatsResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.ListPodSandboxStatsResponse), err + return response.(*criv1.ListPodSandboxStatsResponse), err } -func (s *fakeCriServer) UpdateRuntimeConfig(ctx context.Context, req *api.UpdateRuntimeConfigRequest) (*api.UpdateRuntimeConfigResponse, error) { +func (s *fakeCriServer) UpdateRuntimeConfig(ctx context.Context, req *criv1.UpdateRuntimeConfigRequest) (*criv1.UpdateRuntimeConfigResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.UpdateRuntimeConfigResponse), err + return response.(*criv1.UpdateRuntimeConfigResponse), err } -func (s *fakeCriServer) Status(ctx context.Context, req *api.StatusRequest) (*api.StatusResponse, error) { +func (s *fakeCriServer) Status(ctx context.Context, req *criv1.StatusRequest) (*criv1.StatusResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.StatusResponse), err + return response.(*criv1.StatusResponse), err } -// Implementation of api.ImageServiceServer +// Implementation of criv1.ImageServiceServer -func (s *fakeCriServer) ListImages(ctx context.Context, req *api.ListImagesRequest) (*api.ListImagesResponse, error) { +func (s *fakeCriServer) ListImages(ctx context.Context, req *criv1.ListImagesRequest) (*criv1.ListImagesResponse, error) { response, err := s.callHandler(ctx, req, - func(*fakeCriServer, context.Context, *api.ListImagesRequest) (*api.ListImagesResponse, error) { - return &api.ListImagesResponse{}, nil + func(*fakeCriServer, context.Context, *criv1.ListImagesRequest) (*criv1.ListImagesResponse, error) { + return &criv1.ListImagesResponse{}, nil }, ) - return response.(*api.ListImagesResponse), err + return response.(*criv1.ListImagesResponse), err } -func (s *fakeCriServer) ImageStatus(ctx context.Context, req *api.ImageStatusRequest) (*api.ImageStatusResponse, error) { +func (s *fakeCriServer) ImageStatus(ctx context.Context, req *criv1.ImageStatusRequest) (*criv1.ImageStatusResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.ImageStatusResponse), err + return response.(*criv1.ImageStatusResponse), err } -func (s *fakeCriServer) PullImage(ctx context.Context, req *api.PullImageRequest) (*api.PullImageResponse, error) { +func (s *fakeCriServer) PullImage(ctx context.Context, req *criv1.PullImageRequest) (*criv1.PullImageResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.PullImageResponse), err + return response.(*criv1.PullImageResponse), err } -func (s *fakeCriServer) RemoveImage(ctx context.Context, req *api.RemoveImageRequest) (*api.RemoveImageResponse, error) { +func (s *fakeCriServer) RemoveImage(ctx context.Context, req *criv1.RemoveImageRequest) (*criv1.RemoveImageResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.RemoveImageResponse), err + return response.(*criv1.RemoveImageResponse), err } -func (s *fakeCriServer) ImageFsInfo(ctx context.Context, req *api.ImageFsInfoRequest) (*api.ImageFsInfoResponse, error) { +func (s *fakeCriServer) ImageFsInfo(ctx context.Context, req *criv1.ImageFsInfoRequest) (*criv1.ImageFsInfoResponse, error) { response, err := s.callHandler(ctx, req, nil) - return response.(*api.ImageFsInfoResponse), err + return response.(*criv1.ImageFsInfoResponse), err }