From 3f19bb1efcd3346d0de26d344f12a1ea999f575a Mon Sep 17 00:00:00 2001
From: TangBin <tangbin@yunion.cn>
Date: Fri, 18 Dec 2020 14:43:43 +0800
Subject: [PATCH] fix(region): remove unnecessary vpc validate create date
 error wrap

---
 pkg/compute/models/vpcs.go          | 2 +-
 pkg/compute/regiondrivers/aliyun.go | 2 +-
 pkg/compute/regiondrivers/ctyun.go  | 3 +--
 pkg/compute/regiondrivers/huawei.go | 2 +-
 pkg/compute/regiondrivers/qcloud.go | 2 +-
 pkg/compute/regiondrivers/ucloud.go | 3 +--
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go
index 6f6ecdc8bf..1b8a37da82 100644
--- a/pkg/compute/models/vpcs.go
+++ b/pkg/compute/models/vpcs.go
@@ -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 {
diff --git a/pkg/compute/regiondrivers/aliyun.go b/pkg/compute/regiondrivers/aliyun.go
index a428589e4f..37e935bcc5 100644
--- a/pkg/compute/regiondrivers/aliyun.go
+++ b/pkg/compute/regiondrivers/aliyun.go
@@ -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 {
diff --git a/pkg/compute/regiondrivers/ctyun.go b/pkg/compute/regiondrivers/ctyun.go
index 67d4731eb0..463f3be14a 100644
--- a/pkg/compute/regiondrivers/ctyun.go
+++ b/pkg/compute/regiondrivers/ctyun.go
@@ -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 {
diff --git a/pkg/compute/regiondrivers/huawei.go b/pkg/compute/regiondrivers/huawei.go
index 1cb959263e..f88e1d8a4c 100644
--- a/pkg/compute/regiondrivers/huawei.go
+++ b/pkg/compute/regiondrivers/huawei.go
@@ -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 {
diff --git a/pkg/compute/regiondrivers/qcloud.go b/pkg/compute/regiondrivers/qcloud.go
index 70cfab1bce..cb8da3b043 100644
--- a/pkg/compute/regiondrivers/qcloud.go
+++ b/pkg/compute/regiondrivers/qcloud.go
@@ -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 {
diff --git a/pkg/compute/regiondrivers/ucloud.go b/pkg/compute/regiondrivers/ucloud.go
index a1aa486478..bcf8e28f6c 100644
--- a/pkg/compute/regiondrivers/ucloud.go
+++ b/pkg/compute/regiondrivers/ucloud.go
@@ -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 {