From 394c439716bb18e9520c69c927bc7eb1a9dc63ab Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Thu, 19 Dec 2024 19:27:03 +0100 Subject: [PATCH] fix router map generation --- management/server/types/account.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/management/server/types/account.go b/management/server/types/account.go index 96ab1d35f..1d6d2f178 100644 --- a/management/server/types/account.go +++ b/management/server/types/account.go @@ -1408,11 +1408,14 @@ func (a *Account) getNetworkResourcesRoutes(resource *resourceTypes.NetworkResou func (a *Account) GetResourceRoutersMap() map[string]map[string]*routerTypes.NetworkRouter { routers := make(map[string]map[string]*routerTypes.NetworkRouter) + for _, router := range a.NetworkRouters { - peers := make(map[string]*routerTypes.NetworkRouter) + if routers[router.NetworkID] == nil { + routers[router.NetworkID] = make(map[string]*routerTypes.NetworkRouter) + } + if router.Peer != "" { - peers[router.Peer] = router - routers[router.NetworkID] = peers + routers[router.NetworkID][router.Peer] = router continue } @@ -1420,12 +1423,12 @@ func (a *Account) GetResourceRoutersMap() map[string]map[string]*routerTypes.Net g := a.Groups[peerGroup] if g != nil { for _, peerID := range g.Peers { - peers[peerID] = router + routers[router.NetworkID][peerID] = router } } } - routers[router.NetworkID] = peers } + return routers }