github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

node: device-mgr: e2e: adapt to sample device plugin refactoring

Browse Source 
These updates are to adapt to the sample device plugin
refactoring done here: 92e00203e0.

Signed-off-by: Swati Sehgal <swsehgal@redhat.com>
This commit is contained in:
Swati Sehgal 2023-02-27 13:34:59 +00:00
parent bae8a164e0
commit 01a9148887
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e_node/device_manager_test.go
View File

@ -361,7 +361,7 @@ var _ = SIGDescribe("Device Manager [Serial] [Feature:DeviceManager][NodeFeatur
dp := &v1.Pod{ dp := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: sampleDevicePluginName, Name: SampleDevicePluginName,
}, },
Spec: ds.Spec.Template.Spec, Spec: ds.Spec.Template.Spec,
} }
@ -403,9 +403,9 @@ var _ = SIGDescribe("Device Manager [Serial] [Feature:DeviceManager][NodeFeatur
var err error var err error
podCMD := "while true; do sleep 1000; done;" podCMD := "while true; do sleep 1000; done;"
ginkgo.By(fmt.Sprintf("creating a pods requiring %d %q", deviceCount, resourceName)) ginkgo.By(fmt.Sprintf("creating a pods requiring %d %q", deviceCount, SampleDeviceResourceName))
pod := makeBusyboxDeviceRequiringPod(resourceName, podCMD) pod := makeBusyboxDeviceRequiringPod(SampleDeviceResourceName, podCMD)
testPod := e2epod.NewPodClient(f).CreateSync(ctx, pod) testPod := e2epod.NewPodClient(f).CreateSync(ctx, pod)
ginkgo.By("making sure all the pods are ready") ginkgo.By("making sure all the pods are ready")
@ -646,7 +646,7 @@ func isNodeReadyWithSampleResources(ctx context.Context, f *framework.Framework)
return false, fmt.Errorf("Expected node to be ready=%t", ready) return false, fmt.Errorf("Expected node to be ready=%t", ready)
} }
if numberOfSampleResources(node) <= 0 { if CountSampleDeviceCapacity(node) <= 0 {
return false, fmt.Errorf("Expected devices to be advertised") return false, fmt.Errorf("Expected devices to be advertised")
} }
return true, nil return true, nil
@ -679,11 +679,11 @@ func isNodeReadyWithAllocatableSampleResources(ctx context.Context, f *framework
return false, fmt.Errorf("Expected node to be ready=%t", ready) return false, fmt.Errorf("Expected node to be ready=%t", ready)
} }
if numberOfDevicesCapacity(node, resourceName) != devCount { if CountSampleDeviceCapacity(node) != devCount {
return false, fmt.Errorf("Expected devices capacity to be: %d", devCount) return false, fmt.Errorf("Expected devices capacity to be: %d", devCount)
} }
if numberOfDevicesAllocatable(node, resourceName) != devCount { if CountSampleDeviceAllocatable(node) != devCount {
return false, fmt.Errorf("Expected devices allocatable to be: %d", devCount) return false, fmt.Errorf("Expected devices allocatable to be: %d", devCount)
} }
return true, nil return true, nil
@ -695,7 +695,7 @@ func isNodeReadyWithoutSampleResources(ctx context.Context, f *framework.Framewo
return false, fmt.Errorf("Expected node to be ready=%t", ready) return false, fmt.Errorf("Expected node to be ready=%t", ready)
} }
if numberOfSampleResources(node) > 0 { if CountSampleDeviceCapacity(node) > 0 {
return false, fmt.Errorf("Expected devices to be not present") return false, fmt.Errorf("Expected devices to be not present")
} }
return true, nil return true, nil