Skip to content

Commit 384a9d4

Browse files
committed
test(core): update migration scheduling lifecycle expectations
Signed-off-by: Daniil Antoshin <daniil.antoshin@flant.com>
1 parent 5143b42 commit 384a9d4

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

images/virtualization-artifact/pkg/controller/vmop/migration/internal/handler/lifecycle_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ var _ = Describe("LifecycleHandler", func() {
210210
),
211211
)
212212

213-
It("should keep migration scheduling in progress after migration starts", func() {
213+
It("should keep migration scheduling pending after migration starts", func() {
214214
vm := newVM(v1alpha2.PreferSafeMigrationPolicy)
215215
vm.Status.Conditions = []metav1.Condition{{
216216
Type: string(vmcondition.TypeMigrating),
@@ -239,10 +239,11 @@ var _ = Describe("LifecycleHandler", func() {
239239
_, err := h.Handle(ctx, srv.Changed())
240240
Expect(err).NotTo(HaveOccurred())
241241

242-
Expect(srv.Changed().Status.Phase).To(Equal(v1alpha2.VMOPPhaseInProgress))
242+
Expect(srv.Changed().Status.Phase).To(Equal(v1alpha2.VMOPPhasePending))
243+
Expect(srv.Changed().Status.Progress).To(Equal("2%"))
243244
completed, found := conditions.GetCondition(vmopcondition.TypeCompleted, srv.Changed().Status.Conditions)
244245
Expect(found).To(BeTrue())
245-
Expect(completed.Reason).To(Equal(vmopcondition.ReasonMigrationPrepareTarget.String()))
246+
Expect(completed.Reason).To(Equal(vmopcondition.ReasonTargetScheduling.String()))
246247
})
247248

248249
DescribeTable("TargetMigration", func(vmPolicy v1alpha2.LiveMigrationPolicy, nodeSelector map[string]string, targetMigrationEnabled bool) {

images/virtualization-artifact/pkg/monitoring/metrics/vmop/data_metric.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ type dataMetric struct {
3737
}
3838

3939
var successfulTerminalReasons = map[string]struct{}{
40-
string(vmopcondition.ReasonOperationCompleted): {},
41-
string(vmopcondition.ReasonMigrationCompleted): {},
40+
vmopcondition.ReasonOperationCompleted.String(): {},
41+
vmopcondition.ReasonMigrationCompleted.String(): {},
4242
}
4343

4444
var failedTerminalReasons = map[string]struct{}{
45-
string(vmopcondition.ReasonOperationFailed): {},
46-
string(vmopcondition.ReasonFailed): {},
47-
string(vmopcondition.ReasonAborted): {},
48-
string(vmopcondition.ReasonNotConverging): {},
49-
string(vmopcondition.ReasonTargetUnschedulable): {},
50-
string(vmopcondition.ReasonTargetDiskError): {},
45+
vmopcondition.ReasonOperationFailed.String(): {},
46+
vmopcondition.ReasonFailed.String(): {},
47+
vmopcondition.ReasonAborted.String(): {},
48+
vmopcondition.ReasonNotConverging.String(): {},
49+
vmopcondition.ReasonTargetUnschedulable.String(): {},
50+
vmopcondition.ReasonTargetDiskError.String(): {},
5151
}
5252

5353
// DO NOT mutate VirtualMachineOperation!

0 commit comments

Comments
 (0)