malhuda/alice-lg
1
0
Fork 0
Code Issues 39 Pull Requests 11 Actions Packages Projects Releases 2 Wiki Activity

route id is just a duplicate

Browse Source
This commit is contained in:
Annika Hannig 2022-11-25 14:05:48 +01:00
parent 022e8a2fd5
commit 97dbe0c4c8
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/response_routes.go
View File

@ -8,7 +8,7 @@ import (
// Route is a prefix with BGP information.
type Route struct {
ID string `json:"id"`
// ID string `json:"id"`
NeighborID *string `json:"neighbor_id"`
Network string `json:"network"`

2
pkg/sources/birdwatcher/parsers.go
View File

@ -341,7 +341,7 @@ func parseRouteData(
}
route := &api.Route{
ID: decoders.String(rdata["network"], "unknown"),
// ID: decoders.String(rdata["network"], "unknown"),
NeighborID: pools.Neighbors.Acquire(
decoders.String(rdata["from_protocol"], "unknown neighbor")),

4
pkg/sources/birdwatcher/source.go
View File

@ -147,12 +147,12 @@ func (b *GenericBirdwatcher) filterRoutesByDuplicates(
routesMap := make(map[string]*api.Route) // for O(1) access
for _, route := range routes {
routesMap[route.ID] = route
routesMap[route.Network] = route
}
// Remove routes from "routes" that are contained within filterRoutes
for _, filterRoute := range filterRoutes {
delete(routesMap, filterRoute.ID)
delete(routesMap, filterRoute.Network)
}
for _, route := range routesMap {

2
pkg/sources/gobgp/routes.go
View File

@ -85,7 +85,7 @@ func (gobgp *GoBGP) parsePathIntoRoute(
) (*api.Route, error) {
route := api.Route{}
route.ID = fmt.Sprintf("%s_%s", path.SourceId, prefix)
// route.ID = fmt.Sprintf("%s_%s", path.SourceId, prefix)
route.NeighborID = pools.Neighbors.Acquire(
PeerHashWithASAndAddress(path.SourceAsn, path.NeighborIp))
route.Network = prefix

1
pkg/sources/openbgpd/decoders.go
View File

@ -196,7 +196,6 @@ func decodeRoute(details map[string]interface{}) (*api.Route, error) {
rawDetails := json.RawMessage(detailsJSON)
r := &api.Route{
ID: prefix,
NeighborID: pools.Neighbors.Acquire(neighborID),
Network: prefix,
Gateway: pools.Gateways4.Acquire(trueNextHop),

16
pkg/sources/openbgpd/filters_test.go
View File

@ -9,7 +9,7 @@ import (
func TestFilterReceivedRoutes(t *testing.T) {
routes := api.Routes{
&api.Route{
ID: "1.2.3.4",
Network: "1.2.3.4",
BGP: &api.BGPInfo{
LargeCommunities: api.Communities{
api.Community{9999, 23, 23},
@ -18,7 +18,7 @@ func TestFilterReceivedRoutes(t *testing.T) {
},
},
&api.Route{
ID: "5.6.6.6",
Network: "5.6.6.6",
BGP: &api.BGPInfo{
LargeCommunities: api.Communities{
api.Community{9999, 23, 23},
@ -28,7 +28,7 @@ func TestFilterReceivedRoutes(t *testing.T) {
},
},
&api.Route{
ID: "5.6.7.8",
Network: "5.6.7.8",
BGP: &api.BGPInfo{
LargeCommunities: api.Communities{
api.Community{9999, 23, 23},
@ -43,7 +43,7 @@ func TestFilterReceivedRoutes(t *testing.T) {
}
filtered := filterReceivedRoutes(c, routes)
if filtered[0].ID != "5.6.7.8" {
if filtered[0].Network != "5.6.7.8" {
t.Error("unexpected route:", filtered[0])
}
}
@ -51,7 +51,7 @@ func TestFilterReceivedRoutes(t *testing.T) {
func TestFilterRejectedRoutes(t *testing.T) {
routes := api.Routes{
&api.Route{
ID: "5.6.7.8",
Network: "5.6.7.8",
BGP: &api.BGPInfo{
LargeCommunities: api.Communities{
api.Community{9999, 23, 23},
@ -60,7 +60,7 @@ func TestFilterRejectedRoutes(t *testing.T) {
},
},
&api.Route{
ID: "1.2.3.4",
Network: "1.2.3.4",
BGP: &api.BGPInfo{
LargeCommunities: api.Communities{
api.Community{9999, 23, 23},
@ -69,7 +69,7 @@ func TestFilterRejectedRoutes(t *testing.T) {
},
},
&api.Route{
ID: "5.6.6.6",
Network: "5.6.6.6",
BGP: &api.BGPInfo{
LargeCommunities: api.Communities{
api.Community{9999, 23, 23},
@ -89,7 +89,7 @@ func TestFilterRejectedRoutes(t *testing.T) {
t.Error("expected two filtered routes")
}
if filtered[0].ID != "1.2.3.4" {
if filtered[0].Network != "1.2.3.4" {
t.Error("unexpected route:", filtered[0])
}
}