opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

add ucloud vnc info

Browse Source
This commit is contained in:
TangBin
2019-03-26 18:46:03 +08:00
parent b046c7cf31
commit a46c8c02cc
2 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/ucloud/instance.go
+8 -19
View File
@@ -80,7 +80,7 @@ type SVncInfo struct {
VNCPassword string `json:"VncPassword"`
UHostID string `json:"UHostId"`
Action string `json:"Action"`
VNCPort string `json:"VncPort"`
VNCPort int64 `json:"VncPort"`
}
func (self *SInstance) GetId() string {
@@ -355,23 +355,6 @@ func (self *SInstance) GetSecurityGroups() ([]SSecurityGroup, error) {
}
// https://docs.ucloud.cn/api/uhost-api/get_uhost_instance_vnc_info
/*
type RemoteConsoleInfo struct {
Host string `json:"host"`
Port int64 `json:"port"`
Protocol string `json:"protocol"`
Id string `json:"id"`
OsName string `json:"osName"`
VncPassword string `json:"vncPassword"`
// used by aliyun server
InstanceId string `json:"instance_id"`
Url string `json:"url"`
Password string `json:"password"`
}
*/
func (self *SRegion) GetInstanceVNCUrl(instanceId string) (jsonutils.JSONObject, error) {
params := NewUcloudParams()
params.Set("UHostId", instanceId)
@@ -381,5 +364,11 @@ func (self *SRegion) GetInstanceVNCUrl(instanceId string) (jsonutils.JSONObject,
return nil, err
}
return jsonutils.Marshal(&vnc), nil
vncInfo := jsonutils.NewDict()
vncInfo.Add(jsonutils.NewString(vnc.VNCIP), "host")
vncInfo.Add(jsonutils.NewInt(vnc.VNCPort), "port")
vncInfo.Add(jsonutils.NewString("vnc"), "protocol")
vncInfo.Add(jsonutils.NewString(vnc.VNCPassword), "vncPassword")
vncInfo.Add(jsonutils.NewString(vnc.VNCIP), "host")
return vncInfo, nil
}
pkg/webconsole/session/remote_console.go
+12 -8
View File
@@ -33,12 +33,6 @@ type RemoteConsoleInfo struct {
}
func NewRemoteConsoleInfoByCloud(s *mcclient.ClientSession, serverId string) (*RemoteConsoleInfo, error) {
metadata, err := modules.Servers.GetSpecific(s, serverId, "metadata", nil)
if err != nil {
return nil, err
}
osName, _ := metadata.GetString("os_name")
vncPasswd, _ := metadata.GetString("__vnc_password")
ret, err := modules.Servers.GetSpecific(s, serverId, "vnc", nil)
if err != nil {
return nil, err
@@ -48,8 +42,18 @@ func NewRemoteConsoleInfoByCloud(s *mcclient.ClientSession, serverId string) (*R
if err != nil {
return nil, err
}
vncInfo.OsName = osName
vncInfo.VncPassword = vncPasswd
if len(vncInfo.OsName) == 0 || len(vncInfo.VncPassword) == 0{
metadata, err := modules.Servers.GetSpecific(s, serverId, "metadata", nil)
if err != nil {
return nil, err
}
osName, _ := metadata.GetString("os_name")
vncPasswd, _ := metadata.GetString("__vnc_password")
vncInfo.OsName = osName
vncInfo.VncPassword = vncPasswd
}
return &vncInfo, nil
}