fix for multiple sc with same fs maps to same trident backend

Author: Utkarshjh

operator/controllers/configurator/storage_drivers/fsx.go

@@ -28,12 +28,13 @@ const (
 	SvmStateCreated = "CREATED"
 	AWSRegion       = "AWS_REGION"
 
-	TridentSecretPattern    = "trident-%s"
-	SvmNamePattern          = "trident-%s"
-	StorageClassNamePattern = "trident-%s-%s"
-	BackendNamePattern      = "trident-%s-%s"
-	VsAdmin                 = "vsadmin"
-	Description             = "Trident secret for FsxN for ONTAP"
+	TridentSecretPattern        = "trident-%s"
+	SvmNamePattern              = "trident-%s"
+	StorageClassNamePattern     = "trident-%s-%s"
+	BackendNamePattern          = "trident-%s-%s"
+	SCManagedBackendNamePattern = "trident-%s-%s-%s"
+	VsAdmin                     = "vsadmin"
+	Description                 = "Trident secret for FsxN for ONTAP"
 
 	// Tags for the secret
 	FileSystemId = "file-system-id"
@@ -288,7 +289,7 @@ func (aws *AWS) Create() ([]string, error) {
 	)
 	for _, svm := range aws.SVMs {
 		for _, protocol := range svm.Protocols {
-			backendName = getFSxNBackendName(svm.FsxnID, protocol)
+			backendName = getFSxNBackendName(aws, svm.FsxnID, protocol)
 			backendYAML := getFsxnTBCYaml(svm, aws.TridentNamespace, backendName, protocol, aws.TBCNamePrefix, aws.SCManagedTConf, aws.TConfSpec)
 			if err := aws.ConfClient.CreateOrPatchObject(confClients.OBackend, backendName,
 				aws.TridentNamespace, backendYAML); err != nil {
@@ -342,7 +343,7 @@ func (aws *AWS) DeleteBackend(request map[string]interface{}) error {
 	protocols := request["protocols"].([]string)
 	fsxnId := request["FSxNID"].(string)
 	for _, protocol := range protocols {
-		backendName := getFSxNBackendName(fsxnId, protocol)
+		backendName := getFSxNBackendName(aws, fsxnId, protocol)
 		if err := aws.ConfClient.DeleteObject(confClients.OBackend, backendName, aws.TridentNamespace); err != nil {
 			return fmt.Errorf("error occurred while deleting backend: %w", err)
 		}
@@ -447,7 +448,11 @@ func deleteSecret(ctx context.Context, aws *AWS, secretName string) error {
 }
 
 // getFSxNBackendName returns the FsxN Trident backend config name
-func getFSxNBackendName(fsxnId, protocolType string) string {
+func getFSxNBackendName(aws *AWS, fsxnId, protocolType string) string {
+	if aws.SCManagedTConf {
+		scName := strings.TrimPrefix(aws.TBCNamePrefix, "tconf-")
+		return fmt.Sprintf(SCManagedBackendNamePattern, scName, fsxnId, protocolType)
+	}
 	return fmt.Sprintf(BackendNamePattern, fsxnId, protocolType)
 }
 

operator/controllers/configurator/storage_drivers/fsx_test.go

@@ -526,18 +526,54 @@ func TestAWS_DeleteSnapshotClass_ListError(t *testing.T) {
 // Test utility functions
 func TestGetFSxNBackendName(t *testing.T) {
 	tests := []struct {
-		fsxnId       string
-		protocolType string
-		expected     string
+		name           string
+		fsxnId         string
+		protocolType   string
+		scManagedTConf bool
+		tbcNamePrefix  string
+		expected       string
 	}{
-		{testFsxnID, sa.NFS, testBackendPrefix + testFsxnID + "-nfs"},
-		{testFsxnID, sa.ISCSI, testBackendPrefix + testFsxnID + "-iscsi"},
-		{"fs-test", "custom", testBackendPrefix + "fs-test-custom"},
+		{
+			name:           "NFS non-managed",
+			fsxnId:         testFsxnID,
+			protocolType:   sa.NFS,
+			scManagedTConf: false,
+			tbcNamePrefix:  "",
+			expected:       testBackendPrefix + testFsxnID + "-nfs",
+		},
+		{
+			name:           "ISCSI non-managed",
+			fsxnId:         testFsxnID,
+			protocolType:   sa.ISCSI,
+			scManagedTConf: false,
+			tbcNamePrefix:  "",
+			expected:       testBackendPrefix + testFsxnID + "-iscsi",
+		},
+		{
+			name:           "custom protocol non-managed",
+			fsxnId:         "fs-test",
+			protocolType:   "custom",
+			scManagedTConf: false,
+			tbcNamePrefix:  "",
+			expected:       testBackendPrefix + "fs-test-custom",
+		},
+		{
+			name:           "NFS SC-managed",
+			fsxnId:         testFsxnID,
+			protocolType:   sa.NFS,
+			scManagedTConf: true,
+			tbcNamePrefix:  "tconf-sc-name",
+			expected:       testBackendPrefix + "sc-name-" + testFsxnID + "-nfs",
+		},
 	}
 
 	for _, tt := range tests {
-		t.Run(fmt.Sprintf("%s_%s", tt.fsxnId, tt.protocolType), func(t *testing.T) {
-			result := getFSxNBackendName(tt.fsxnId, tt.protocolType)
+		t.Run(tt.name, func(t *testing.T) {
+			aws := &AWS{
+				SCManagedTConf: tt.scManagedTConf,
+				TBCNamePrefix:  tt.tbcNamePrefix,
+			}
+			result := getFSxNBackendName(aws, tt.fsxnId, tt.protocolType)
 			assert.Equal(t, tt.expected, result)
 		})
 	}
@@ -998,12 +1034,13 @@ func TestAWS_Create_SCManagedTConf(t *testing.T) {
 		TConfSpec:        tconfSpec,
 	}
 
-	// Mock backend creation
-	mockClient.EXPECT().CreateOrPatchObject(gomock.Any(), testBackendPrefix+testFsxnID+"-nfs", testTridentNamespace, gomock.Any()).Return(nil)
+	// Mock backend creation - SC-managed uses different naming pattern
+	expectedBackendName := testBackendPrefix + testFSxConfiguratorName + "-" + testFsxnID + "-nfs"
+	mockClient.EXPECT().CreateOrPatchObject(gomock.Any(), expectedBackendName, testTridentNamespace, gomock.Any()).Return(nil)
 
 	backends, err := aws.Create()
 
 	assert.NoError(t, err)
 	assert.Len(t, backends, 1)
-	assert.Contains(t, backends, testBackendPrefix+testFsxnID+"-nfs")
+	assert.Contains(t, backends, expectedBackendName)
 }

operator/controllers/resourcemonitor/fsx.go

@@ -20,7 +20,7 @@ const (
 	AdditionalFsxNFileSystemIDAnnotation = "trident.netapp.io/additionalFsxNFileSystemID"
 
 	// Backend naming pattern for FSxN
-	BackendNamePattern = "trident-%s-%s" // filesystemID, protocol
+	SCManagedBackendNamePattern = "trident-%s-%s-%s"
 )
 
 // FsxStorageDriverHandler implements StorageDriverHandler for FSxN
@@ -104,7 +104,7 @@ func (h *FsxStorageDriverHandler) BuildAdditionalStoragePoolsValue(sc *storagev1
 	// Start with the primary filesystem
 	primaryFsxID := sc.Parameters[FSxFilesystemIDParam]
 	if primaryFsxID != "" {
-		backendName := buildBackendName(primaryFsxID, protocol)
+		backendName := buildBackendName(sc.Name, primaryFsxID, protocol)
 		// Use ".*" as a regex pattern to match all pools for this backend
 		backendPools = append(backendPools, fmt.Sprintf("%s:.*", backendName))
 	}
@@ -123,7 +123,7 @@ func (h *FsxStorageDriverHandler) BuildAdditionalStoragePoolsValue(sc *storagev1
 		// Add additional FSx filesystems
 		for _, fsxID := range idList {
 			if fsxID != "" {
-				backendName := buildBackendName(fsxID, protocol)
+				backendName := buildBackendName(sc.Name, fsxID, protocol)
 				backendPools = append(backendPools, fmt.Sprintf("%s:.*", backendName))
 			}
 		}
@@ -276,7 +276,7 @@ func getProtocolFromDriver(driverName string) string {
 	}
 }
 
-// buildBackendName generates a backend name using the pattern trident-{filesystemID}-{protocol}
-func buildBackendName(filesystemID, protocol string) string {
-	return fmt.Sprintf(BackendNamePattern, filesystemID, protocol)
+// buildBackendName generates a backend name using the pattern trident-<scName>-<filesystemID>-<protocol>
+func buildBackendName(scName, filesystemID, protocol string) string {
+	return fmt.Sprintf(SCManagedBackendNamePattern, scName, filesystemID, protocol)
 }