Skip to content

Hypervisor maintenance controller test refactor #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fwiesel merged 2 commits into from
Nov 18, 2025
Merged

Hypervisor maintenance controller test refactor #181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa737a5
Refactor HypervisorMaintenanceControllerTest
fwiesel Nov 17, 2025
64a587a
Use DeferCleanup in test for HypervisorMaintenanceControllerTest
fwiesel Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 26 additions & 25 deletions internal/controller/hypervisor_maintenance_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ import (
kvmv1 "github.com/cobaltcore-dev/openstack-hypervisor-operator/api/v1"
)

var _ = Describe("HypervisorServiceController", func() {
var _ = Describe("HypervisorMaintenanceController", func() {
var (
tc *HypervisorMaintenanceController
controller *HypervisorMaintenanceController
fakeServer testhelper.FakeServer
hypervisorName = types.NamespacedName{Name: "hv-test"}
)
Expand Down Expand Up @@ -80,9 +80,10 @@ var _ = Describe("HypervisorServiceController", func() {
BeforeEach(func(ctx context.Context) {
By("Setting up the OpenStack http mock server")
fakeServer = testhelper.SetupHTTP()
DeferCleanup(fakeServer.Teardown)

By("Creating the HypervisorServiceController")
tc = &HypervisorMaintenanceController{
By("Creating the HypervisorMaintenanceController")
controller = &HypervisorMaintenanceController{
Client: k8sClient,
Scheme: k8sClient.Scheme(),
computeClient: client.ServiceClient(fakeServer),
Expand All @@ -97,23 +98,26 @@ var _ = Describe("HypervisorServiceController", func() {
Spec: kvmv1.HypervisorSpec{},
}
Expect(k8sClient.Create(ctx, hypervisor)).To(Succeed())
DeferCleanup(func(ctx context.Context) {
By("Deleting the Hypervisor resource")
hypervisor := &kvmv1.Hypervisor{}
Expect(k8sClient.Get(ctx, hypervisorName, hypervisor)).To(Succeed())
Expect(k8sClient.Delete(ctx, hypervisor)).To(Succeed())
})
})

AfterEach(func() {
By("Deleting the Hypervisor resource")
hypervisor := &kvmv1.Hypervisor{}
Expect(tc.Client.Get(ctx, hypervisorName, hypervisor)).To(Succeed())
Expect(tc.Client.Delete(ctx, hypervisor)).To(Succeed())

By("Tearing down the OpenStack http mock server")
fakeServer.Teardown()
// After the setup in JustBefore, we want to reconcile
JustBeforeEach(func(ctx context.Context) {
req := ctrl.Request{NamespacedName: hypervisorName}
_, err := controller.Reconcile(ctx, req)
Expect(err).NotTo(HaveOccurred())
})

// Tests
Context("Onboarded Hypervisor", func() {
BeforeEach(func() {
hypervisor := &kvmv1.Hypervisor{}
Expect(tc.Client.Get(ctx, hypervisorName, hypervisor)).To(Succeed())
Expect(k8sClient.Get(ctx, hypervisorName, hypervisor)).To(Succeed())
hypervisor.Status.ServiceID = "1234"
meta.SetStatusCondition(&hypervisor.Status.Conditions,
metav1.Condition{
Expand All @@ -131,25 +135,22 @@ var _ = Describe("HypervisorServiceController", func() {
Context("Spec.Maintenance=\"\"", func() {
BeforeEach(func() {
hypervisor := &kvmv1.Hypervisor{}
Expect(tc.Client.Get(ctx, hypervisorName, hypervisor)).To(Succeed())
Expect(k8sClient.Get(ctx, hypervisorName, hypervisor)).To(Succeed())
hypervisor.Spec.Maintenance = ""
Expect(tc.Client.Update(ctx, hypervisor)).To(Succeed())
Expect(k8sClient.Update(ctx, hypervisor)).To(Succeed())
expectedBody := `{"status": "enabled"}`
mockServiceUpdate(expectedBody)
req := ctrl.Request{NamespacedName: hypervisorName}
_, err := tc.Reconcile(ctx, req)
Expect(err).NotTo(HaveOccurred())
})

It("should set the ConditionTypeHypervisorDisabled to false", func() {
updated := &kvmv1.Hypervisor{}
Expect(tc.Client.Get(ctx, hypervisorName, updated)).To(Succeed())
Expect(k8sClient.Get(ctx, hypervisorName, updated)).To(Succeed())
Expect(meta.IsStatusConditionFalse(updated.Status.Conditions, kvmv1.ConditionTypeHypervisorDisabled)).To(BeTrue())
})

It("should set the ConditionTypeReady to true", func() {
updated := &kvmv1.Hypervisor{}
Expect(tc.Client.Get(ctx, hypervisorName, updated)).To(Succeed())
Expect(k8sClient.Get(ctx, hypervisorName, updated)).To(Succeed())
Expect(updated.Status.Conditions).To(ContainElement(
SatisfyAll(
HaveField("Type", kvmv1.ConditionTypeReady),
Expand All @@ -163,25 +164,25 @@ var _ = Describe("HypervisorServiceController", func() {
Context(fmt.Sprintf("Spec.Maintenance=\"%v\"", mode), func() {
BeforeEach(func() {
hypervisor := &kvmv1.Hypervisor{}
Expect(tc.Client.Get(ctx, hypervisorName, hypervisor)).To(Succeed())
Expect(k8sClient.Get(ctx, hypervisorName, hypervisor)).To(Succeed())
hypervisor.Spec.Maintenance = mode
Expect(tc.Client.Update(ctx, hypervisor)).To(Succeed())
Expect(k8sClient.Update(ctx, hypervisor)).To(Succeed())
expectedBody := fmt.Sprintf(`{"disabled_reason": "Hypervisor CRD: spec.maintenance=%v", "status": "disabled"}`, mode)
mockServiceUpdate(expectedBody)
req := ctrl.Request{NamespacedName: hypervisorName}
_, err := tc.Reconcile(ctx, req)
_, err := controller.Reconcile(ctx, req)
Expect(err).NotTo(HaveOccurred())
})

It("should set the ConditionTypeHypervisorDisabled to true", func() {
updated := &kvmv1.Hypervisor{}
Expect(tc.Client.Get(ctx, hypervisorName, updated)).To(Succeed())
Expect(k8sClient.Get(ctx, hypervisorName, updated)).To(Succeed())
Expect(meta.IsStatusConditionTrue(updated.Status.Conditions, kvmv1.ConditionTypeHypervisorDisabled)).To(BeTrue())
})

It("should set the ConditionTypeReady to false", func() {
updated := &kvmv1.Hypervisor{}
Expect(tc.Client.Get(ctx, hypervisorName, updated)).To(Succeed())
Expect(k8sClient.Get(ctx, hypervisorName, updated)).To(Succeed())
Expect(updated.Status.Conditions).To(ContainElement(
SatisfyAll(
HaveField("Type", kvmv1.ConditionTypeReady),
Expand Down
Loading