Merge pull request #10812 from ioito/automated-cherry-pick-of-#10811-upstream-release-3.7

Automated cherry pick of #10811: fix(region): wait more time for creating nas

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())

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,
 	}

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":