Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: added Unit Test for real_time/calculateUsageNanoCores #515

Merged
merged 16 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions pkg/metrics/real_time.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,27 @@ func calculateUsageNanoCores(containerName *string, lastPodStatus *realtimeMetri
return newUInt64Pointer(0)
}
var timeWindowsSeconds uint64 = timeWindowsNanoSeconds / 1000000000

if timeWindowsSeconds <= 0 {
return newUInt64Pointer(0)
}

if containerName == nil {
// calculate for Pod
v := (newPodStatus.CPU.UsageCoreNanoSeconds - lastPodStatus.CPU.UsageCoreNanoSeconds) / timeWindowsSeconds
usageDiff := int64(newPodStatus.CPU.UsageCoreNanoSeconds - lastPodStatus.CPU.UsageCoreNanoSeconds)
if usageDiff <= 0 {
return newUInt64Pointer(0)
}

v := uint64(usageDiff) / timeWindowsSeconds
return &v
} else {
// calcuate for specified container
var oldContainerUsageCoreNanoSeconds *uint64 = nil
for _, container := range lastPodStatus.Containers {
if container.Name == *containerName {
oldContainerUsageCoreNanoSeconds = &container.CPU.UsageCoreNanoSeconds
containerUsageCoreNanoSeconds := container.CPU.UsageCoreNanoSeconds
Fei-Guo marked this conversation as resolved.
Show resolved Hide resolved
oldContainerUsageCoreNanoSeconds = &containerUsageCoreNanoSeconds
}
}
if oldContainerUsageCoreNanoSeconds == nil {
Expand All @@ -238,13 +249,18 @@ func calculateUsageNanoCores(containerName *string, lastPodStatus *realtimeMetri
var newContainerUsageCoreNanoSeconds *uint64 = nil
for _, container := range newPodStatus.Containers {
if container.Name == *containerName {
newContainerUsageCoreNanoSeconds = &container.CPU.UsageCoreNanoSeconds
containerUsageCoreNanoSeconds := container.CPU.UsageCoreNanoSeconds
newContainerUsageCoreNanoSeconds = &containerUsageCoreNanoSeconds
}
}
if newContainerUsageCoreNanoSeconds == nil {
return newUInt64Pointer(0)
}
v := (*newContainerUsageCoreNanoSeconds - *oldContainerUsageCoreNanoSeconds) / timeWindowsSeconds
usageDiff := int64(*newContainerUsageCoreNanoSeconds - *oldContainerUsageCoreNanoSeconds)
if usageDiff <= 0 {
return newUInt64Pointer(0)
}
v := uint64(usageDiff) / timeWindowsSeconds
return &v
}
}
Expand Down
150 changes: 150 additions & 0 deletions pkg/metrics/real_time_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
package metrics

import (
"testing"

"github.com/stretchr/testify/assert"
)

func TestCalculateUsageNanoCores(t *testing.T) {

fake_container1 := "fake-container-name1"
fake_container2 := "fake-container-name2"

newPodStatus_containers := []containerStats{
{
Name: fake_container1,
CPU: cpuStats{
UsageCoreNanoSeconds: 2345678900,
},
},
{
Name: fake_container2,
CPU: cpuStats{
UsageCoreNanoSeconds: 1234567800,
},
},
}

lastPodStatus_containers := []containerStats{
{
Name: fake_container1,
CPU: cpuStats{
UsageCoreNanoSeconds: 1234567800,
},
},
{
Name: fake_container2,
CPU: cpuStats{
UsageCoreNanoSeconds: 2345678900,
},
},
}

testCases := []struct {
desc string
containerName *string
lastPodStatus *realtimeMetricsExtensionPodStats
newPodStatus *realtimeMetricsExtensionPodStats
expectedUsage *uint64
}{
{
desc: "NewPodStatus timestamp is earlier than LastPodStatus",
containerName: nil,
lastPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 2345000000,
},
newPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 1234000000,
},
expectedUsage: newUInt64Pointer(0),
},
{
desc: "New and Last Pod Status Timestamp difference value is very low",
containerName: nil,
lastPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 1234,
CPU: cpuStats{
UsageCoreNanoSeconds: 1234567,
},
},
newPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 2345,
CPU: cpuStats{
UsageCoreNanoSeconds: 2345678,
},
},
expectedUsage: newUInt64Pointer(0),
},
{
desc: "Container Name is nil and lastPodStatus.CPU.UsageCoreNanoSeconds is greater than newPodStatus.CPU.UsageCoreNanoSeconds",
containerName: nil,
lastPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 1234500000,
CPU: cpuStats{
UsageCoreNanoSeconds: 2345678000,
},
},
newPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 2345600000,
CPU: cpuStats{
UsageCoreNanoSeconds: 1234567000,
},
},
expectedUsage: newUInt64Pointer(0),
},
{
desc: "Container Name is nil and newPodStatus.CPU.UsageCoreNanoSeconds is greater than lastPodStatus.CPU.UsageCoreNanoSeconds",
containerName: nil,
lastPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 1234500000,
CPU: cpuStats{
UsageCoreNanoSeconds: 1234567000,
},
},
newPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 2345600000,
CPU: cpuStats{
UsageCoreNanoSeconds: 2345678000,
},
},
//tc.newPodStatus.CPU.UsageCoreNanoSeconds-tc.lastPodStatus.CPU.UsageCoreNanoSeconds/((tc.newPodStatus.TimeStamp-tc.lastPodStatus.TimeStamp)/1000000000)
expectedUsage: newUInt64Pointer(1111111000 / (1111100000 / 1000000000)),
},
{
desc: "Container Name is not nil and newPodStatus.CPU.UsageCoreNanoSeconds is greater than lastPodStatus.CPU.UsageCoreNanoSeconds",
containerName: &fake_container1,
lastPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 1234560000,
Containers: lastPodStatus_containers,
},
newPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 2345670000,
Containers: newPodStatus_containers,
},
//tc.newPodStatus.containers[i=0].CPU.UsageCoreNanoSeconds-tc.lastPodStatus.containers[i=0].CPU.UsageCoreNanoSeconds/((tc.newPodStatus.TimeStamp-tc.lastPodStatus.TimeStamp)/1000000000)
expectedUsage: newUInt64Pointer(1111111100 / (1111110000 / 1000000000)),
},
{
desc: "Container Name is not nil and lastPodStatus.CPU.UsageCoreNanoSeconds is greater than newPodStatus.CPU.UsageCoreNanoSeconds",
containerName: &fake_container2,
lastPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 1234500000,
Containers: lastPodStatus_containers,
},
newPodStatus: &realtimeMetricsExtensionPodStats{
Timestamp: 2345600000,
Containers: lastPodStatus_containers,
},
expectedUsage: newUInt64Pointer(0),
},
}

for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
nanoCoreUsage := calculateUsageNanoCores(tc.containerName, tc.lastPodStatus, tc.newPodStatus)
assert.EqualValues(t, tc.expectedUsage, nanoCoreUsage, tc.desc)
})
}

}