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

Automatic merge from release/2.3.0 -> release/2.4.0

Browse Source 
* commit '9f8cb5617c3ca99f24d4759479c6826982fb0073':
  修复: webconsole参数缺失，导致yunionapi RPC调用失败
This commit is contained in:
邱剑
2018-12-05 20:43:42 +08:00
parent 0ab310fc7d 9f8cb5617c
commit a7e4e48a8b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/webconsole.go
+1 -1
View File
@@ -76,7 +76,7 @@ func init() {
})
R(&o.WebConsoleServerOptions{}, "webconsole-server", "Connect server remote graphic console", func(s *mcclient.ClientSession, args *o.WebConsoleServerOptions) error {
ret, err := modules.WebConsole.DoServerConnect(s, args.ID)
ret, err := modules.WebConsole.DoServerConnect(s, args.ID, nil)
if err != nil {
return err
}
pkg/mcclient/modules/mod_webconsole.go
+1 -1
View File
@@ -60,6 +60,6 @@ func (m WebConsoleManager) DoSshConnect(s *mcclient.ClientSession, id string, pa
return m.DoConnect(s, "ssh", id, "", nil)
}
func (m WebConsoleManager) DoServerConnect(s *mcclient.ClientSession, id string) (jsonutils.JSONObject, error) {
func (m WebConsoleManager) DoServerConnect(s *mcclient.ClientSession, id string, params jsonutils.JSONObject) (jsonutils.JSONObject, error) {
return m.DoConnect(s, "server", id, "", nil)
}