From f514514eab0608c7678198b54556f13966aabfed Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Mon, 19 Apr 2021 19:33:23 +0800 Subject: [PATCH] fix(region): wait more time for creating nas --- pkg/compute/tasks/filesystem_create_task.go | 2 +- pkg/multicloud/aliyun/filesystem.go | 2 +- pkg/multicloud/huawei/sfs-turbo.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/compute/tasks/filesystem_create_task.go b/pkg/compute/tasks/filesystem_create_task.go index 5b50a7b001..8e93555f8c 100644 --- a/pkg/compute/tasks/filesystem_create_task.go +++ b/pkg/compute/tasks/filesystem_create_task.go @@ -85,7 +85,7 @@ func (self *FileSystemCreateTask) OnInit(ctx context.Context, obj db.IStandalone } db.SetExternalId(fs, self.GetUserCred(), iFs.GetGlobalId()) - cloudprovider.WaitMultiStatus(iFs, []string{api.NAS_STATUS_AVAILABLE, api.NAS_STATUS_CREATE_FAILED}, time.Second*5, time.Minute*3) + cloudprovider.WaitMultiStatus(iFs, []string{api.NAS_STATUS_AVAILABLE, api.NAS_STATUS_CREATE_FAILED}, time.Second*5, time.Minute*10) self.SetStage("OnSyncstatusComplete", nil) fs.StartSyncstatus(ctx, self.GetUserCred(), self.GetTaskId()) diff --git a/pkg/multicloud/aliyun/filesystem.go b/pkg/multicloud/aliyun/filesystem.go index 52b797de9c..236862b8aa 100644 --- a/pkg/multicloud/aliyun/filesystem.go +++ b/pkg/multicloud/aliyun/filesystem.go @@ -257,7 +257,7 @@ func (self *SRegion) CreateMountTarget(opts *cloudprovider.SMountTargetCreateOpt "RegionId": self.RegionId, "FileSystemId": opts.FileSystemId, "AccessGroupName": strings.TrimPrefix(strings.TrimPrefix(opts.AccessGroupId, "extreme/"), "standard/"), - "NetworkType": opts.NetworkType, + "NetworkType": utils.Capitalize(opts.NetworkType), "VpcId": opts.VpcId, "VSwitchId": opts.NetworkId, } diff --git a/pkg/multicloud/huawei/sfs-turbo.go b/pkg/multicloud/huawei/sfs-turbo.go index d874f9db2b..dd299f5c0d 100644 --- a/pkg/multicloud/huawei/sfs-turbo.go +++ b/pkg/multicloud/huawei/sfs-turbo.go @@ -103,7 +103,7 @@ func (self *SfsTurbo) GetStatus() string { case "100": return api.NAS_STATUS_CREATING case "200": - return api.NAS_SKU_AVAILABLE + return api.NAS_STATUS_AVAILABLE case "300": return api.NAS_STATUS_UNKNOWN case "303":