feat(network): implement peer discovery features and UI integration
CI / changes (push) Successful in 6s
CI / commitlint (push) Skipped
CI / openapi (push) Successful in 28s
CI / web (push) Successful in 52s
CI / go (push) Successful in 2m22s
CI / bird2 (push) Successful in 15s
CI / release (push) Successful in 4m36s
CI / changes (push) Successful in 6s
CI / commitlint (push) Skipped
CI / openapi (push) Successful in 28s
CI / web (push) Successful in 52s
CI / go (push) Successful in 2m22s
CI / bird2 (push) Successful in 15s
CI / release (push) Successful in 4m36s
Added functionality for peer discovery, including new API endpoints for listing, approving, and rejecting discovered peers. Updated the network queries and settings to support peer discovery configurations. Enhanced the UI to display discovered peers and integrated related settings in the tenant settings component. Updated OpenAPI documentation to reflect the new endpoints and parameters. This improves the network management capabilities by allowing dynamic peer discovery and management.
This commit is contained in:
@@ -940,6 +940,50 @@ func uint32FromSettingsMap(m map[string]any, key string) uint32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func boolFromSettingsMap(m map[string]any, key string, defaultVal bool) bool {
|
||||
v, ok := m[key]
|
||||
if !ok || v == nil {
|
||||
return defaultVal
|
||||
}
|
||||
switch x := v.(type) {
|
||||
case bool:
|
||||
return x
|
||||
case float64:
|
||||
return x != 0
|
||||
case int:
|
||||
return x != 0
|
||||
case string:
|
||||
s := strings.ToLower(strings.TrimSpace(x))
|
||||
if s == "true" || s == "1" || s == "yes" {
|
||||
return true
|
||||
}
|
||||
if s == "false" || s == "0" || s == "no" {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return defaultVal
|
||||
}
|
||||
|
||||
func renderPeerDiscoveryBirdFragment(st store.Backend, tenantID string) (string, error) {
|
||||
settings, err := st.ListGlobalSettings(tenantID)
|
||||
if err != nil || settings == nil {
|
||||
return "", nil
|
||||
}
|
||||
if !boolFromSettingsMap(settings, "peer_discovery_enabled", false) {
|
||||
return "", nil
|
||||
}
|
||||
rangesV4 := birdfmt.ParseDiscoveryRanges(stringFromSettingsMap(settings, "peer_discovery_ranges_v4"))
|
||||
rangesV6 := birdfmt.ParseDiscoveryRanges(stringFromSettingsMap(settings, "peer_discovery_ranges_v6"))
|
||||
if len(rangesV4) == 0 && len(rangesV6) == 0 {
|
||||
return "", nil
|
||||
}
|
||||
return birdfmt.RenderDynamicBGPDiscovery(birdfmt.DynamicBGPDiscoveryOptions{
|
||||
RangesV4: rangesV4,
|
||||
RangesV6: rangesV6,
|
||||
RequireExternal: boolFromSettingsMap(settings, "peer_discovery_require_external", true),
|
||||
})
|
||||
}
|
||||
|
||||
func intFromSettingsMap(m map[string]any, key string) int {
|
||||
v, ok := m[key]
|
||||
if !ok || v == nil {
|
||||
@@ -1004,6 +1048,11 @@ func renderPeersBirdFragment(st store.Backend, tenantID string, loc birdLocals)
|
||||
peers := st.ListPeers(tenantID)
|
||||
var parts []string
|
||||
parts = append(parts, birdfmt.ManagedBanner("peers"))
|
||||
if disc, err := renderPeerDiscoveryBirdFragment(st, tenantID); err != nil {
|
||||
return "", err
|
||||
} else if disc != "" {
|
||||
parts = append(parts, disc)
|
||||
}
|
||||
for _, p := range peers {
|
||||
if p == nil || !p.Enabled {
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user