Move contributing ASNs into VRF

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>

protocols/bgp/server/bgp_api_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/bio-routing/bio-rd/routingtable/adjRIBIn"
 	"github.com/bio-routing/bio-rd/routingtable/adjRIBOut"
 	"github.com/bio-routing/bio-rd/routingtable/filter"
+	"github.com/bio-routing/bio-rd/routingtable/vrf"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/test/bufconn"
@@ -30,6 +31,8 @@ func TestDumpRIBInOut(t *testing.T) {
 		AddPathTX: true,
 	}
 
+	vrf, _ := vrf.New("vrf0", 0)
+
 	tests := []struct {
 		name      string
 		apisrv    *BGPAPIServer
@@ -66,7 +69,7 @@ func TestDumpRIBInOut(t *testing.T) {
 								fsms: []*FSM{
 									0: {
 										ipv4Unicast: &fsmAddressFamily{
-											adjRIBIn:  adjRIBIn.New(filter.NewAcceptAllFilterChain(), nil, sessionAttrs),
+											adjRIBIn:  adjRIBIn.New(filter.NewAcceptAllFilterChain(), vrf, sessionAttrs),
 											adjRIBOut: adjRIBOut.New(nil, routingtable.SessionAttrs{Type: route.BGPPathType}, filter.NewAcceptAllFilterChain()),
 										},
 									},
@@ -96,7 +99,7 @@ func TestDumpRIBInOut(t *testing.T) {
 								fsms: []*FSM{
 									0: {
 										ipv4Unicast: &fsmAddressFamily{
-											adjRIBIn:  adjRIBIn.New(filter.NewAcceptAllFilterChain(), nil, sessionAttrs),
+											adjRIBIn:  adjRIBIn.New(filter.NewAcceptAllFilterChain(), vrf, sessionAttrs),
 											adjRIBOut: adjRIBOut.New(nil, routingtable.SessionAttrs{Type: route.BGPPathType, RouteServerClient: true, PeerIP: bnet.IPv4(0).Ptr()}, filter.NewAcceptAllFilterChain()),
 										},
 									},
@@ -156,7 +159,7 @@ func TestDumpRIBInOut(t *testing.T) {
 								fsms: []*FSM{
 									0: {
 										ipv4Unicast: &fsmAddressFamily{
-											adjRIBIn:  adjRIBIn.New(filter.NewAcceptAllFilterChain(), routingtable.NewContributingASNs(), sessionAttrs),
+											adjRIBIn:  adjRIBIn.New(filter.NewAcceptAllFilterChain(), vrf, sessionAttrs),
 											adjRIBOut: adjRIBOut.New(nil, routingtable.SessionAttrs{Type: route.BGPPathType, RouteServerClient: true, PeerIP: bnet.IPv4(123).Ptr()}, filter.NewAcceptAllFilterChain()),
 										},
 									},

protocols/bgp/server/fsm_address_family.go

@@ -13,6 +13,7 @@ import (
 	"github.com/bio-routing/bio-rd/routingtable/adjRIBOut"
 	"github.com/bio-routing/bio-rd/routingtable/filter"
 	"github.com/bio-routing/bio-rd/routingtable/locRIB"
+	"github.com/bio-routing/bio-rd/routingtable/vrf"
 )
 
 // fsmAddressFamily holds RIBs and the UpdateSender of an peer for an AFI/SAFI combination
@@ -24,6 +25,7 @@ type fsmAddressFamily struct {
 	adjRIBIn  routingtable.AdjRIBIn
 	adjRIBOut routingtable.AdjRIBOut
 	rib       *locRIB.LocRIB
+	vrf       *vrf.VRF
 
 	importFilterChain filter.Chain
 	exportFilterChain filter.Chain
@@ -44,6 +46,7 @@ func newFSMAddressFamily(afi uint16, safi uint8, family *peerAddressFamily, fsm
 		afi:               afi,
 		safi:              safi,
 		fsm:               fsm,
+		vrf:               fsm.peer.vrf,
 		rib:               family.rib,
 		importFilterChain: family.importFilterChain,
 		exportFilterChain: family.exportFilterChain,
@@ -80,21 +83,20 @@ func (f *fsmAddressFamily) dumpRIBIn() []*route.Route {
 }
 
 type adjRIBInFactoryI interface {
-	New(exportFilterChain filter.Chain, contributingASNs *routingtable.ContributingASNs, sessionAttrs routingtable.SessionAttrs) routingtable.AdjRIBIn
+	New(exportFilterChain filter.Chain, vrf *vrf.VRF, sessionAttrs routingtable.SessionAttrs) routingtable.AdjRIBIn
 }
 
 type adjRIBInFactory struct{}
 
-func (a adjRIBInFactory) New(exportFilterChain filter.Chain, contributingASNs *routingtable.ContributingASNs, sessionAttrs routingtable.SessionAttrs) routingtable.AdjRIBIn {
-	return adjRIBIn.New(exportFilterChain, contributingASNs, sessionAttrs)
+func (a adjRIBInFactory) New(exportFilterChain filter.Chain, vrf *vrf.VRF, sessionAttrs routingtable.SessionAttrs) routingtable.AdjRIBIn {
+	return adjRIBIn.New(exportFilterChain, vrf, sessionAttrs)
 }
 
 func (f *fsmAddressFamily) init() {
-	contributingASNs := f.rib.GetContributingASNs()
 	sessionAttrs := f.getSessionAttrs()
 
-	f.adjRIBIn = f.fsm.peer.adjRIBInFactory.New(f.importFilterChain, contributingASNs, sessionAttrs)
-	contributingASNs.Add(f.fsm.peer.localASN)
+	f.adjRIBIn = f.fsm.peer.adjRIBInFactory.New(f.importFilterChain, f.vrf, sessionAttrs)
+	f.vrf.AddContributingASN(f.fsm.peer.localASN)
 
 	f.adjRIBIn.Register(f.rib)
 
@@ -138,7 +140,7 @@ func (f *fsmAddressFamily) getSessionAttrs() routingtable.SessionAttrs {
 }
 
 func (f *fsmAddressFamily) bmpInit() {
-	f.adjRIBIn = f.fsm.peer.adjRIBInFactory.New(filter.NewAcceptAllFilterChain(), &routingtable.ContributingASNs{}, f.getSessionAttrs())
+	f.adjRIBIn = f.fsm.peer.adjRIBInFactory.New(filter.NewAcceptAllFilterChain(), f.fsm.peer.vrf, f.getSessionAttrs())
 
 	if f.rib != nil {
 		f.adjRIBIn.Register(f.rib)
@@ -148,7 +150,7 @@ func (f *fsmAddressFamily) bmpInit() {
 }
 
 func (f *fsmAddressFamily) bmpDispose() {
-	f.rib.GetContributingASNs().Remove(f.fsm.peer.localASN)
+	f.vrf.RemoveContributingASN(f.fsm.peer.localASN)
 
 	f.adjRIBIn.Flush()
 
@@ -162,7 +164,7 @@ func (f *fsmAddressFamily) dispose() {
 		return
 	}
 
-	f.rib.GetContributingASNs().Remove(f.fsm.peer.localASN)
+	f.vrf.RemoveContributingASN(f.fsm.peer.localASN)
 	f.adjRIBIn.Unregister(f.rib)
 	f.rib.Unregister(f.adjRIBOut)
 	f.adjRIBOut.Unregister(f.updateSender)

protocols/bgp/server/fsm_address_family_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/bio-routing/bio-rd/routingtable"
 	"github.com/bio-routing/bio-rd/routingtable/filter"
 	"github.com/bio-routing/bio-rd/routingtable/locRIB"
+	"github.com/bio-routing/bio-rd/routingtable/vrf"
 	"github.com/stretchr/testify/assert"
 
 	biotesting "github.com/bio-routing/bio-rd/testing"
@@ -20,6 +21,7 @@ func TestFSMAFIInitDispose(t *testing.T) {
 		afi:               packet.AFIIPv4,
 		safi:              packet.SAFIUnicast,
 		rib:               locRIB.New("inet.0"),
+		vrf:               vrf.NewUntrackedVRF("vrf0", 0),
 		importFilterChain: filter.NewAcceptAllFilterChain(),
 		exportFilterChain: filter.NewAcceptAllFilterChain(),
 		fsm: &FSM{
@@ -41,8 +43,8 @@ func TestFSMAFIInitDispose(t *testing.T) {
 
 	f.init()
 	assert.NotEqual(t, nil, f.adjRIBIn)
-	assert.Equal(t, true, f.rib.GetContributingASNs().IsContributingASN(15169))
-	assert.NotEqual(t, true, f.rib.GetContributingASNs().IsContributingASN(15170))
+	assert.Equal(t, true, f.vrf.IsContributingASN(15169))
+	assert.NotEqual(t, true, f.vrf.IsContributingASN(15170))
 
 	assert.NotEqual(t, nil, f.adjRIBOut)
 	assert.NotEqual(t, nil, f.updateSender)
@@ -57,7 +59,7 @@ func TestFSMAFIInitDispose(t *testing.T) {
 	f.dispose()
 
 	f.updateSender.wg.Wait()
-	assert.Equal(t, false, f.rib.GetContributingASNs().IsContributingASN(15169))
+	assert.Equal(t, false, f.vrf.IsContributingASN(15169))
 	assert.Equal(t, uint64(0), f.rib.ClientCount())
 	assert.Equal(t, nil, f.adjRIBOut)
 	assert.Equal(t, false, f.initialized)

protocols/bgp/server/fsm_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/bio-routing/bio-rd/protocols/bgp/packet"
 	"github.com/bio-routing/bio-rd/routingtable/filter"
 	"github.com/bio-routing/bio-rd/routingtable/locRIB"
+	"github.com/bio-routing/bio-rd/routingtable/vrf"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -23,6 +24,7 @@ func TestFSM255UpdatesIPv4(t *testing.T) {
 			exportFilterChain: filter.NewAcceptAllFilterChain(),
 		},
 		adjRIBInFactory: adjRIBInFactory{},
+		vrf:             vrf.NewUntrackedVRF("vrf0", 0),
 	})
 
 	fsmA.holdTime = time.Second * 180
@@ -142,6 +144,7 @@ func TestFSM255UpdatesIPv6(t *testing.T) {
 			exportFilterChain: filter.NewAcceptAllFilterChain(),
 		},
 		adjRIBInFactory: adjRIBInFactory{},
+		vrf:             vrf.NewUntrackedVRF("vrf0", 0),
 	})
 
 	fsmA.ipv6Unicast.multiProtocol = true

protocols/bgp/server/metrics_service_test.go

@@ -4,17 +4,17 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bio-routing/bio-rd/protocols/bgp/packet"
 	"github.com/bio-routing/bio-rd/routingtable"
 	"github.com/bio-routing/bio-rd/routingtable/vrf"
 	"github.com/stretchr/testify/assert"
 
 	bnet "github.com/bio-routing/bio-rd/net"
 	"github.com/bio-routing/bio-rd/protocols/bgp/metrics"
+	"github.com/bio-routing/bio-rd/protocols/bgp/packet"
 )
 
 func TestMetrics(t *testing.T) {
-	vrf, _ := vrf.New("inet.0", 0)
+	vrf := vrf.NewUntrackedVRF("inet.0", 0)
 	establishedTime := time.Now()
 
 	tests := []struct {

routingtable/adjRIBIn/adj_rib_in.go

@@ -8,6 +8,7 @@ import (
 	"github.com/bio-routing/bio-rd/route"
 	"github.com/bio-routing/bio-rd/routingtable"
 	"github.com/bio-routing/bio-rd/routingtable/filter"
+	"github.com/bio-routing/bio-rd/routingtable/vrf"
 	"github.com/bio-routing/bio-rd/util/log"
 )
 
@@ -17,16 +18,16 @@ type AdjRIBIn struct {
 	rt                *routingtable.RoutingTable
 	mu                sync.RWMutex
 	exportFilterChain filter.Chain
-	contributingASNs  *routingtable.ContributingASNs
+	vrf               *vrf.VRF
 	sessionAttrs      routingtable.SessionAttrs
 }
 
 // New creates a new Adjacency RIB In
-func New(exportFilterChain filter.Chain, contributingASNs *routingtable.ContributingASNs, sessionAttrs routingtable.SessionAttrs) *AdjRIBIn {
+func New(exportFilterChain filter.Chain, vrf *vrf.VRF, sessionAttrs routingtable.SessionAttrs) *AdjRIBIn {
 	a := &AdjRIBIn{
 		rt:                routingtable.NewRoutingTable(),
 		exportFilterChain: exportFilterChain,
-		contributingASNs:  contributingASNs,
+		vrf:               vrf,
 		sessionAttrs:      sessionAttrs,
 	}
 	a.clientManager = routingtable.NewClientManager(a)
@@ -319,7 +320,7 @@ func (a *AdjRIBIn) ourASNsInPath(p *route.Path) bool {
 
 	for _, pathSegment := range *p.BGPPath.ASPath {
 		for _, asn := range pathSegment.ASNs {
-			if a.contributingASNs.IsContributingASN(asn) {
+			if a.vrf.IsContributingASN(asn) {
 				return true
 			}
 		}

routingtable/adjRIBIn/adj_rib_in_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/bio-routing/bio-rd/route"
 	"github.com/bio-routing/bio-rd/routingtable"
 	"github.com/bio-routing/bio-rd/routingtable/filter"
+	"github.com/bio-routing/bio-rd/routingtable/vrf"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -265,7 +266,7 @@ func TestAddPath(t *testing.T) {
 			ClusterID: clusterID,
 			AddPathRX: test.addPath,
 		}
-		adjRIBIn := New(filter.NewAcceptAllFilterChain(), routingtable.NewContributingASNs(), sessionAttrs)
+		adjRIBIn := New(filter.NewAcceptAllFilterChain(), vrf.NewUntrackedVRF("vrf0", 0), sessionAttrs)
 		mc := routingtable.NewRTMockClient()
 		adjRIBIn.clientManager.RegisterWithOptions(mc, routingtable.ClientOptions{BestOnly: true})
 
@@ -495,7 +496,7 @@ func TestRemovePath(t *testing.T) {
 			ClusterID: 2,
 			AddPathRX: test.addPath,
 		}
-		adjRIBIn := New(filter.NewAcceptAllFilterChain(), routingtable.NewContributingASNs(), sessionAttrs)
+		adjRIBIn := New(filter.NewAcceptAllFilterChain(), vrf.NewUntrackedVRF("vrf0", 0), sessionAttrs)
 		for _, route := range test.routes {
 			adjRIBIn.AddPath(route.Prefix().Ptr(), route.Paths()[0])
 		}
@@ -523,7 +524,7 @@ func TestRemovePath(t *testing.T) {
 }
 
 func TestUnregister(t *testing.T) {
-	adjRIBIn := New(filter.NewAcceptAllFilterChain(), routingtable.NewContributingASNs(), routingtable.SessionAttrs{})
+	adjRIBIn := New(filter.NewAcceptAllFilterChain(), vrf.NewUntrackedVRF("vrf0", 0), routingtable.SessionAttrs{})
 	mc := routingtable.NewRTMockClient()
 	adjRIBIn.Register(mc)
 
@@ -839,7 +840,7 @@ func TestPeerRoleOTC(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		adjRIBIn := New(filter.NewAcceptAllFilterChain(), routingtable.NewContributingASNs(), test.sessionAttrs)
+		adjRIBIn := New(filter.NewAcceptAllFilterChain(), vrf.NewUntrackedVRF("vrf0", 0), test.sessionAttrs)
 		mc := routingtable.NewRTMockClient()
 		adjRIBIn.clientManager.RegisterWithOptions(mc, routingtable.ClientOptions{BestOnly: true})
 

routingtable/locRIB/loc_rib.go

@@ -14,12 +14,11 @@ import (
 
 // LocRIB represents a routing information base
 type LocRIB struct {
-	name             string
-	clientManager    *routingtable.ClientManager
-	rt               *routingtable.RoutingTable
-	mu               sync.RWMutex
-	contributingASNs *routingtable.ContributingASNs
-	countTarget      *countTarget
+	name          string
+	clientManager *routingtable.ClientManager
+	rt            *routingtable.RoutingTable
+	mu            sync.RWMutex
+	countTarget   *countTarget
 }
 
 type countTarget struct {
@@ -30,9 +29,8 @@ type countTarget struct {
 // New creates a new routing information base
 func New(name string) *LocRIB {
 	a := &LocRIB{
-		name:             name,
-		rt:               routingtable.NewRoutingTable(),
-		contributingASNs: routingtable.NewContributingASNs(),
+		name: name,
+		rt:   routingtable.NewRoutingTable(),
 	}
 	a.clientManager = routingtable.NewClientManager(a)
 
@@ -51,11 +49,6 @@ func (a *LocRIB) ClientCount() uint64 {
 	return a.clientManager.ClientCount()
 }
 
-// GetContributingASNs returns a pointer to the list of contributing ASNs
-func (a *LocRIB) GetContributingASNs() *routingtable.ContributingASNs {
-	return a.contributingASNs
-}
-
 // Count routes from the LocRIB
 func (a *LocRIB) Count() uint64 {
 	return uint64(a.rt.GetRouteCount())

routingtable/contributing_asn_list.go → routingtable/vrf/contributing_asn_list.go

@@ -1,4 +1,4 @@
-package routingtable
+package vrf
 
 import (
 	"fmt"
@@ -11,13 +11,13 @@ type contributingASN struct {
 	count uint32
 }
 
-// ContributingASNs contains a list of contributing ASN to a LocRIB to check ASPaths for possible routing loops.
+// ContributingASNs contains a list of contributing ASN to a VRF to check ASPaths for possible routing loops.
 type ContributingASNs struct {
 	contributingASNs     []*contributingASN
 	contributingASNsLock sync.RWMutex
 }
 
-// NewContributingASNs creates a list of contributing ASNs to a LocRIB for routing loop prevention.
+// NewContributingASNs creates a list of contributing ASNs to a VRF for routing loop prevention.
 func NewContributingASNs() *ContributingASNs {
 	c := &ContributingASNs{
 		contributingASNs: []*contributingASN{},
@@ -49,7 +49,7 @@ func (c *ContributingASNs) Add(asn uint32) {
 	})
 }
 
-// Remove a ASN to the list of contributing ASNs or decrement the ref count of an existing one.
+// Remove a ASN from the list of contributing ASNs or decrement the ref count of an existing one.
 func (c *ContributingASNs) Remove(asn uint32) {
 	c.contributingASNsLock.Lock()
 	defer c.contributingASNsLock.Unlock()
@@ -73,7 +73,7 @@ func (c *ContributingASNs) Remove(asn uint32) {
 	}
 }
 
-// IsContributingASN checks if  a given ASN is part of the contributing ASNs
+// IsContributingASN checks if a given ASN is part of the contributing ASNs
 func (c *ContributingASNs) IsContributingASN(asn uint32) bool {
 	c.contributingASNsLock.RLock()
 	defer c.contributingASNsLock.RUnlock()

routingtable/contributing_asn_list_test.go → routingtable/vrf/contributing_asn_list_test.go

@@ -1,4 +1,4 @@
-package routingtable
+package vrf
 
 import (
 	"fmt"