From 5fc6a137ec534bf3fb0d17d0fbcb42c84b6b10fb Mon Sep 17 00:00:00 2001
From: Josh Siviour <mrk@mulgadc.com>
Date: Thu, 30 Jul 2026 23:28:42 +1000
Subject: [PATCH] fix(e2e): fail TestMultinodeIPSec when a cluster that
 requested IPsec has none (#612)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(e2e): fail TestMultinodeIPSec when a cluster that requested IPsec has none

An empty ipsec_encapsulation was treated as "bootstrapped without IPsec" and
skipped. On ubuntu-24.04 openvswitch-ipsec.service is inactive at daemon start,
so the enable guard correctly refuses to flip the flag and the cluster runs
plaintext intra-AZ Geneve — but the test then skipped and the cell reported
green, masking the gap on 2 of 3 multinode cells.

Cross-check network.ipsec_enabled from the node config: an explicit false still
skips, anything else fails with the plaintext condition named.

* fix(e2e): read only the ipsec_enabled value, not the whole config line

Detail() rendered "ipsec_enabled=ipsec_enabled = true" because the raw grep
line was logged as the value. Take the first token after "=" so a trailing
comment cannot be read as the value either, and compare exactly rather than
by substring.
---
 tests/e2e/multinode/ipsec_test.go | 44 +++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/multinode/ipsec_test.go b/tests/e2e/multinode/ipsec_test.go
index 8e7d3418c..d44518d45 100644
--- a/tests/e2e/multinode/ipsec_test.go
+++ b/tests/e2e/multinode/ipsec_test.go
@@ -14,7 +14,7 @@ import (
 
 // runIPSec verifies OVN native IPsec is live on every node: OVS DB carries cert/key/CA
 // pointers, xfrm shows AES-GCM SAs, and ESP traffic is observed (best-effort tcpdump).
-// Skips if the cluster was bootstrapped with --ipsec=false.
+// Skips only when the node config disables IPsec; a cluster that asked for it fails.
 func runIPSec(t *testing.T, fix *Fixture) {
 	harness.Phase(t, "Multinode — OVN Native IPsec")
 
@@ -31,7 +31,14 @@ func runIPSec(t *testing.T, fix *Fixture) {
 		t.Fatalf("probe ovs-vsctl on %s: %v", first.Name, err)
 	}
 	if !strings.Contains(string(out), "true") {
-		t.Skipf("IPsec not enabled on cluster (%s reports %q): skip", first.Name, strings.TrimSpace(string(out)))
+		// An empty ipsec_encapsulation alone cannot distinguish "deliberately
+		// disabled" from "enable failed", so cross-check the config's intent.
+		// Skipping on both let ubuntu-24.04 cells run plaintext and report green.
+		if ipsecRequested(t, ssh, first) {
+			t.Fatalf("%s requests network.ipsec_enabled but reports ipsec_encapsulation=%q — intra-AZ Geneve is plaintext; check openvswitch-ipsec.service",
+				first.Name, strings.TrimSpace(string(out)))
+		}
+		t.Skipf("IPsec disabled in node config on %s (network.ipsec_enabled=false): skip", first.Name)
 	}
 
 	harness.Step(t, "OVS DB carries cert pointers + ipsec_encapsulation=true on every node")
@@ -92,3 +99,36 @@ func runIPSec(t *testing.T, fix *Fixture) {
 		}
 	}
 }
+
+// nodeConfigPath is the daemon config the cluster is provisioned with.
+const nodeConfigPath = "/etc/spinifex/spinifex.toml"
+
+// ipsecRequested reports whether the node was configured to run IPsec.
+// network.ipsec_enabled defaults to true, so an absent or unreadable key means
+// requested; only an explicit false opts out.
+func ipsecRequested(t *testing.T, ssh *harness.PeerSSH, n harness.Node) bool {
+	t.Helper()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	raw, err := ssh.Run(ctx, n.Addr,
+		"sudo grep -E '^[[:space:]]*ipsec_enabled' "+nodeConfigPath+" 2>/dev/null || true",
+	)
+	if err != nil {
+		t.Logf("WARN: %s read ipsec_enabled from %s: %v — assuming requested (config default)", n.Name, nodeConfigPath, err)
+		return true
+	}
+
+	// Keep the first token after "=" so a trailing comment cannot be mistaken
+	// for the value. An absent key leaves this empty, which reads as requested.
+	value := strings.TrimSpace(string(raw))
+	if _, after, ok := strings.Cut(value, "="); ok {
+		value = strings.TrimSpace(after)
+	}
+	if fields := strings.Fields(value); len(fields) > 0 {
+		value = fields[0]
+	}
+
+	harness.Detail(t, "node", n.Name, "ipsec_enabled", value)
+	return value != "false"
+}