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

baremetal related api

Browse Source
This commit is contained in:
Zexi Li
2019-01-22 16:56:47 +08:00
parent 07863a7d6f
commit 1dd89ffd59
6 changed files with 139 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/baremetal/handler/delay.go
+7 -5
View File
@@ -14,30 +14,32 @@ func init() {
delayTaskWorkerMan = appsrv.NewWorkerManager("DelayTaskWorkerManager", 8, 1024)
}
type ProcessFunc func() (jsonutils.JSONObject, error)
type ProcessFunc func(data jsonutils.JSONObject) (jsonutils.JSONObject, error)
type delayTask struct {
process ProcessFunc
taskId string
session *mcclient.ClientSession
data jsonutils.JSONObject
}
func newDelayTask(process ProcessFunc, session *mcclient.ClientSession, taskId string) *delayTask {
func newDelayTask(process ProcessFunc, session *mcclient.ClientSession, taskId string, data jsonutils.JSONObject) *delayTask {
return &delayTask{
process: process,
taskId: taskId,
session: session,
data: data,
}
}
func DelayProcess(process ProcessFunc, session *mcclient.ClientSession, taskId string) {
func DelayProcess(process ProcessFunc, session *mcclient.ClientSession, taskId string, data jsonutils.JSONObject) {
delayTaskWorkerMan.Run(func() {
executeDelayProcess(newDelayTask(process, session, taskId))
executeDelayProcess(newDelayTask(process, session, taskId, data))
}, nil, nil)
}
func executeDelayProcess(task *delayTask) {
ret, err := task.process()
ret, err := task.process(task.data)
if err != nil {
modules.ComputeTasks.TaskFailed(task.session, task.taskId, err)
return
pkg/baremetal/handler/handlers.go
+21 -4
View File
@@ -5,7 +5,6 @@ import (
"yunion.io/x/onecloud/pkg/appsrv"
"yunion.io/x/onecloud/pkg/baremetal"
"yunion.io/x/onecloud/pkg/baremetal/tasks"
"yunion.io/x/onecloud/pkg/httperrors"
)
@@ -19,7 +18,10 @@ func initBaremetalsHandler(app *appsrv.Application) {
app.AddHandler("POST", getBaremetalPrefix("unmaintenance"), objectMiddleware(handleBaremetalUnmaintenance))
app.AddHandler("POST", getBaremetalPrefix("delete"), objectMiddleware(handleBaremetalDelete))
app.AddHandler("POST", getBaremetalPrefix("syncstatus"), objectMiddleware(handleBaremetalSyncStatus))
app.AddHandler("POST", getBaremetalPrefix("sync-config"), objectMiddleware(handleBaremetalSyncConfig))
app.AddHandler("POST", getBaremetalPrefix("sync-ipmi"), objectMiddleware(handleBaremetalSyncIPMI))
app.AddHandler("POST", getBaremetalPrefix("prepare"), objectMiddleware(handleBaremetalPrepare))
app.AddHandler("POST", getBaremetalPrefix("reset-bmc"), objectMiddleware(handleBaremetalResetBMC))
}
func handleBaremetalNotify(ctx *Context, bm *baremetal.SBaremetalInstance) {
@@ -38,7 +40,7 @@ func handleBaremetalNotify(ctx *Context, bm *baremetal.SBaremetalInstance) {
task := bm.GetTask()
log.Errorf("====== get task %#v", task)
if task != nil {
task.(*tasks.SBaremetalServerPrepareTask).SSHExecute(task, remoteAddr, key, nil)
task.SSHExecute(task, remoteAddr, key, nil)
}
ctx.ResponseOk()
}
@@ -54,12 +56,22 @@ func handleBaremetalUnmaintenance(ctx *Context, bm *baremetal.SBaremetalInstance
}
func handleBaremetalDelete(ctx *Context, bm *baremetal.SBaremetalInstance) {
ctx.DelayProcess(bm.DelayedRemove)
ctx.DelayProcess(bm.DelayedRemove, nil)
ctx.ResponseOk()
}
func handleBaremetalSyncStatus(ctx *Context, bm *baremetal.SBaremetalInstance) {
ctx.DelayProcess(bm.DelayedSyncStatus)
ctx.DelayProcess(bm.DelayedSyncStatus, nil)
ctx.ResponseOk()
}
func handleBaremetalSyncConfig(ctx *Context, bm *baremetal.SBaremetalInstance) {
ctx.DelayProcess(bm.DelayedSyncDesc, nil)
ctx.ResponseOk()
}
func handleBaremetalSyncIPMI(ctx *Context, bm *baremetal.SBaremetalInstance) {
ctx.DelayProcess(bm.DelayedSyncIPMIInfo, nil)
ctx.ResponseOk()
}
@@ -67,3 +79,8 @@ func handleBaremetalPrepare(ctx *Context, bm *baremetal.SBaremetalInstance) {
bm.StartBaremetalReprepareTask(ctx.UserCred(), ctx.TaskId(), ctx.Data())
ctx.ResponseOk()
}
func handleBaremetalResetBMC(ctx *Context, bm *baremetal.SBaremetalInstance) {
bm.StartBaremetalResetBMCTask(ctx.UserCred(), ctx.TaskId(), ctx.Data())
ctx.ResponseOk()
}
pkg/baremetal/handler/middleware.go
+2 -2
View File
@@ -123,6 +123,6 @@ func (ctx *Context) GetBaremetalManager() *baremetal.SBaremetalManager {
return baremetal.GetBaremetalManager()
}
func (ctx *Context) DelayProcess(process ProcessFunc) {
DelayProcess(process, ctx.GetBaremetalManager().GetClientSession(), ctx.TaskId())
func (ctx *Context) DelayProcess(process ProcessFunc, data jsonutils.JSONObject) {
DelayProcess(process, ctx.GetBaremetalManager().GetClientSession(), ctx.TaskId(), data)
}
pkg/baremetal/manager.go
+41 -2
View File
@@ -450,7 +450,7 @@ func (b *SBaremetalInstance) AutoSyncAllStatus() {
b.SyncAllStatus("")
}
func (b *SBaremetalInstance) DelayedSyncStatus() (jsonutils.JSONObject, error) {
func (b *SBaremetalInstance) DelayedSyncStatus(_ jsonutils.JSONObject) (jsonutils.JSONObject, error) {
b.AutoSyncAllStatus()
return nil, nil
}
@@ -816,7 +816,7 @@ func (b *SBaremetalInstance) GetZoneId() string {
return b.manager.GetZoneId()
}
func (b *SBaremetalInstance) DelayedRemove() (jsonutils.JSONObject, error) {
func (b *SBaremetalInstance) DelayedRemove(_ jsonutils.JSONObject) (jsonutils.JSONObject, error) {
b.remove()
return nil, nil
}
@@ -847,3 +847,42 @@ func (b *SBaremetalInstance) StartBaremetalReprepareTask(userCred mcclient.Token
task := tasks.NewBaremetalReprepareTask(b, taskId, data)
b.SetTask(task)
}
func (b *SBaremetalInstance) StartBaremetalResetBMCTask(userCred mcclient.TokenCredential, taskId string, data jsonutils.JSONObject) {
task := tasks.NewBaremetalResetBMCTask(b, taskId, data)
b.SetTask(task)
}
func (b *SBaremetalInstance) DelayedSyncIPMIInfo(data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
ipmiCli := b.GetIPMITool()
lanChannel := b.GetIPMILanChannel()
sysInfo, err := ipmitool.GetSysInfo(ipmiCli)
if err != nil {
return nil, err
}
if lanChannel <= 0 {
lanChannel = ipmitool.GetDefaultLanChannel(sysInfo)
}
retObj := make(map[string]string)
if ipAddr, _ := data.GetString("ip_addr"); ipAddr != "" {
err = ipmitool.SetLanStaticIP(ipmiCli, lanChannel, ipAddr)
if err != nil {
return nil, err
}
// TODO: netutils.wait_ip_alive(ipAddr, 120)
retObj["ipmi_ip_addr"] = ipAddr
}
if passwd, _ := data.GetString("password"); passwd != "" {
err = ipmitool.SetLanPasswd(ipmiCli, ipmitool.GetRootId(sysInfo), passwd)
if err != nil {
return nil, err
}
retObj["ipmi_password"] = passwd
}
return jsonutils.Marshal(retObj), nil
}
func (b *SBaremetalInstance) DelayedSyncDesc(data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
err := b.SaveDesc(data)
return nil, err
}
pkg/baremetal/tasks/resetbmc.go
+67
View File
@@ -0,0 +1,67 @@
package tasks
import (
"context"
"time"
"yunion.io/x/jsonutils"
"yunion.io/x/onecloud/pkg/baremetal/types"
"yunion.io/x/onecloud/pkg/baremetal/utils/ipmitool"
"yunion.io/x/onecloud/pkg/util/ssh"
)
type SBaremetalResetBMCTask struct {
*SBaremetalPXEBootTaskBase
term *ssh.Client
}
func NewBaremetalResetBMCTask(
baremetal IBaremetal,
taskId string,
data jsonutils.JSONObject,
) *SBaremetalResetBMCTask {
task := new(SBaremetalResetBMCTask)
baseTask := newBaremetalPXEBootTaskBase(baremetal, taskId, data)
task.SBaremetalPXEBootTaskBase = baseTask
baseTask.InitPXEBootTask(task, data)
return task
}
func (self *SBaremetalResetBMCTask) GetName() string {
return "BaremetalResetBMCTask"
}
func (self *SBaremetalResetBMCTask) GetIPMITool() *ipmitool.SSHIPMI {
return ipmitool.NewSSHIPMI(self.term)
}
func (self *SBaremetalResetBMCTask) OnPXEBoot(ctx context.Context, term *ssh.Client, args interface{}) error {
self.term = term
self.SetStage(self.WaitForBMCReady)
err := ipmitool.DoBMCReset(self.GetIPMITool())
if err != nil {
return err
}
time.Sleep(10 * time.Second)
ExecuteTask(self, nil)
return nil
}
func (self *SBaremetalResetBMCTask) WaitForBMCReady(ctx context.Context, args interface{}) error {
self.SetStage(self.OnBMCReady)
status, err := ipmitool.GetChassisPowerStatus(self.GetIPMITool())
if err != nil {
return err
}
if status != "" && status == types.POWER_STATUS_ON {
ExecuteTask(self, nil)
}
return nil
}
func (self *SBaremetalResetBMCTask) OnBMCReady(ctx context.Context, args interface{}) error {
time.Sleep(20 * time.Second)
SetTaskComplete(self, nil)
return nil
}
pkg/baremetal/utils/ipmitool/ipmitool.go
+1 -1
View File
@@ -330,7 +330,7 @@ func SetLanUserPasswd(exector IPMIExecutor, channel int, user string, password s
return doActions(exector, "set_lan_user_password3", args...)
}
func SetLanPasswd(exector IPMIExecutor, rootId string, password string) error {
func SetLanPasswd(exector IPMIExecutor, rootId int, password string) error {
// TODO: escape password
args := newArgs("user", "set", "password", rootId, fmt.Sprint("\"%s\"", password))
return doActions(exector, "set_lan_passwd", args)