Skip to content
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

Jump to bottom

Add unit tests for vsphere reconciler #509

Merged
merged 1 commit into from
Mar 12, 2020
Merged

Add unit tests for vsphere reconciler #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions pkg/controller/vsphere/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (

"github.com/google/uuid"
machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
vsphereapi "github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider/v1alpha1"
machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
"github.com/pkg/errors"
"github.com/vmware/govmomi/object"
Expand Down Expand Up @@ -52,7 +51,7 @@ func newReconciler(scope *machineScope) *Reconciler {

// create creates machine if it does not exists.
func (r *Reconciler) create() error {
if err := validateMachine(*r.machine, *r.providerSpec); err != nil {
if err := validateMachine(*r.machine); err != nil {
return fmt.Errorf("%v: failed validating machine provider spec: %v", r.machine.GetName(), err)
}

Expand Down Expand Up @@ -85,7 +84,7 @@ func (r *Reconciler) create() error {

// update finds a vm and reconciles the machine resource status against it.
func (r *Reconciler) update() error {
if err := validateMachine(*r.machine, *r.providerSpec); err != nil {
if err := validateMachine(*r.machine); err != nil {
return fmt.Errorf("%v: failed validating machine provider spec: %v", r.machine.GetName(), err)
}

Expand Down Expand Up @@ -126,7 +125,7 @@ func (r *Reconciler) update() error {

// exists returns true if machine exists.
func (r *Reconciler) exists() (bool, error) {
if err := validateMachine(*r.machine, *r.providerSpec); err != nil {
if err := validateMachine(*r.machine); err != nil {
return false, fmt.Errorf("%v: failed validating machine provider spec: %v", r.machine.GetName(), err)
}

Expand Down Expand Up @@ -284,7 +283,7 @@ func (r *Reconciler) reconcileNetwork(vm *virtualMachine) error {
return nil
}

func validateMachine(machine machinev1.Machine, providerSpec vsphereapi.VSphereMachineProviderSpec) error {
func validateMachine(machine machinev1.Machine) error {
if machine.Labels[machinev1.MachineClusterIDLabel] == "" {
return machinecontroller.InvalidMachineConfiguration("%v: missing %q label", machine.GetName(), machinev1.MachineClusterIDLabel)
}
Expand Down