opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): remove unnecessary vpc validate create date error wrap

Browse Source
This commit is contained in:
TangBin
2020-12-18 14:51:54 +08:00
parent f3c8bede52
commit 3f19bb1efc
6 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/vpcs.go
+1 -1
View File
@@ -859,7 +859,7 @@ func (manager *SVpcManager) ValidateCreateData(
input, err = region.GetDriver().ValidateCreateVpcData(ctx, userCred, input)
if err != nil {
return input, errors.Wrapf(err, "region.GetDriver().ValidateCreateVpcData")
return input, err
}
if region.GetDriver().IsVpcCreateNeedInputCidr() && len(input.CidrBlock) == 0 {
pkg/compute/regiondrivers/aliyun.go
+1 -1
View File
@@ -1569,7 +1569,7 @@ func (self *SAliyunRegionDriver) ValidateCreateVpcData(ctx context.Context, user
err := IsInPrivateIpRange(cidrV.Value.ToIPRange())
if err != nil {
return input, errors.Wrap(err, "IsInPrivateIpRange")
return input, err
}
if cidrV.Value.MaskLen > 24 {
pkg/compute/regiondrivers/ctyun.go
+1 -2
View File
@@ -18,7 +18,6 @@ import (
"context"
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/secrules"
api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -86,7 +85,7 @@ func (self *SCtyunRegionDriver) ValidateCreateVpcData(ctx context.Context, userC
err := IsInPrivateIpRange(cidrV.Value.ToIPRange())
if err != nil {
return input, errors.Wrap(err, "IsInPrivateIpRange")
return input, err
}
if cidrV.Value.MaskLen > 24 {
pkg/compute/regiondrivers/huawei.go
+1 -1
View File
@@ -2672,7 +2672,7 @@ func (self *SHuaWeiRegionDriver) ValidateCreateVpcData(ctx context.Context, user
err := IsInPrivateIpRange(cidrV.Value.ToIPRange())
if err != nil {
return input, errors.Wrap(err, "IsInPrivateIpRange")
return input, err
}
if cidrV.Value.MaskLen > 24 {
pkg/compute/regiondrivers/qcloud.go
+1 -1
View File
@@ -728,7 +728,7 @@ func (self *SQcloudRegionDriver) ValidateCreateVpcData(ctx context.Context, user
err := IsInPrivateIpRange(cidrV.Value.ToIPRange())
if err != nil {
return input, errors.Wrap(err, "IsInPrivateIpRange")
return input, err
}
if cidrV.Value.MaskLen < 16 || cidrV.Value.MaskLen > 28 {
pkg/compute/regiondrivers/ucloud.go
+1 -2
View File
@@ -18,7 +18,6 @@ import (
"context"
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/secrules"
api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -81,7 +80,7 @@ func (self *SUcloudRegionDriver) ValidateCreateVpcData(ctx context.Context, user
}
err := IsInPrivateIpRange(cidrV.Value.ToIPRange())
if err != nil {
return input, errors.Wrap(err, "IsInPrivateIpRange")
return input, err
}
if cidrV.Value.MaskLen > 29 {