Merge pull request #125 from jof/jof/neighbour_rename

Update neighbor spelling
This commit is contained in:
Annika Hannig 2024-01-30 10:40:33 +01:00 committed by GitHub
commit bac0119f1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions

View File

@ -142,7 +142,7 @@ invalid = 23042:1000:4-*
0:* = do not redistribute to AS$1 0:* = do not redistribute to AS$1
# #
# Define columns for neighbours and routes table, # Define columns for neighbors and routes table,
# with <key> = <Table Header> # with <key> = <Table Header>
# #
# and <key> := <object.path> Implicitly referencing the object, # and <key> := <object.path> Implicitly referencing the object,
@ -150,19 +150,19 @@ invalid = 23042:1000:4-*
# |= <Widget> A widget with special rendering features, # |= <Widget> A widget with special rendering features,
# to which the object is applied. E.g. # to which the object is applied. E.g.
# Uptime, which will be rendered as # Uptime, which will be rendered as
# Uptime(neighbour). # Uptime(neighbor).
# #
# As per convention: Widgets are in Uppercase, object properties are # As per convention: Widgets are in Uppercase, object properties are
# in lowercase. # in lowercase.
# #
# Available Widgets for Neighbours: # Available Widgets for Neighbors:
# #
# Uptime Displays the relative uptime of this neighbour # Uptime Displays the relative uptime of this neighbor
# Description The neighbour's description with link to routes page # Description The neighbor's description with link to routes page
# #
[neighbours_columns] [neighbors_columns]
address = Neighbour address = Neighbor
asn = ASN asn = ASN
state = State state = State
Uptime = Uptime Uptime = Uptime
@ -185,8 +185,8 @@ bgp.as_path = AS Path
flags = flags =
network = Network network = Network
gateway = Gateway gateway = Gateway
neighbour.asn = ASN neighbor.asn = ASN
neighbour.description = Description neighbor.description = Description
bgp.as_path = AS Path bgp.as_path = AS Path
routeserver.name = RS routeserver.name = RS

View File

@ -536,18 +536,18 @@ func (src *MultiTableBirdwatcher) NeighborsSummary(
// from the birdwatcher backend. // from the birdwatcher backend.
func (src *MultiTableBirdwatcher) Routes( func (src *MultiTableBirdwatcher) Routes(
ctx context.Context, ctx context.Context,
neighbourID string, neighborID string,
) (*api.RoutesResponse, error) { ) (*api.RoutesResponse, error) {
response := &api.RoutesResponse{} response := &api.RoutesResponse{}
// Fetch required routes first (received and filtered) // Fetch required routes first (received and filtered)
// However: Store in separate cache for faster access // However: Store in separate cache for faster access
required, err := src.fetchRequiredRoutes(ctx, neighbourID) required, err := src.fetchRequiredRoutes(ctx, neighborID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Optional: NoExport // Optional: NoExport
_, notExported, err := src.fetchNotExportedRoutes(ctx, neighbourID) _, notExported, err := src.fetchNotExportedRoutes(ctx, neighborID)
if err != nil { if err != nil {
return nil, err return nil, err
} }