[manila-csi-plugin] Allow manila e2e testing with DHSS=true (#3045)

When using manila DHSS=true the network needs to be specified to allow
using/creating the share. To allow e2e testing in a DHSS=true env I
added an option to specify network via an environment variable keeping
backward compatibility while allowing testing with DHSS=true

Author: eshulman2

tests/e2e/csi/manila/manilavolume.go

@@ -3,6 +3,7 @@ package test
 import (
 	"bytes"
 	"context"
+	"os"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -13,6 +14,10 @@ import (
 	storageframework "k8s.io/kubernetes/test/e2e/storage/framework"
 )
 
+// Environment variable for DHSS=True mode share network.
+// This must match the variable in testdriver.go.
+var manilaShareNetworkIDForVolume = os.Getenv("MANILA_SHARE_NETWORK_ID")
+
 func runCmd(name string, args ...string) ([]byte, error) {
 	var stdout, stderr bytes.Buffer
 	cmd := exec.Command(name, args...)
@@ -47,9 +52,8 @@ func manilaCreateVolume(
 	ginkgo.By("Creating a test Manila volume externally")
 
 	// Create share.
-
-	out, err := runCmd(
-		"openstack",
+	// Build command arguments, optionally including share network for DHSS=True mode.
+	args := []string{
 		"share",
 		"create",
 		shareProto,
@@ -58,7 +62,14 @@ func manilaCreateVolume(
 		"--format=value",
 		"--column=id",
 		"--wait",
-	)
+	}
+
+	// Support for DHSS=True mode: include share network ID if specified
+	if manilaShareNetworkIDForVolume != "" {
+		args = append(args, "--share-network="+manilaShareNetworkIDForVolume)
+	}
+
+	out, err := runCmd("openstack", args...)
 
 	shareID := strings.TrimSpace(string(out))
 

tests/e2e/csi/manila/testdriver.go

@@ -3,6 +3,7 @@ package test
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
@@ -30,6 +31,12 @@ const (
 	manilaShareSizeGiB    = 1
 )
 
+// Environment variables for DHSS=True (driver_handles_share_servers) mode.
+// Set MANILA_SHARE_NETWORK_ID to enable testing with share networks.
+var (
+	manilaShareNetworkID = os.Getenv("MANILA_SHARE_NETWORK_ID")
+)
+
 type manilaTestDriver struct {
 	driverInfo       storageframework.DriverInfo
 	volumeAttributes []map[string]string
@@ -129,6 +136,11 @@ func (d *manilaTestDriver) GetDynamicProvisionStorageClass(ctx context.Context,
 		"csi.storage.k8s.io/node-publish-secret-namespace":      manilaSecretNamespace,
 	}
 
+	// Support for DHSS=True mode: include share network ID if specified
+	if manilaShareNetworkID != "" {
+		parameters["shareNetworkID"] = manilaShareNetworkID
+	}
+
 	sc := storageframework.GetStorageClass(
 		d.driverInfo.Name,
 		parameters,