mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-02 19:28:16 +00:00
We want to make the return type of the GetDevices() method of the podresources DevicesProvider interface consistent with the newly added GetAllocatableDevices type. This makes the code easier to read and reduces the coupling between the podresourcesapi server and the devicemanager code. No intended changes in behaviour, but the different return types now requires some data massaging. Tests are updated accordingly. Signed-off-by: Francesco Romani <fromani@redhat.com>
177 lines
4.5 KiB
Go
177 lines
4.5 KiB
Go
/*
|
|
Copyright 2018 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.
|
|
*/
|
|
|
|
package podresources
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/mock"
|
|
|
|
"k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/types"
|
|
pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
|
|
"k8s.io/kubelet/pkg/apis/podresources/v1alpha1"
|
|
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
|
|
"k8s.io/kubernetes/pkg/kubelet/cm/devicemanager"
|
|
)
|
|
|
|
type mockProvider struct {
|
|
mock.Mock
|
|
}
|
|
|
|
func (m *mockProvider) GetPods() []*v1.Pod {
|
|
args := m.Called()
|
|
return args.Get(0).([]*v1.Pod)
|
|
}
|
|
|
|
func (m *mockProvider) GetDevices(podUID, containerName string) devicemanager.ResourceDeviceInstances {
|
|
args := m.Called(podUID, containerName)
|
|
return args.Get(0).(devicemanager.ResourceDeviceInstances)
|
|
}
|
|
|
|
func (m *mockProvider) GetCPUs(podUID, containerName string) cpuset.CPUSet {
|
|
args := m.Called(podUID, containerName)
|
|
return args.Get(0).(cpuset.CPUSet)
|
|
}
|
|
|
|
func (m *mockProvider) UpdateAllocatedDevices() {
|
|
m.Called()
|
|
}
|
|
|
|
func (m *mockProvider) GetAllocatableDevices() devicemanager.ResourceDeviceInstances {
|
|
args := m.Called()
|
|
return args.Get(0).(devicemanager.ResourceDeviceInstances)
|
|
}
|
|
|
|
func (m *mockProvider) GetAllocatableCPUs() cpuset.CPUSet {
|
|
args := m.Called()
|
|
return args.Get(0).(cpuset.CPUSet)
|
|
}
|
|
|
|
func TestListPodResourcesV1alpha1(t *testing.T) {
|
|
podName := "pod-name"
|
|
podNamespace := "pod-namespace"
|
|
podUID := types.UID("pod-uid")
|
|
containerName := "container-name"
|
|
|
|
devs := devicemanager.ResourceDeviceInstances{
|
|
"resource": devicemanager.DeviceInstances{
|
|
"dev0": pluginapi.Device{},
|
|
"dev1": pluginapi.Device{},
|
|
},
|
|
}
|
|
|
|
for _, tc := range []struct {
|
|
desc string
|
|
pods []*v1.Pod
|
|
devices devicemanager.ResourceDeviceInstances
|
|
expectedResponse *v1alpha1.ListPodResourcesResponse
|
|
}{
|
|
{
|
|
desc: "no pods",
|
|
pods: []*v1.Pod{},
|
|
devices: devicemanager.NewResourceDeviceInstances(),
|
|
expectedResponse: &v1alpha1.ListPodResourcesResponse{},
|
|
},
|
|
{
|
|
desc: "pod without devices",
|
|
pods: []*v1.Pod{
|
|
{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: podName,
|
|
Namespace: podNamespace,
|
|
UID: podUID,
|
|
},
|
|
Spec: v1.PodSpec{
|
|
Containers: []v1.Container{
|
|
{
|
|
Name: containerName,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
devices: devicemanager.NewResourceDeviceInstances(),
|
|
expectedResponse: &v1alpha1.ListPodResourcesResponse{
|
|
PodResources: []*v1alpha1.PodResources{
|
|
{
|
|
Name: podName,
|
|
Namespace: podNamespace,
|
|
Containers: []*v1alpha1.ContainerResources{
|
|
{
|
|
Name: containerName,
|
|
Devices: []*v1alpha1.ContainerDevices{},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
desc: "pod with devices",
|
|
pods: []*v1.Pod{
|
|
{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: podName,
|
|
Namespace: podNamespace,
|
|
UID: podUID,
|
|
},
|
|
Spec: v1.PodSpec{
|
|
Containers: []v1.Container{
|
|
{
|
|
Name: containerName,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
devices: devs,
|
|
expectedResponse: &v1alpha1.ListPodResourcesResponse{
|
|
PodResources: []*v1alpha1.PodResources{
|
|
{
|
|
Name: podName,
|
|
Namespace: podNamespace,
|
|
Containers: []*v1alpha1.ContainerResources{
|
|
{
|
|
Name: containerName,
|
|
Devices: v1DevicesToAlphaV1(containerDevicesFromResourceDeviceInstances(devs)),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
} {
|
|
t.Run(tc.desc, func(t *testing.T) {
|
|
m := new(mockProvider)
|
|
m.On("GetPods").Return(tc.pods)
|
|
m.On("GetDevices", string(podUID), containerName).Return(tc.devices)
|
|
m.On("UpdateAllocatedDevices").Return()
|
|
server := NewV1alpha1PodResourcesServer(m, m)
|
|
resp, err := server.List(context.TODO(), &v1alpha1.ListPodResourcesRequest{})
|
|
if err != nil {
|
|
t.Errorf("want err = %v, got %q", nil, err)
|
|
}
|
|
if tc.expectedResponse.String() != resp.String() {
|
|
t.Errorf("want resp = %s, got %s", tc.expectedResponse.String(), resp.String())
|
|
}
|
|
})
|
|
}
|
|
}
|