Skip to content

Commit 2efb257

Browse files
martonraYutaroHayakawa
authored andcommitted
bgp: change tests to use the new registration
Signed-off-by: Marton Rasek <mrasek@isovalent.com>
1 parent 98360ca commit 2efb257

5 files changed

Lines changed: 23 additions & 3 deletions

File tree

pkg/bgp/manager/reconciler/interface_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/cilium/cilium/pkg/bgp/types"
2323
"github.com/cilium/cilium/pkg/datapath/tables"
2424
v2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"
25+
"github.com/cilium/cilium/pkg/option"
2526
)
2627

2728
func Test_InterfaceAdvertisement(t *testing.T) {
@@ -422,7 +423,10 @@ func Test_InterfaceAdvertisement(t *testing.T) {
422423
db := statedb.New()
423424
deviceTable, err := tables.NewDeviceTable(db)
424425
req.NoError(err)
425-
desiredRoutePolicyTable, err := bgpTables.NewDesiredRoutePoliciesTable(db)
426+
dc := &option.DaemonConfig{
427+
EnableBGPControlPlane: true,
428+
}
429+
desiredRoutePolicyTable, err := bgpTables.NewDesiredRoutePoliciesTable(db, dc)
426430
req.NoError(err)
427431

428432
// initialize reconciler

pkg/bgp/manager/reconciler/pod_cidr_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,10 @@ func Test_PodCIDRAdvertisement(t *testing.T) {
449449
t.Run(tt.name, func(t *testing.T) {
450450
req := require.New(t)
451451
db := statedb.New()
452-
desiredRoutePolicyTable, err := bgpTables.NewDesiredRoutePoliciesTable(db)
452+
dc := &option.DaemonConfig{
453+
EnableBGPControlPlane: true,
454+
}
455+
desiredRoutePolicyTable, err := bgpTables.NewDesiredRoutePoliciesTable(db, dc)
453456
req.NoError(err)
454457

455458
// initialize pod cidr reconciler

pkg/bgp/manager/reconciler/pod_ip_pool_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2alpha1"
2525
"github.com/cilium/cilium/pkg/k8s/resource"
2626
slimv1 "github.com/cilium/cilium/pkg/k8s/slim/k8s/apis/meta/v1"
27+
"github.com/cilium/cilium/pkg/option"
2728
)
2829

2930
var (
@@ -603,7 +604,10 @@ func Test_PodIPPoolAdvertisements(t *testing.T) {
603604
t.Run(tt.name, func(t *testing.T) {
604605
req := require.New(t)
605606
db := statedb.New()
606-
desiredRoutePolicyTable, err := bgpTables.NewDesiredRoutePoliciesTable(db)
607+
dc := &option.DaemonConfig{
608+
EnableBGPControlPlane: true,
609+
}
610+
desiredRoutePolicyTable, err := bgpTables.NewDesiredRoutePoliciesTable(db, dc)
607611
req.NoError(err)
608612

609613
params := PodIPPoolReconcilerIn{

pkg/bgp/manager/reconciler/route_policy_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
bgpTables "github.com/cilium/cilium/pkg/bgp/manager/tables"
2121
bgpmock "github.com/cilium/cilium/pkg/bgp/mock"
2222
ciliumhive "github.com/cilium/cilium/pkg/hive"
23+
"github.com/cilium/cilium/pkg/option"
2324
)
2425

2526
type routePolicyTestFixture struct {
@@ -61,6 +62,11 @@ func newRoutePolicyTestFixture(t testing.TB) *routePolicyTestFixture {
6162
}
6263
f.hive = ciliumhive.New(
6364
cell.Provide(
65+
func() *option.DaemonConfig {
66+
return &option.DaemonConfig{
67+
EnableBGPControlPlane: true,
68+
}
69+
},
6470
bgpTables.NewDesiredRoutePoliciesTable,
6571
statedb.RWTable[*bgpTables.DesiredRoutePolicy].ToTable,
6672

pkg/bgp/manager/reconciler/service_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2839,6 +2839,9 @@ func newServiceTestFixture(t *testing.T, config option.BGPConfig) *svcTestFixtur
28392839
Logger: p.Logger,
28402840
DB: f.svcReconciler.db,
28412841
DesiredRoutePolicyTable: f.svcReconciler.desiredRoutePolicyTable,
2842+
DaemonConfig: &ciliumoption.DaemonConfig{
2843+
EnableBGPControlPlane: true,
2844+
},
28422845
}).Reconciler.(*RoutePolicyReconciler)
28432846
}),
28442847
),

0 commit comments

Comments
 (0)