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

修正：镜像通过PUT接口上传后，需要启动image convert tasks

Browse Source
This commit is contained in:
Qiu Jian
2019-01-02 17:13:47 +08:00
parent 0eb41d636a
commit 1061b47afd
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/hostdrivers/esxi.go
+1 -1
View File
@@ -228,7 +228,7 @@ func (self *SESXiHostDriver) RequestSaveUploadImageOnHost(ctx context.Context, h
ImageId string
StorageId string
StoragecacheId string
Compress bool `json:",allowempty"`
Compress bool `json:",allowfalse"`
}
spec := specStruct{}
pkg/compute/models/baremetalagents.go
+9 -7
View File
@@ -28,6 +28,8 @@ type SBaremetalagent struct {
AccessIp string `width:"16" charset:"ascii" nullable:"false" list:"admin" update:"admin" create:"admin_required"`
ManagerUri string `width:"256" charset:"ascii" nullable:"true" list:"admin" update:"admin" create:"admin_required"`
ZoneId string `width:"128" charset:"ascii" nullable:"false" list:"admin" update:"admin" create:"admin_required"`
AgentType string `width:"32" charset:"ascii" nullable:"true" default:"baremetal" list:"admin" update:"admin" create:"admin_optional"`
}
var BaremetalagentManager *SBaremetalagentManager
@@ -94,11 +96,11 @@ func (manager *SBaremetalagentManager) ValidateCreateData(ctx context.Context, u
if count > 0 {
return nil, httperrors.NewDuplicateResourceError("Duplicate manager_uri %s", mangerUri)
}
accessIp, _ := data.GetString("access_ip")
count = manager.Query().Equals("access_ip", accessIp).Count()
if count > 0 {
return nil, httperrors.NewDuplicateResourceError("Duplicate access_ip %s", accessIp)
}
//accessIp, _ := data.GetString("access_ip")
//count = manager.Query().Equals("access_ip", accessIp).Count()
//if count > 0 {
// return nil, httperrors.NewDuplicateResourceError("Duplicate access_ip %s", accessIp)
//}
return manager.SStandaloneResourceBaseManager.ValidateCreateData(ctx, userCred, ownerProjId, query, data)
}
@@ -137,7 +139,7 @@ func (self *SBaremetalagent) AllowPerformOnline(ctx context.Context, userCred mc
}
func (self *SBaremetalagent) PerformOnline(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
if self.Status != BAREMETAL_AGENT_OFFLINE {
if self.Status == BAREMETAL_AGENT_OFFLINE {
self.GetModelManager().TableSpec().Update(self, func() error {
self.Status = BAREMETAL_AGENT_ENABLED
return nil
@@ -152,7 +154,7 @@ func (self *SBaremetalagent) AllowPerformOffline(ctx context.Context, userCred m
}
func (self *SBaremetalagent) PerformOffline(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
if self.Status != BAREMETAL_AGENT_ENABLED {
if self.Status == BAREMETAL_AGENT_ENABLED {
self.GetModelManager().TableSpec().Update(self, func() error {
self.Status = BAREMETAL_AGENT_OFFLINE
return nil
pkg/image/models/images.go
+1
View File
@@ -461,6 +461,7 @@ func (self *SImage) ValidateUpdateData(ctx context.Context, userCred mcclient.To
}
self.OnSaveSuccess(ctx, userCred, "update upload success")
data.Remove("status")
self.StartImageConvertTask(ctx, userCred, "", true)
} else {
copyFrom := appParams.Request.Header.Get(modules.IMAGE_META_COPY_FROM)
if len(copyFrom) > 0 {
pkg/mcclient/modules/mod_baremetalagents.go
+1 -1
View File
@@ -8,7 +8,7 @@ func init() {
Baremetalagents = NewComputeManager(
"baremetalagent",
"baremetalagents",
[]string{"ID", "Name", "Access_ip", "Manager_URI", "Status"},
[]string{"ID", "Name", "Access_ip", "Manager_URI", "Status", "agent_type"},
[]string{},
)
registerCompute(&Baremetalagents)