opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix create image with userCred issue

Browse Source
This commit is contained in:
ioito
2019-07-03 20:48:19 +08:00
parent 62621d461d
commit 77e237d103
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/disks.go
+12 -7
View File
@@ -841,9 +841,11 @@ func (self *SDisk) PrepareSaveImage(ctx context.Context, userCred mcclient.Token
data.Add(jsonutils.NewString(self.DiskFormat), "disk_format")
name, _ := data.GetString("name")
s := auth.GetAdminSession(ctx, options.Options.Region, "")
if imageList, err := modules.Images.List(s, jsonutils.Marshal(map[string]string{"name": name, "admin": "true"})); err != nil {
imageList, err := modules.Images.List(s, jsonutils.Marshal(map[string]string{"name": name, "admin": "true"}))
if err != nil {
return "", err
} else if imageList.Total > 0 {
}
if imageList.Total > 0 {
return "", httperrors.NewConflictError("Duplicate image name %s", name)
}
/*
@@ -853,14 +855,17 @@ func (self *SDisk) PrepareSaveImage(ctx context.Context, userCred mcclient.Token
if _, err := modules.ImageQuotas.DoQuotaCheck(session, jsonutils.Marshal(&quota)); err != nil {
return "", err
}*/
us := auth.GetSession(ctx, userCred, options.Options.Region, "")
data.Add(jsonutils.NewInt(int64(self.DiskSize)), "virtual_size")
if result, err := modules.Images.Create(s, data); err != nil {
result, err := modules.Images.Create(us, data)
if err != nil {
return "", err
} else if imageId, err := result.GetString("id"); err != nil {
return "", err
} else {
return imageId, nil
}
imageId, err := result.GetString("id")
if err != nil {
return "", err
}
return imageId, nil
}
func (self *SDisk) AllowPerformSave(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {