fix(vm): fix errors with power state operations

Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>

Author: LopatinDmitr

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

@@ -18,6 +18,7 @@ package powerstate
 
 import (
 	"errors"
+	"fmt"
 
 	"k8s.io/apimachinery/pkg/api/equality"
 	kvv1 "kubevirt.io/api/core/v1"
@@ -26,8 +27,7 @@ import (
 )
 
 var (
-	ErrChangesAlreadyExists    = errors.New("changes already exist in the current status")
-	ErrUnableToCompleteRequest = errors.New("unable to complete request: stop/start already underway")
+	ErrChangesAlreadyExist = errors.New("changes already exist in the current status")
 )
 
 // BuildPatch creates a patch to request VM state changing via updating KVVM status.
@@ -55,11 +55,11 @@ func BuildPatch(vm *kvv1.VirtualMachine, changes ...kvv1.VirtualMachineStateChan
 		}
 		if len(vm.Status.StateChangeRequests) != 0 {
 			if equality.Semantic.DeepEqual(vm.Status.StateChangeRequests, changes) {
-				return nil, ErrChangesAlreadyExists
+				return nil, ErrChangesAlreadyExist
 			}
 
 			if failOnConflict {
-				return nil, ErrUnableToCompleteRequest
+				return nil, fmt.Errorf("unable to complete request: stop/start already underway")
 			} else {
 				verb = patch.PatchReplaceOp
 			}

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

@@ -37,7 +37,7 @@ func StartVM(ctx context.Context, cl client.Client, kvvm *kvv1.VirtualMachine) e
 	jp, err := BuildPatch(kvvm,
 		kvv1.VirtualMachineStateChangeRequest{Action: kvv1.StartRequest})
 	if err != nil {
-		if errors.Is(err, ErrChangesAlreadyExists) {
+		if errors.Is(err, ErrChangesAlreadyExist) {
 			return nil
 		}
 		return err
@@ -74,7 +74,7 @@ func RestartVM(ctx context.Context, cl client.Client, kvvm *kvv1.VirtualMachine,
 		kvv1.VirtualMachineStateChangeRequest{Action: kvv1.StopRequest, UID: &kvvmi.UID},
 		kvv1.VirtualMachineStateChangeRequest{Action: kvv1.StartRequest})
 	if err != nil {
-		if errors.Is(err, ErrChangesAlreadyExists) {
+		if errors.Is(err, ErrChangesAlreadyExist) {
 			return nil
 		}
 		return err

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

@@ -212,7 +212,7 @@ func (h *SyncPowerStateHandler) handleManualPolicy(
 	return Nothing
 }
 
-func (h *SyncPowerStateHandler) isRestartVM(kvvm *virtv1.VirtualMachine) bool {
+func (h *SyncPowerStateHandler) isVMRestarting(kvvm *virtv1.VirtualMachine) bool {
 	if kvvm != nil &&
 		len(kvvm.Status.StateChangeRequests) == 2 &&
 		kvvm.Status.StateChangeRequests[0].Action == virtv1.StopRequest &&
@@ -232,7 +232,7 @@ func (h *SyncPowerStateHandler) handleAlwaysOnPolicy(
 	shutdownInfo powerstate.ShutdownInfo,
 ) (VMAction, error) {
 	if kvvmi == nil {
-		if h.isRestartVM(kvvm) {
+		if h.isVMRestarting(kvvm) {
 			return Nothing, nil
 		}