Skip to content

Commit

Permalink
test/functional: refer to CRI API by version.
Browse files Browse the repository at this point in the history
  • Loading branch information
@klihub
klihub committed Nov 23, 2022
1 parent 7239929 commit 360fd60
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 112 deletions.
78 changes: 39 additions & 39 deletions test/functional/e2e_test.go
View file
Expand Up @@ -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"
)
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -149,22 +149,22 @@ 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
}{
{
name: "empty",
},
{
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
},
Expand All @@ -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
Expand All @@ -191,22 +191,22 @@ func TestListPodSandbox(t *testing.T) {
func TestListContainers(t *testing.T) {
tcases := []struct {
name string
containers []*api.Container
containers []*criv1.Container
expectedContainers int
}{
{
name: "empty",
},
{
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
},
Expand All @@ -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
Expand All @@ -239,27 +239,27 @@ 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, ""),
},
expectedPods: 2,
},
{
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, ""),
Expand All @@ -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, ""),
Expand All @@ -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
},
Expand Down Expand Up @@ -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{
Expand All @@ -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{
Expand All @@ -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
},
Expand Down Expand Up @@ -442,39 +442,39 @@ policy:

func createPodRequest(name, uid, namespace string,
labels, annotations map[string]string,
cgroupParent string) *api.RunPodSandboxRequest {
cgroupParent string) *criv1.RunPodSandboxRequest {
if namespace == "" {
namespace = "default"
}
if labels == nil {
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,
},
},
}
}

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,
}
Expand Down

0 comments on commit 360fd60

Please sign in to comment.