opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): add power states check in some cases (#15323)

Browse Source
This commit is contained in:
wanyaoqi
2022-11-09 00:08:21 +08:00
committed by GitHub
parent c66cbb72b7
commit 4a36afc4c5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+4 -2
View File
@@ -70,7 +70,8 @@ import (
func (self *SGuest) GetDetailsVnc(ctx context.Context, userCred mcclient.TokenCredential, input *cloudprovider.ServerVncInput) (*cloudprovider.ServerVncOutput, error) {
ret := &cloudprovider.ServerVncOutput{}
if utils.IsInStringArray(self.Status, []string{api.VM_RUNNING, api.VM_BLOCK_STREAM, api.VM_MIGRATING}) {
if self.PowerStates == api.VM_POWER_STATES_ON ||
utils.IsInStringArray(self.Status, []string{api.VM_RUNNING, api.VM_BLOCK_STREAM, api.VM_MIGRATING}) {
host, err := self.GetHost()
if err != nil {
return nil, httperrors.NewInternalServerError(errors.Wrapf(err, "GetHost").Error())
@@ -116,7 +117,8 @@ func (self *SGuest) PerformMonitor(
query jsonutils.JSONObject,
input *api.ServerMonitorInput,
) (jsonutils.JSONObject, error) {
if utils.IsInStringArray(self.Status, []string{api.VM_RUNNING, api.VM_BLOCK_STREAM, api.VM_MIGRATING}) {
if self.PowerStates == api.VM_POWER_STATES_ON ||
utils.IsInStringArray(self.Status, []string{api.VM_RUNNING, api.VM_BLOCK_STREAM, api.VM_MIGRATING}) {
if input.COMMAND == "" {
return nil, httperrors.NewMissingParameterError("command")
}