opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-28 03:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.1.0 -> release/2.2.0

Browse Source 
* commit '62e269b20f3639fd21a9aeb986bbe89959aef60c':
  webconsole: support baremetal ipmitool sol
This commit is contained in:
李泽玺
2018-09-06 19:32:11 +08:00
parent 6d29c36abb 62e269b20f
commit 0732b80d05
6 changed files with 145 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/webconsole.go
+14 -5
View File
@@ -12,12 +12,12 @@ import (
)
func init() {
handleResult := func(opt o.WebConsoleFrontendOptions, obj jsonutils.JSONObject) error {
if opt.WebUrl == "" {
handleResult := func(opt o.WebConsoleOptions, obj jsonutils.JSONObject) error {
if opt.WebconsoleUrl == "" {
printObject(obj)
return nil
}
u, err := url.Parse(opt.WebUrl)
u, err := url.Parse(opt.WebconsoleUrl)
if err != nil {
return err
}
@@ -40,7 +40,7 @@ func init() {
if err != nil {
return err
}
handleResult(args.WebConsoleFrontendOptions, ret)
handleResult(args.WebConsoleOptions, ret)
return nil
})
@@ -53,7 +53,16 @@ func init() {
if err != nil {
return err
}
handleResult(args.WebConsoleFrontendOptions, ret)
handleResult(args.WebConsoleOptions, ret)
return nil
})
R(&o.WebConsoleBaremetalOptions{}, "webconsole-baremetal", "Connect baremetal host webconsole", func(s *mcclient.ClientSession, args *o.WebConsoleBaremetalOptions) error {
ret, err := modules.WebConsole.DoBaremetalConnect(s, args.ID)
if err != nil {
return err
}
handleResult(args.WebConsoleOptions, ret)
return nil
})
}