@@ -36,7 +36,9 @@ import (
3636 "github.com/deckhouse/virtualization-controller/pkg/controller/vm/internal/state"
3737 "github.com/deckhouse/virtualization-controller/pkg/logger"
3838 virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
39+ "github.com/deckhouse/virtualization/api/core/v1alpha2/cvicondition"
3940 "github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
41+ "github.com/deckhouse/virtualization/api/core/v1alpha2/vicondition"
4042 "github.com/deckhouse/virtualization/api/core/v1alpha2/vmcondition"
4143)
4244
@@ -1188,11 +1190,27 @@ var _ = Describe("BlockDeviceHandler", func() {
11881190 h = NewBlockDeviceHandler (nil , blockDeviceHandlerMock )
11891191 vi = & virtv2.VirtualImage {
11901192 ObjectMeta : metav1.ObjectMeta {Name : "vi-01" },
1191- Status : virtv2.VirtualImageStatus {Phase : virtv2 .ImageReady },
1193+ Status : virtv2.VirtualImageStatus {
1194+ Phase : virtv2 .ImageReady ,
1195+ Conditions : []metav1.Condition {
1196+ {
1197+ Type : vicondition .ReadyType .String (),
1198+ Status : metav1 .ConditionTrue ,
1199+ },
1200+ },
1201+ },
11921202 }
11931203 cvi = & virtv2.ClusterVirtualImage {
11941204 ObjectMeta : metav1.ObjectMeta {Name : "cvi-01" },
1195- Status : virtv2.ClusterVirtualImageStatus {Phase : virtv2 .ImageReady },
1205+ Status : virtv2.ClusterVirtualImageStatus {
1206+ Phase : virtv2 .ImageReady ,
1207+ Conditions : []metav1.Condition {
1208+ {
1209+ Type : cvicondition .ReadyType .String (),
1210+ Status : metav1 .ConditionTrue ,
1211+ },
1212+ },
1213+ },
11961214 }
11971215 vdFoo = & virtv2.VirtualDisk {
11981216 ObjectMeta : metav1.ObjectMeta {Name : "vd1-foo" },
@@ -1266,6 +1284,8 @@ var _ = Describe("BlockDeviceHandler", func() {
12661284 Context ("Image is not ready" , func () {
12671285 It ("VirtualImage not ready: cannot start, no warnings" , func () {
12681286 vi .Status .Phase = virtv2 .ImagePending
1287+ readyConditionCB := conditions .NewConditionBuilder (vicondition .ReadyType ).Status (metav1 .ConditionFalse )
1288+ conditions .SetCondition (readyConditionCB , & vi .Status .Conditions )
12691289 state := getBlockDevicesState (vi , cvi , vdFoo , vdBar )
12701290 ready , canStart , warnings := h .countReadyBlockDevices (vm , state , false )
12711291 Expect (ready ).To (Equal (3 ))
@@ -1275,6 +1295,8 @@ var _ = Describe("BlockDeviceHandler", func() {
12751295
12761296 It ("ClusterVirtualImage not ready: cannot start, no warnings" , func () {
12771297 cvi .Status .Phase = virtv2 .ImagePending
1298+ readyConditionCB := conditions .NewConditionBuilder (cvicondition .ReadyType ).Status (metav1 .ConditionFalse )
1299+ conditions .SetCondition (readyConditionCB , & cvi .Status .Conditions )
12781300 state := getBlockDevicesState (vi , cvi , vdFoo , vdBar )
12791301 ready , canStart , warnings := h .countReadyBlockDevices (vm , state , false )
12801302 Expect (ready ).To (Equal (3 ))
0 commit comments