opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10002 from lvyangyang/locals-zhCn-fix

Browse Source 
fix(region): vpcpeering error message translation
This commit is contained in:
Zexi Li
2021-01-26 16:14:46 +08:00
committed by GitHub
parent 39c247fd6b 8cf11aa3f9
commit a94cafb3f7
4 changed files with 3974 additions and 3833 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locales/locales.go
+3792 -3651
View File
File diff suppressed because it is too large Load Diff
locales/zh-CN/messages.gotext.json
+177 -177
View File
File diff suppressed because it is too large Load Diff
pkg/compute/models/routetable_routesets.go
+2 -2
View File
@@ -129,7 +129,7 @@ func (manager *SRouteTableRouteSetManager) ValidateCreateData(
}
if input.NextHopType != api.Next_HOP_TYPE_VPCPEERING {
return input, httperrors.NewNotSupportedError("not supported next hop type")
return input, httperrors.NewNotSupportedError("not supported next hop type %s", input.NextHopType)
}
if input.NextHopType == api.Next_HOP_TYPE_VPCPEERING {
_vpcPeer, err := VpcPeeringConnectionManager.FetchByIdOrName(userCred, input.NextHopId)
@@ -207,7 +207,7 @@ func (self *SRouteTableRouteSet) ValidateUpdateData(
}
if input.NextHopType != api.Next_HOP_TYPE_VPCPEERING {
return input, httperrors.NewNotSupportedError("not supported next hop type")
return input, httperrors.NewNotSupportedError("not supported next hop type %s", input.NextHopType)
}
if input.NextHopType == api.Next_HOP_TYPE_VPCPEERING {
_vpcPeer, err := VpcPeeringConnectionManager.FetchByIdOrName(userCred, input.NextHopId)
pkg/compute/models/vpc_peering_connections.go
+3 -3
View File
@@ -121,7 +121,7 @@ func (manager *SVpcPeeringConnectionManager) ValidateCreateData(
return input, err
}
if len(input.VpcId) == 0 {
return input, httperrors.NewInputParameterError("vpc_id")
return input, httperrors.NewMissingParameterError("vpc_id")
}
// get vpc ,peerVpc
@@ -188,10 +188,10 @@ func (manager *SVpcPeeringConnectionManager) ValidateCreateData(
CrossCloudEnv := account.AccessUrl != peerAccount.AccessUrl
CrossRegion := vpc.CloudregionId != peerVpc.CloudregionId
if CrossCloudEnv && !factory.IsSupportCrossCloudEnvVpcPeering() {
return input, httperrors.NewNotSupportedError("cloudprovider %s %s %s %s %s not supported CrossCloud vpcpeering", account.Provider, account.AccessUrl, vpc.CloudregionId, peerAccount.AccessUrl, peerVpc.CloudregionId)
return input, httperrors.NewNotSupportedError("cloudprovider %s not supported CrossCloud vpcpeering", account.Provider)
}
if CrossRegion && !factory.IsSupportCrossRegionVpcPeering() {
return input, httperrors.NewNotSupportedError("cloudprovider %s %s %s %s %s not supported CrossRegion vpcpeering", account.Provider, account.AccessUrl, vpc.CloudregionId, peerAccount.AccessUrl, peerVpc.CloudregionId)
return input, httperrors.NewNotSupportedError("cloudprovider %s not supported CrossRegion vpcpeering", account.Provider)
}
if CrossRegion {
err := factory.ValidateCrossRegionVpcPeeringBandWidth(input.Bandwidth)