Skip to content

Commit aa84436

Browse files
committed
fix(test): use OpenStackServer status for port IDs in reconcileAllowedAddressPairs tests
1 parent b550444 commit aa84436

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

controllers/openstackmachinetemplate_controller_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ func TestOpenStackMachineTemplateReconciler_Reconcile_UnhappyPaths(t *testing.T)
6060
_ = corev1.AddToScheme(scheme)
6161
_ = clusterv1.AddToScheme(scheme)
6262
_ = infrav1alpha1.AddToScheme(scheme)
63-
_ = infrav1.AddToScheme(scheme)
64-
_ = scheme.AddKnownTypes(infrav1alpha1.SchemeGroupVersion,
63+
scheme.AddKnownTypes(infrav1alpha1.SchemeGroupVersion,
6564
&infrav1alpha1.OpenStackServer{},
6665
&infrav1alpha1.OpenStackServerList{},
6766
)
67+
_ = infrav1.AddToScheme(scheme)
6868

6969
ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "test-ns"}}
7070

@@ -451,6 +451,11 @@ func TestReconcileAllowedAddressPairs(t *testing.T) {
451451
scheme := runtime.NewScheme()
452452
_ = corev1.AddToScheme(scheme)
453453
_ = clusterv1.AddToScheme(scheme)
454+
_ = infrav1alpha1.AddToScheme(scheme)
455+
scheme.AddKnownTypes(infrav1alpha1.SchemeGroupVersion,
456+
&infrav1alpha1.OpenStackServer{},
457+
&infrav1alpha1.OpenStackServerList{},
458+
)
454459
_ = infrav1.AddToScheme(scheme)
455460
_ = infrav1alpha1.AddToScheme(scheme)
456461

@@ -571,6 +576,7 @@ func TestReconcileAllowedAddressPairs(t *testing.T) {
571576
makeMS(),
572577
makeMachine(),
573578
makeOSM("[null]"),
579+
makeOSS(),
574580
},
575581
setupMock: func(_ *mockclient.MockNetworkClient) {
576582
// no UpdatePort expected
@@ -586,6 +592,7 @@ func TestReconcileAllowedAddressPairs(t *testing.T) {
586592
&infrav1.OpenStackMachine{
587593
ObjectMeta: metav1.ObjectMeta{Namespace: testNS, Name: osmName},
588594
},
595+
// no OpenStackServer → reconciler will skip (NotFound → continue)
589596
},
590597
setupMock: func(_ *mockclient.MockNetworkClient) {},
591598
},
@@ -630,6 +637,7 @@ func TestReconcileAllowedAddressPairs(t *testing.T) {
630637
cl := fake.NewClientBuilder().
631638
WithScheme(scheme).
632639
WithObjects(allObjects...).
640+
WithStatusSubresource(&infrav1alpha1.OpenStackServer{}).
633641
Build()
634642

635643
mockCtrl := gomock.NewController(t)

0 commit comments

Comments
 (0)