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

Merge pull request #1327 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-release-2.8-build-failed to release/2.8.0

Browse Source 
* commit 'd57e56b7be022e4cf113ba8e46215132515b9b9a':
  Fix: release/2.8.0 region build error
This commit is contained in:
周有松
2019-03-26 15:37:20 +08:00
parent 739ccd9f0f d57e56b7be
commit 871e59c4bb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/managedvirtual.go
+5 -5
View File
@@ -9,6 +9,7 @@ import (
"yunion.io/x/log"
"yunion.io/x/pkg/util/compare"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
@@ -109,12 +110,11 @@ func (self *SManagedVirtualizedGuestDriver) RequestGuestCreateAllDisks(ctx conte
return storageCache.StartImageCacheTask(ctx, task.GetUserCred(), imageId, diskCat.Root.DiskFormat, false, task.GetTaskId())
}
func (self *SManagedVirtualizedGuestDriver) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
if data.Contains("cdrom") {
hypervisor, _ := data.GetString("hypervisor")
return nil, httperrors.NewInputParameterError("%s not support cdrom params", hypervisor)
func (self *SManagedVirtualizedGuestDriver) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, input *api.ServerCreateInput) (*api.ServerCreateInput, error) {
if input.Cdrom != "" {
return nil, httperrors.NewInputParameterError("%s not support cdrom params", input.Hypervisor)
}
return data, nil
return input, nil
}
func (self *SManagedVirtualizedGuestDriver) RequestDetachDisk(ctx context.Context, guest *models.SGuest, task taskman.ITask) error {