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 #2984 from yousong/bugfix/yousong-errors

Browse Source 
lbbackends: 改进错误信息传递
This commit is contained in:
yunion-ci-robot
2019-09-19 21:12:27 +08:00
committed by GitHub
parent 921db0cfe5 02b5a6672a
commit dd97acd4ae
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+3 -3
View File
@@ -614,16 +614,16 @@ func (guest *SGuest) GetVpc() (*SVpc, error) {
guestnic := &SGuestnetwork{}
err := q.First(guestnic)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "failed getting guest network of %s(%s)", guest.Name, guest.Id)
}
guestnic.SetModelManager(GuestnetworkManager, guestnic)
network := guestnic.GetNetwork()
if network == nil {
return nil, fmt.Errorf("failed to found network for guest %s(%s)", guest.Name, guest.Id)
return nil, errors.Wrapf(err, "failed getting network for guest %s(%s)", guest.Name, guest.Id)
}
vpc := network.GetVpc()
if vpc == nil {
return nil, fmt.Errorf("failed to found vpc for network %s(%s)", network.Name, network.Id)
return nil, errors.Wrapf(err, "failed getting vpc of guest network %s(%s)", network.Name, network.Id)
}
return vpc, nil
}
pkg/compute/models/loadbalancerbackends.go
+6 -6
View File
@@ -112,11 +112,11 @@ func (man *SLoadbalancerBackendManager) ValidateBackendVpc(lb *SLoadbalancer, gu
}
vpc, err := guest.GetVpc()
if err != nil {
return err
return httperrors.NewBadRequestError("%s", err)
}
if len(lb.VpcId) > 0 {
if vpc.Id != lb.VpcId {
return fmt.Errorf("guest %s(%s) vpc %s(%s) not same as loadbalancer vpc %s", guest.Name, guest.Id, vpc.Name, vpc.Id, lb.VpcId)
return httperrors.NewBadRequestError("guest %s(%s) vpc %s(%s) not same as loadbalancer vpc %s", guest.Name, guest.Id, vpc.Name, vpc.Id, lb.VpcId)
}
return nil
}
@@ -127,18 +127,18 @@ func (man *SLoadbalancerBackendManager) ValidateBackendVpc(lb *SLoadbalancer, gu
for _, backend := range backends {
_server, err := GuestManager.FetchById(backend.BackendId)
if err != nil {
return err
return httperrors.NewBadRequestError("failed getting guest %s", backend.BackendId)
}
server := _server.(*SGuest)
_vpc, err := server.GetVpc()
if err != nil {
return err
return httperrors.NewBadRequestError("%s", err)
}
if _vpc.Id != vpc.Id {
return fmt.Errorf("guest %s(%s) vpc %s(%s) not same as vpc %s(%s)", guest.Name, guest.Id, vpc.Name, vpc.Id, _vpc.Name, _vpc.Id)
return httperrors.NewBadRequestError("guest %s(%s) vpc %s(%s) not same as vpc %s(%s)", guest.Name, guest.Id, vpc.Name, vpc.Id, _vpc.Name, _vpc.Id)
}
if _server.GetId() == guest.Id {
return fmt.Errorf("guest %s(%s) is already in the backendgroup %s(%s)", guest.Name, guest.Id, backendgroup.Name, backendgroup.Id)
return httperrors.NewBadRequestError("guest %s(%s) is already in the backendgroup %s(%s)", guest.Name, guest.Id, backendgroup.Name, backendgroup.Id)
}
}
return nil