esxi support

This commit is contained in:
Qiu Jian
2018-11-25 08:21:24 +08:00
parent d72eb201eb
commit 94c49ded2e
101 changed files with 3161 additions and 1703 deletions
+3
View File
@@ -2,6 +2,7 @@ package taskman
import (
"context"
"net/http"
"yunion.io/x/jsonutils"
"yunion.io/x/onecloud/pkg/mcclient"
@@ -14,6 +15,8 @@ type ITask interface {
GetTaskId() string
SetStage(stageName string, data *jsonutils.JSONDict)
GetTaskRequestHeader() http.Header
SetStageComplete(ctx context.Context, data *jsonutils.JSONDict)
SetStageFailed(ctx context.Context, reason string)
}
@@ -18,7 +18,7 @@ func init() {
func Error2TaskData(err error) jsonutils.JSONObject {
errJson := jsonutils.NewDict()
errJson.Add(jsonutils.NewString("ERROR"), "__status__")
errJson.Add(jsonutils.NewString(err.Error()), "reason")
errJson.Add(jsonutils.NewString(err.Error()), "__reason__")
return errJson
}
+9 -1
View File
@@ -423,7 +423,7 @@ func execITask(taskValue reflect.Value, task *STask, odata jsonutils.JSONObject,
return
}
log.Debugf("Call %s %s", task.TaskName, stageName)
log.Debugf("Call %s %s %#v", task.TaskName, stageName, params)
funcValue.Call(params)
// call save request context
@@ -648,3 +648,11 @@ func (self *STask) GetObject() db.IStandaloneModel {
func (self *STask) GetObjects() []db.IStandaloneModel {
return self.taskObjects
}
func (task *STask) GetTaskRequestHeader() http.Header {
header := http.Header{}
header.Set(mcclient.AUTH_TOKEN, task.GetUserCred().GetTokenString())
header.Set(mcclient.TASK_ID, task.GetTaskId())
header.Set(mcclient.REGION_VERSION, "v2")
return header
}