Add more functional tests for baremetalset controller

Signed-off-by: rabi <[email protected]>

Author: rabi

Makefile

@@ -130,6 +130,11 @@ vet: gowork ## Run go vet against code.
 	go vet ./...
 	go vet ./... ./api/...
 
+MAX_PROCS := 5
+NUM_PROCS := $(shell expr $(shell nproc --ignore 2) / 2)
+PROCS ?= $(shell if [ $(NUM_PROCS) -gt $(MAX_PROCS) ]; then echo $(MAX_PROCS); else echo $(NUM_PROCS); fi)
+PROC_CMD = --procs $(PROCS)
+
 .PHONY: test
 test: manifests generate fmt vet envtest ginkgo ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" $(GINKGO) --trace --cover --coverpkg=../../pkg/...,../../controllers,../../api/v1beta1 --coverprofile cover.out --covermode=atomic ${PROC_CMD} $(GINKGO_ARGS) ./tests/...

tests/functional/base_test.go

@@ -53,7 +53,7 @@ func DefaultBaremetalSetSpec(name types.NamespacedName, withProvInterface bool)
 	spec := map[string]any{
 		"baremetalHosts": map[string]any{
 			"compute-0": map[string]any{
-				"ctlPlaneIP": "10.0.0.1",
+				"ctlPlaneIP": "10.0.0.1/24",
 			},
 		},
 		"bmhLabelSelector":    map[string]string{"app": "openstack"},
@@ -78,10 +78,10 @@ func TwoNodeBaremetalSetSpec(namespace string) map[string]any {
 	spec := map[string]any{
 		"baremetalHosts": map[string]any{
 			"compute-0": map[string]any{
-				"ctlPlaneIP": "10.0.0.1",
+				"ctlPlaneIP": "10.0.0.1/24",
 			},
 			"compute-1": map[string]any{
-				"ctlPlaneIP": "10.0.0.1",
+				"ctlPlaneIP": "10.0.0.2/24",
 			},
 		},
 		"bmhLabelSelector":    map[string]string{"app": "openstack"},
@@ -96,11 +96,11 @@ func TwoNodeBaremetalSetSpecWithNodeLabel(namespace string) map[string]any {
 	spec := map[string]any{
 		"baremetalHosts": map[string]any{
 			"compute-0": map[string]any{
-				"ctlPlaneIP":       "10.0.0.1",
+				"ctlPlaneIP":       "10.0.0.1/24",
 				"bmhLabelSelector": map[string]string{"nodeName": "compute-0"},
 			},
 			"compute-1": map[string]any{
-				"ctlPlaneIP":       "10.0.0.1",
+				"ctlPlaneIP":       "10.0.0.2/24",
 				"bmhLabelSelector": map[string]string{"nodeName": "compute-1"},
 			},
 		},
@@ -116,11 +116,11 @@ func TwoNodeBaremetalSetSpecWithWrongNodeLabel(namespace string) map[string]any
 	spec := map[string]any{
 		"baremetalHosts": map[string]any{
 			"compute-0": map[string]any{
-				"ctlPlaneIP":       "10.0.0.1",
+				"ctlPlaneIP":       "10.0.0.1/24",
 				"bmhLabelSelector": map[string]string{"nodeName": "compute-0"},
 			},
 			"compute-1": map[string]any{
-				"ctlPlaneIP":       "10.0.0.1",
+				"ctlPlaneIP":       "10.0.0.2/24",
 				"bmhLabelSelector": map[string]string{"nodeName": "compute-2"},
 			},
 		},
@@ -136,15 +136,15 @@ func MultiNodeBaremetalSetSpecWithSameNodeLabel(namespace string) map[string]any
 	spec := map[string]any{
 		"baremetalHosts": map[string]any{
 			"compute-0": map[string]any{
-				"ctlPlaneIP":       "10.0.0.1",
+				"ctlPlaneIP":       "10.0.0.1/24",
 				"bmhLabelSelector": map[string]string{"nodeType": "compute"},
 			},
 			"compute-1": map[string]any{
-				"ctlPlaneIP":       "10.0.0.2",
+				"ctlPlaneIP":       "10.0.0.2/24",
 				"bmhLabelSelector": map[string]string{"nodeType": "compute"},
 			},
 			"compute-2": map[string]any{
-				"ctlPlaneIP":       "10.0.0.3",
+				"ctlPlaneIP":       "10.0.0.3/24",
 				"bmhLabelSelector": map[string]string{"nodeType": "compute"},
 			},
 		},
@@ -160,15 +160,15 @@ func MultiNodeBaremetalSetSpecWithOverlappingNodeLabels(namespace string) map[st
 	spec := map[string]any{
 		"baremetalHosts": map[string]any{
 			"compute-0": map[string]any{
-				"ctlPlaneIP":       "10.0.0.1",
+				"ctlPlaneIP":       "10.0.0.1/24",
 				"bmhLabelSelector": map[string]string{"nodeType": "compute", "dummyLabel": "dummy"},
 			},
 			"compute-1": map[string]any{
-				"ctlPlaneIP":       "10.0.0.2",
+				"ctlPlaneIP":       "10.0.0.2/24",
 				"bmhLabelSelector": map[string]string{"nodeType": "compute", "nodeName": "compute-1"},
 			},
 			"compute-2": map[string]any{
-				"ctlPlaneIP":       "10.0.0.3",
+				"ctlPlaneIP":       "10.0.0.3/24",
 				"bmhLabelSelector": map[string]string{"nodeType": "compute", "dummyLabel": "dummy"},
 			},
 		},