Skip to content

K
k3s
Commit 3d1b6b0f authored by Joachim Bartosik's avatar Joachim Bartosik
Browse files
Options

Make runTest easier to understand

Instead of deducing metric type from details of struct describing it test cases explicitly specify the metric type they use.
parent e35ecf16
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 24 deletions
pkg/controller/podautoscaler/replica_calculator_test.go
View file @ 3d1b6b0f
...@@ -56,11 +56,21 @@ type resourceInfo struct { ...@@ -56,11 +56,21 @@ type resourceInfo struct {
expectedValue int64 expectedValue int64
} }
type metricType int
const (
objectMetric metricType = iota
externalMetric
externalPerPodMetric
podMetric
)
type metricInfo struct { type metricInfo struct {
name string name string
levels []int64 levels []int64
singleObject *autoscalingv2.CrossVersionObjectReference singleObject *autoscalingv2.CrossVersionObjectReference
selector *metav1.LabelSelector selector *metav1.LabelSelector
metricType metricType
targetUtilization int64 targetUtilization int64
perPodTargetUtilization int64 perPodTargetUtilization int64
...@@ -317,34 +327,50 @@ func (tc *replicaCalcTestCase) runTest(t *testing.T) { ...@@ -317,34 +327,50 @@ func (tc *replicaCalcTestCase) runTest(t *testing.T) {
assert.Equal(t, tc.resource.expectedUtilization, outUtilization, "utilization should be as expected") assert.Equal(t, tc.resource.expectedUtilization, outUtilization, "utilization should be as expected")
assert.Equal(t, tc.resource.expectedValue, outRawValue, "raw value should be as expected") assert.Equal(t, tc.resource.expectedValue, outRawValue, "raw value should be as expected")
assert.True(t, tc.timestamp.Equal(outTimestamp), "timestamp should be as expected") assert.True(t, tc.timestamp.Equal(outTimestamp), "timestamp should be as expected")
return
}
} else { var outReplicas int32
var outReplicas int32 var outUtilization int64
var outUtilization int64 var outTimestamp time.Time
var outTimestamp time.Time switch tc.metric.metricType {
var err error case objectMetric:
if tc.metric.singleObject != nil { if tc.metric.singleObject == nil {
outReplicas, outUtilization, outTimestamp, err = replicaCalc.GetObjectMetricReplicas(tc.currentReplicas, tc.metric.targetUtilization, tc.metric.name, testNamespace, tc.metric.singleObject, selector) t.Fatal("Metric specified as objectMetric but metric.singleObject is nil.")
} else if tc.metric.selector != nil {
if tc.metric.targetUtilization > 0 {
outReplicas, outUtilization, outTimestamp, err = replicaCalc.GetExternalMetricReplicas(tc.currentReplicas, tc.metric.targetUtilization, tc.metric.name, testNamespace, tc.metric.selector, selector)
} else if tc.metric.perPodTargetUtilization > 0 {
outReplicas, outUtilization, outTimestamp, err = replicaCalc.GetExternalPerPodMetricReplicas(tc.currentReplicas, tc.metric.perPodTargetUtilization, tc.metric.name, testNamespace, tc.metric.selector)
}
} else {
outReplicas, outUtilization, outTimestamp, err = replicaCalc.GetMetricReplicas(tc.currentReplicas, tc.metric.targetUtilization, tc.metric.name, testNamespace, selector)
} }
outReplicas, outUtilization, outTimestamp, err = replicaCalc.GetObjectMetricReplicas(tc.currentReplicas, tc.metric.targetUtilization, tc.metric.name, testNamespace, tc.metric.singleObject, selector)
if tc.expectedError != nil { case externalMetric:
require.Error(t, err, "there should be an error calculating the replica count") if tc.metric.selector == nil {
assert.Contains(t, err.Error(), tc.expectedError.Error(), "the error message should have contained the expected error message") t.Fatal("Metric specified as externalMetric but metric.selector is nil.")
return
} }
require.NoError(t, err, "there should not have been an error calculating the replica count") if tc.metric.targetUtilization <= 0 {
assert.Equal(t, tc.expectedReplicas, outReplicas, "replicas should be as expected") t.Fatalf("Metric specified as externalMetric but metric.targetUtilization is %d which is <=0.", tc.metric.targetUtilization)
assert.Equal(t, tc.metric.expectedUtilization, outUtilization, "utilization should be as expected") }
assert.True(t, tc.timestamp.Equal(outTimestamp), "timestamp should be as expected") outReplicas, outUtilization, outTimestamp, err = replicaCalc.GetExternalMetricReplicas(tc.currentReplicas, tc.metric.targetUtilization, tc.metric.name, testNamespace, tc.metric.selector, selector)
case externalPerPodMetric:
if tc.metric.selector == nil {
t.Fatal("Metric specified as externalPerPodMetric but metric.selector is nil.")
}
if tc.metric.perPodTargetUtilization <= 0 {
t.Fatalf("Metric specified as externalPerPodMetric but metric.perPodTargetUtilization is %d which is <=0.", tc.metric.perPodTargetUtilization)
}
outReplicas, outUtilization, outTimestamp, err = replicaCalc.GetExternalPerPodMetricReplicas(tc.currentReplicas, tc.metric.perPodTargetUtilization, tc.metric.name, testNamespace, tc.metric.selector)
case podMetric:
outReplicas, outUtilization, outTimestamp, err = replicaCalc.GetMetricReplicas(tc.currentReplicas, tc.metric.targetUtilization, tc.metric.name, testNamespace, selector)
default:
t.Fatalf("Unknown metric type: %d", tc.metric.metricType)
}
if tc.expectedError != nil {
require.Error(t, err, "there should be an error calculating the replica count")
assert.Contains(t, err.Error(), tc.expectedError.Error(), "the error message should have contained the expected error message")
return
} }
require.NoError(t, err, "there should not have been an error calculating the replica count")
assert.Equal(t, tc.expectedReplicas, outReplicas, "replicas should be as expected")
assert.Equal(t, tc.metric.expectedUtilization, outUtilization, "utilization should be as expected")
assert.True(t, tc.timestamp.Equal(outTimestamp), "timestamp should be as expected")
} }
func TestReplicaCalcDisjointResourcesMetrics(t *testing.T) { func TestReplicaCalcDisjointResourcesMetrics(t *testing.T) {
...@@ -444,6 +470,7 @@ func TestReplicaCalcScaleUpCM(t *testing.T) { ...@@ -444,6 +470,7 @@ func TestReplicaCalcScaleUpCM(t *testing.T) {
levels: []int64{20000, 10000, 30000}, levels: []int64{20000, 10000, 30000},
targetUtilization: 15000, targetUtilization: 15000,
expectedUtilization: 20000, expectedUtilization: 20000,
metricType: podMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -459,6 +486,7 @@ func TestReplicaCalcScaleUpCMUnreadyLessScale(t *testing.T) { ...@@ -459,6 +486,7 @@ func TestReplicaCalcScaleUpCMUnreadyLessScale(t *testing.T) {
levels: []int64{50000, 10000, 30000}, levels: []int64{50000, 10000, 30000},
targetUtilization: 15000, targetUtilization: 15000,
expectedUtilization: 30000, expectedUtilization: 30000,
metricType: podMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -474,6 +502,7 @@ func TestReplicaCalcScaleUpCMUnreadyNoScaleWouldScaleDown(t *testing.T) { ...@@ -474,6 +502,7 @@ func TestReplicaCalcScaleUpCMUnreadyNoScaleWouldScaleDown(t *testing.T) {
levels: []int64{50000, 15000, 30000}, levels: []int64{50000, 15000, 30000},
targetUtilization: 15000, targetUtilization: 15000,
expectedUtilization: 15000, expectedUtilization: 15000,
metricType: podMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -528,6 +557,7 @@ func TestReplicaCalcScaleUpCMExternal(t *testing.T) { ...@@ -528,6 +557,7 @@ func TestReplicaCalcScaleUpCMExternal(t *testing.T) {
targetUtilization: 4400, targetUtilization: 4400,
expectedUtilization: 8600, expectedUtilization: 8600,
selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}}, selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}},
metricType: podMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -544,6 +574,7 @@ func TestReplicaCalcScaleUpCMExternalIgnoresUnreadyPods(t *testing.T) { ...@@ -544,6 +574,7 @@ func TestReplicaCalcScaleUpCMExternalIgnoresUnreadyPods(t *testing.T) {
targetUtilization: 4400, targetUtilization: 4400,
expectedUtilization: 8600, expectedUtilization: 8600,
selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}}, selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}},
metricType: externalMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -558,6 +589,7 @@ func TestReplicaCalcScaleUpCMExternalNoLabels(t *testing.T) { ...@@ -558,6 +589,7 @@ func TestReplicaCalcScaleUpCMExternalNoLabels(t *testing.T) {
levels: []int64{8600}, levels: []int64{8600},
targetUtilization: 4400, targetUtilization: 4400,
expectedUtilization: 8600, expectedUtilization: 8600,
metricType: podMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -573,6 +605,7 @@ func TestReplicaCalcScaleUpPerPodCMExternal(t *testing.T) { ...@@ -573,6 +605,7 @@ func TestReplicaCalcScaleUpPerPodCMExternal(t *testing.T) {
perPodTargetUtilization: 2150, perPodTargetUtilization: 2150,
expectedUtilization: 2867, expectedUtilization: 2867,
selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}}, selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}},
metricType: externalPerPodMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -604,6 +637,7 @@ func TestReplicaCalcScaleDownCM(t *testing.T) { ...@@ -604,6 +637,7 @@ func TestReplicaCalcScaleDownCM(t *testing.T) {
levels: []int64{12000, 12000, 12000, 12000, 12000}, levels: []int64{12000, 12000, 12000, 12000, 12000},
targetUtilization: 20000, targetUtilization: 20000,
expectedUtilization: 12000, expectedUtilization: 12000,
metricType: podMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -638,6 +672,7 @@ func TestReplicaCalcScaleDownCMExternal(t *testing.T) { ...@@ -638,6 +672,7 @@ func TestReplicaCalcScaleDownCMExternal(t *testing.T) {
targetUtilization: 14334, targetUtilization: 14334,
expectedUtilization: 8600, expectedUtilization: 8600,
selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}}, selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}},
metricType: externalMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -653,6 +688,7 @@ func TestReplicaCalcScaleDownPerPodCMExternal(t *testing.T) { ...@@ -653,6 +688,7 @@ func TestReplicaCalcScaleDownPerPodCMExternal(t *testing.T) {
perPodTargetUtilization: 2867, perPodTargetUtilization: 2867,
expectedUtilization: 1720, expectedUtilization: 1720,
selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}}, selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}},
metricType: externalPerPodMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -721,6 +757,7 @@ func TestReplicaCalcToleranceCM(t *testing.T) { ...@@ -721,6 +757,7 @@ func TestReplicaCalcToleranceCM(t *testing.T) {
levels: []int64{20000, 21000, 21000}, levels: []int64{20000, 21000, 21000},
targetUtilization: 20000, targetUtilization: 20000,
expectedUtilization: 20666, expectedUtilization: 20666,
metricType: podMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -755,6 +792,7 @@ func TestReplicaCalcToleranceCMExternal(t *testing.T) { ...@@ -755,6 +792,7 @@ func TestReplicaCalcToleranceCMExternal(t *testing.T) {
targetUtilization: 8888, targetUtilization: 8888,
expectedUtilization: 8600, expectedUtilization: 8600,
selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}}, selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}},
metricType: externalMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
...@@ -770,6 +808,7 @@ func TestReplicaCalcTolerancePerPodCMExternal(t *testing.T) { ...@@ -770,6 +808,7 @@ func TestReplicaCalcTolerancePerPodCMExternal(t *testing.T) {
perPodTargetUtilization: 2900, perPodTargetUtilization: 2900,
expectedUtilization: 2867, expectedUtilization: 2867,
selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}}, selector: &metav1.LabelSelector{MatchLabels: map[string]string{"label": "value"}},
metricType: externalPerPodMetric,
}, },
} }
tc.runTest(t) tc.runTest(t)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment