From 774cfcbfafdbde11018e784cacb347143527b387 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 29 Oct 2020 17:12:51 +0800 Subject: [PATCH] regiondrivers: kvm: exact match bgp_type --- pkg/compute/regiondrivers/kvm.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/compute/regiondrivers/kvm.go b/pkg/compute/regiondrivers/kvm.go index 35e459edb9..bb66bc301a 100644 --- a/pkg/compute/regiondrivers/kvm.go +++ b/pkg/compute/regiondrivers/kvm.go @@ -909,7 +909,7 @@ func (self *SKVMRegionDriver) ValidateCreateEipData(ctx context.Context, userCre } network = _network.(*models.SNetwork) input.BgpType = network.BgpType - } else if input.BgpType != "" { + } else { q := models.NetworkManager.Query(). Equals("server_type", api.NETWORK_TYPE_EIP). Equals("bgp_type", input.BgpType) @@ -927,10 +927,8 @@ func (self *SKVMRegionDriver) ValidateCreateEipData(ctx context.Context, userCre } } if network == nil { - return httperrors.NewNotFoundError("no available eip network from BgpType %s", input.BgpType) + return httperrors.NewNotFoundError("no available eip network") } - } else { - return httperrors.NewMissingParameterError("network_id, isp") } if network.ServerType != api.NETWORK_TYPE_EIP { return httperrors.NewInputParameterError("bad network type %q, want %q", network.ServerType, api.NETWORK_TYPE_EIP)