feat: add tests to validate DualReplica topology effects

added test to check platform type is set to baremetal or none
added test to check etcd operator is set to external
added test to check baremetal hosts are set to detached

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

Author: eggfoobar

test/extended/two_node/common.go

@@ -1,11 +1,18 @@
 package two_node
 
 import (
+	"bytes"
+	"encoding/json"
 	"fmt"
+	"strconv"
 
 	v1 "github.com/openshift/api/config/v1"
+	operatorv1 "github.com/openshift/api/operator/v1"
 	exutil "github.com/openshift/origin/test/extended/util"
+
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
+	"sigs.k8s.io/yaml"
 )
 
 const (
@@ -42,3 +49,38 @@ func isClusterOperatorDegraded(operator *v1.ClusterOperator) bool {
 	}
 	return false
 }
+
+// getUseExternalEtcdSupport checks if useExternalEtcdSupport is set to true in the etcd operator's unsupported config overrides
+// Borrowed from dr/common.go with modifications to use useExternalEtcdSupport. A little duplication to avoid test code dependence.
+func getUseExternalEtcdSupport(spec *operatorv1.StaticPodOperatorSpec) (bool, error) {
+	unsupportedConfig := map[string]interface{}{}
+	if spec.UnsupportedConfigOverrides.Raw == nil {
+		return false, nil
+	}
+
+	configJson, err := yaml.YAMLToJSON(spec.UnsupportedConfigOverrides.Raw)
+	if err != nil {
+		// maybe it's already json
+		configJson = spec.UnsupportedConfigOverrides.Raw
+	}
+
+	if err := json.NewDecoder(bytes.NewBuffer(configJson)).Decode(&unsupportedConfig); err != nil {
+		return false, err
+	}
+
+	value, found, err := unstructured.NestedFieldNoCopy(unsupportedConfig, "useExternalEtcdSupport")
+	if err != nil {
+		return false, err
+	}
+	if !found {
+		return false, nil
+	}
+	switch val := value.(type) {
+	case bool:
+		return val, nil
+	case string:
+		return strconv.ParseBool(val)
+	default:
+		return false, nil
+	}
+}

test/extended/two_node/tnf_topology.go

@@ -10,6 +10,8 @@ import (
 	v1 "github.com/openshift/api/config/v1"
 	exutil "github.com/openshift/origin/test/extended/util"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 const ensurePodmanEtcdContainerIsRunning = "podman inspect --format '{{.State.Running}}' etcd"
@@ -43,6 +45,55 @@ var _ = g.Describe("[sig-node][apigroup:config.openshift.io][OCPFeatureGate:Dual
 		o.Expect(err).ShouldNot(o.HaveOccurred(), "Expected to retrieve arbiter nodes without error")
 		o.Expect(len(arbiterNodes.Items)).To(o.Equal(expectedArbiters), fmt.Sprintf("Expected %d Arbiter Nodes, found %d", expectedArbiters, len(arbiterNodes.Items)))
 	})
+
+	g.It("should have infrastructure set to baremetal or none", func() {
+		g.By("Checking that the infrastructure platform is set to baremetal or none")
+		infrastructure, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+		o.Expect(err).ShouldNot(o.HaveOccurred(), "Expected to retrieve infrastructure configuration without error")
+
+		platformType := infrastructure.Status.PlatformStatus.Type
+		o.Expect(platformType).To(o.Or(o.Equal(v1.BareMetalPlatformType), o.Equal(v1.NonePlatformType)),
+			fmt.Sprintf("Expected infrastructure platform to be baremetal or none, but found %s", platformType))
+	})
+
+	g.It("should have etcd operator configured for external etcd support", func() {
+		g.By("Checking that the etcd operator has useExternalEtcdSupport set to true")
+		etcdOperator, err := oc.AdminOperatorClient().OperatorV1().Etcds().Get(context.Background(), "cluster", metav1.GetOptions{})
+		o.Expect(err).ShouldNot(o.HaveOccurred(), "Expected to retrieve etcd operator configuration without error")
+
+		// Check if useExternalEtcdSupport is set to true in unsupported config overrides
+		useExternalEtcdSupport, err := getUseExternalEtcdSupport(&etcdOperator.Spec.StaticPodOperatorSpec)
+		o.Expect(err).ShouldNot(o.HaveOccurred(), "Expected to parse etcd operator unsupported config overrides without error")
+		o.Expect(useExternalEtcdSupport).To(o.BeTrue(), "Expected useExternalEtcdSupport to be set to true in etcd operator configuration")
+	})
+
+	g.It("should have BareMetalHost operational status set to detached if they exist", func() {
+		g.By("Checking that BareMetalHost objects have operational status set to detached")
+		dc := oc.AdminDynamicClient()
+
+		// Use Dynamic Client to get BareMetalHost objects
+		// Note: move this to common.go if this is used in other tests
+		baremetalGVR := schema.GroupVersionResource{Group: "metal3.io", Resource: "baremetalhosts", Version: "v1alpha1"}
+		baremetalClient := dc.Resource(baremetalGVR).Namespace("openshift-machine-api")
+
+		hosts, err := baremetalClient.List(context.Background(), metav1.ListOptions{})
+		o.Expect(err).ShouldNot(o.HaveOccurred(), "Expected to retrieve BareMetalHost objects without error")
+
+		// If no BareMetalHost objects exist, skip the test, this is valid for TNF deployments
+		if len(hosts.Items) == 0 {
+			g.Skip("No BareMetalHost objects found in openshift-machine-api namespace")
+		}
+
+		// Check each BareMetalHost has operational status set to detached
+		for _, host := range hosts.Items {
+			operationalStatus, found, err := unstructured.NestedString(host.Object, "status", "operationalStatus")
+			o.Expect(err).ShouldNot(o.HaveOccurred(), fmt.Sprintf("Expected to parse operational status for BareMetalHost %s without error", host.GetName()))
+			o.Expect(found).To(o.BeTrue(), fmt.Sprintf("Expected operational status field to exist for BareMetalHost %s", host.GetName()))
+			o.Expect(operationalStatus).To(o.Equal("detached"),
+				fmt.Sprintf("Expected BareMetalHost %s operational status to be 'detached', but found '%s'", host.GetName(), operationalStatus))
+		}
+	})
+
 })
 
 var _ = g.Describe("[sig-etcd][apigroup:config.openshift.io][OCPFeatureGate:DualReplica] Two Node with Fencing", func() {

test/extended/util/annotate/generated/zz_generated.annotations.go

@@ -194,6 +194,15 @@ spec:
     - testName: '[sig-etcd][apigroup:config.openshift.io][OCPFeatureGate:DualReplica][Suite:openshift/two-node][Disruptive]
         Two Node with Fencing etcd recovery Should recover from ungraceful node shutdown
         with etcd member re-addition'
+    - testName: '[sig-node][apigroup:config.openshift.io][OCPFeatureGate:DualReplica]
+        Two Node with Fencing topology should have BareMetalHost operational status
+        set to detached if they exist'
+    - testName: '[sig-node][apigroup:config.openshift.io][OCPFeatureGate:DualReplica]
+        Two Node with Fencing topology should have etcd operator configured for external
+        etcd support'
+    - testName: '[sig-node][apigroup:config.openshift.io][OCPFeatureGate:DualReplica]
+        Two Node with Fencing topology should have infrastructure set to baremetal
+        or none'
     - testName: '[sig-node][apigroup:config.openshift.io][OCPFeatureGate:DualReplica]
         Two Node with Fencing topology should only have two control plane nodes and
         no arbiter nodes'