Automatic merge from release/2.3.0 -> release/2.4.0

* commit '81e17c25aba3d579c7528b06785b3efc204f875d':
  取消创建公有云vpc限制
This commit is contained in:
邱剑
2018-11-17 15:55:19 +08:00
-4
View File
@@ -353,10 +353,6 @@ func (manager *SVpcManager) ValidateCreateData(ctx context.Context, userCred mcc
return nil, httperrors.NewInputParameterError("Invalid cloudregion_id")
}
if region.isManaged() {
if region.GetVpcCount() >= MAX_VPC_PER_REGION {
return nil, httperrors.NewNotAcceptableError("Too many vpcs per region")
}
managerStr, _ := data.GetString("manager_id")
if len(managerStr) == 0 {
managerStr, _ = data.GetString("manager")