From 14e68f11f242fd5948a88fbf7a35f331131222ff Mon Sep 17 00:00:00 2001 From: ioito Date: Tue, 30 Jul 2019 20:08:32 +0800 Subject: [PATCH] fix: avoid region2 panic when update openstack storage --- pkg/compute/models/storagedrivers.go | 2 -- pkg/compute/models/storages.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/compute/models/storagedrivers.go b/pkg/compute/models/storagedrivers.go index e8ed9da34d..c99f38c6e1 100644 --- a/pkg/compute/models/storagedrivers.go +++ b/pkg/compute/models/storagedrivers.go @@ -18,7 +18,6 @@ import ( "context" "yunion.io/x/jsonutils" - "yunion.io/x/log" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/mcclient" @@ -50,6 +49,5 @@ func GetStorageDriver(storageType string) IStorageDriver { if ok { return driver } - log.Fatalf("Unsupported storageType %s", storageType) return nil } diff --git a/pkg/compute/models/storages.go b/pkg/compute/models/storages.go index 6ba0d0c787..a8a0367364 100644 --- a/pkg/compute/models/storages.go +++ b/pkg/compute/models/storages.go @@ -108,7 +108,7 @@ func (self *SStorage) ValidateUpdateData(ctx context.Context, userCred mcclient. if driver != nil { return driver.ValidateUpdateData(ctx, userCred, data, self) } - return nil, nil + return data, nil } func (self *SStorage) PostUpdate(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) {