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

Merge pull request #7890 from swordqiu/hotfix/qj-disable-webkms-for-esxi-older-than-6.5

Browse Source 
fix: disable webkms for esxi older than 6.5
This commit is contained in:
yunion-ci-robot
2020-09-12 23:55:15 +08:00
committed by GitHub
parent be55e9e8cd 239797e33c
commit bb8ceb4451
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/esxi/virtualmachine.go
+9 -13
View File
@@ -43,6 +43,7 @@ import (
"yunion.io/x/onecloud/pkg/multicloud"
"yunion.io/x/onecloud/pkg/util/billing"
"yunion.io/x/onecloud/pkg/util/netutils2"
"yunion.io/x/onecloud/pkg/util/version"
)
var VIRTUAL_MACHINE_PROPS = []string{"name", "parent", "runtime", "summary", "config", "guest", "resourcePool", "layoutEx"}
@@ -573,11 +574,14 @@ func (self *SVirtualMachine) doDetachDisk(ctx context.Context, vdisk *SVirtualDi
}
func (self *SVirtualMachine) GetVNCInfo() (jsonutils.JSONObject, error) {
info, err := self.acquireWebmksTicket("webmks")
if err != nil {
info, err = self.acquireVmrcUrl()
hostVer := self.GetIHost().GetVersion()
if version.GE(hostVer, "6.5") {
info, err := self.acquireWebmksTicket("webmks")
if err == nil {
return info, nil
}
}
return info, err
return self.acquireVmrcUrl()
}
func (self *SVirtualMachine) acquireWebmksTicket(ticketType string) (jsonutils.JSONObject, error) {
@@ -599,14 +603,6 @@ func (self *SVirtualMachine) acquireWebmksTicket(ticketType string) (jsonutils.J
if port == 0 {
port = 443
}
/*
ret.Add(jsonutils.NewString(ticketType), "type")
ret.Add(jsonutils.NewString(ticket.Host), "host")
ret.Add(jsonutils.NewInt(int64(ticket.Port)), "port")
ret.Add(jsonutils.NewString(ticket.Ticket), "ticket")
ret.Add(jsonutils.NewString(ticket.SslThumbprint), "slThumbprint")
ret.Add(jsonutils.NewString(ticket.CfgFile), "cfgFile")
*/
url := fmt.Sprintf("wss://%s:%d/ticket/%s", host, port, ticket.Ticket)
ret.Add(jsonutils.NewString("wmks"), "protocol")
ret.Add(jsonutils.NewString(url), "url")
@@ -1266,7 +1262,7 @@ func (self *SVirtualMachine) GetIHostId() string {
log.Errorf("hostsystem reference2Object %s", err)
return ""
}
shost := NewHost(nil, &moHost, nil)
shost := NewHost(self.manager, &moHost, nil)
return shost.GetGlobalId()
}