Skip to content

Commit e575860

Browse files
committed
fix(vm): fix errors with power state operations
Signed-off-by: dmitry.lopatin <[email protected]>
1 parent 676fbfa commit e575860

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

images/virtualization-artifact/pkg/controller/powerstate/kvvm_request.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
var (
29-
ErrChangesAlreadyExists = errors.New("changes already exist in the current status")
29+
ErrChangesAlreadyExist = errors.New("changes already exist in the current status")
3030
ErrUnableToCompleteRequest = errors.New("unable to complete request: stop/start already underway")
3131
)
3232

@@ -55,7 +55,7 @@ func BuildPatch(vm *kvv1.VirtualMachine, changes ...kvv1.VirtualMachineStateChan
5555
}
5656
if len(vm.Status.StateChangeRequests) != 0 {
5757
if equality.Semantic.DeepEqual(vm.Status.StateChangeRequests, changes) {
58-
return nil, ErrChangesAlreadyExists
58+
return nil, ErrChangesAlreadyExist
5959
}
6060

6161
if failOnConflict {

images/virtualization-artifact/pkg/controller/powerstate/operations.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func StartVM(ctx context.Context, cl client.Client, kvvm *kvv1.VirtualMachine) e
3737
jp, err := BuildPatch(kvvm,
3838
kvv1.VirtualMachineStateChangeRequest{Action: kvv1.StartRequest})
3939
if err != nil {
40-
if errors.Is(err, ErrChangesAlreadyExists) {
40+
if errors.Is(err, ErrChangesAlreadyExist) {
4141
return nil
4242
}
4343
return err
@@ -74,7 +74,7 @@ func RestartVM(ctx context.Context, cl client.Client, kvvm *kvv1.VirtualMachine,
7474
kvv1.VirtualMachineStateChangeRequest{Action: kvv1.StopRequest, UID: &kvvmi.UID},
7575
kvv1.VirtualMachineStateChangeRequest{Action: kvv1.StartRequest})
7676
if err != nil {
77-
if errors.Is(err, ErrChangesAlreadyExists) {
77+
if errors.Is(err, ErrChangesAlreadyExist) {
7878
return nil
7979
}
8080
return err

images/virtualization-artifact/pkg/controller/vm/internal/sync_power_state.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func (h *SyncPowerStateHandler) handleManualPolicy(
212212
return Nothing
213213
}
214214

215-
func (h *SyncPowerStateHandler) isRestartVM(kvvm *virtv1.VirtualMachine) bool {
215+
func (h *SyncPowerStateHandler) isVMRestarting(kvvm *virtv1.VirtualMachine) bool {
216216
if kvvm != nil &&
217217
len(kvvm.Status.StateChangeRequests) == 2 &&
218218
kvvm.Status.StateChangeRequests[0].Action == virtv1.StopRequest &&
@@ -232,7 +232,7 @@ func (h *SyncPowerStateHandler) handleAlwaysOnPolicy(
232232
shutdownInfo powerstate.ShutdownInfo,
233233
) (VMAction, error) {
234234
if kvvmi == nil {
235-
if h.isRestartVM(kvvm) {
235+
if h.isVMRestarting(kvvm) {
236236
return Nothing, nil
237237
}
238238

0 commit comments

Comments
 (0)