Skip to content

Commit b550444

Browse files
committed
fix: register OpenStackServer types in tests
1 parent 7cbf7b0 commit b550444

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

controllers/openstackmachinetemplate_controller.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ const (
5555
)
5656

5757
// Set here so we can easily mock it in tests.
58-
var newComputeService = compute.NewService
59-
var newNetworkingService = networking.NewService
58+
var (
59+
newComputeService = compute.NewService
60+
newNetworkingService = networking.NewService
61+
)
6062

6163
// OpenStackMachineTemplateReconciler reconciles a OpenStackMachineTemplate object.
6264
// it only updates the .status field to allow auto-scaling.

controllers/openstackmachinetemplate_controller_test.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@ func TestOpenStackMachineTemplateReconciler_Reconcile_UnhappyPaths(t *testing.T)
5959
scheme := runtime.NewScheme()
6060
_ = corev1.AddToScheme(scheme)
6161
_ = clusterv1.AddToScheme(scheme)
62+
_ = infrav1alpha1.AddToScheme(scheme)
6263
_ = infrav1.AddToScheme(scheme)
64+
_ = scheme.AddKnownTypes(infrav1alpha1.SchemeGroupVersion,
65+
&infrav1alpha1.OpenStackServer{},
66+
&infrav1alpha1.OpenStackServerList{},
67+
)
6368

6469
ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "test-ns"}}
6570

@@ -549,13 +554,13 @@ func TestReconcileAllowedAddressPairs(t *testing.T) {
549554
osmt: &infrav1.OpenStackMachineTemplate{
550555
ObjectMeta: metav1.ObjectMeta{Namespace: testNS, Name: osmtName},
551556
},
552-
setupMock: func(nc *mockclient.MockNetworkClient) {},
557+
setupMock: func(_ *mockclient.MockNetworkClient) {},
553558
},
554559
{
555560
name: "empty clusterName - skip",
556561
clusterName: "",
557562
osmt: makeOSMTWithPorts(nil),
558-
setupMock: func(nc *mockclient.MockNetworkClient) {},
563+
setupMock: func(_ *mockclient.MockNetworkClient) {},
559564
},
560565
{
561566
name: "annotation already matches desired - skip UpdatePort",
@@ -567,7 +572,7 @@ func TestReconcileAllowedAddressPairs(t *testing.T) {
567572
makeMachine(),
568573
makeOSM("[null]"),
569574
},
570-
setupMock: func(nc *mockclient.MockNetworkClient) {
575+
setupMock: func(_ *mockclient.MockNetworkClient) {
571576
// no UpdatePort expected
572577
},
573578
},
@@ -582,7 +587,7 @@ func TestReconcileAllowedAddressPairs(t *testing.T) {
582587
ObjectMeta: metav1.ObjectMeta{Namespace: testNS, Name: osmName},
583588
},
584589
},
585-
setupMock: func(nc *mockclient.MockNetworkClient) {},
590+
setupMock: func(_ *mockclient.MockNetworkClient) {},
586591
},
587592
{
588593
name: "update succeeds - UpdatePort called and annotation set",

0 commit comments

Comments
 (0)