From 496bcba85c8fc1b4a00b71872cb0f560036180fe Mon Sep 17 00:00:00 2001
From: Rakshith R <rar@redhat.com>
Date: Mon, 30 Aug 2021 10:17:45 +0530
Subject: [PATCH] rbd: move GetMappedID() to util package

This commit moves getMappedID() from rbd to util
package since it is not rbd specific and exports
it from there.

Signed-off-by: Rakshith R <rar@redhat.com>
---
 internal/rbd/rbd_util.go              | 18 ++--------
 internal/rbd/rbd_util_test.go         | 52 ---------------------------
 internal/util/cluster_mapping.go      | 14 ++++++++
 internal/util/cluster_mapping_test.go | 52 +++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go
index 731066f2e..d11169fcc 100644
--- a/internal/rbd/rbd_util.go
+++ b/internal/rbd/rbd_util.go
@@ -1105,7 +1105,7 @@ func generateVolumeFromMapping(
 	// extract clusterID mapping
 	for _, cm := range *mapping {
 		for key, val := range cm.ClusterIDMapping {
-			mappedClusterID := getMappedID(key, val, vi.ClusterID)
+			mappedClusterID := util.GetMappedID(key, val, vi.ClusterID)
 			if mappedClusterID == "" {
 				continue
 			}
@@ -1119,7 +1119,7 @@ func generateVolumeFromMapping(
 			poolID := fmt.Sprintf("%d", (vi.LocationID))
 			for _, pools := range cm.RBDpoolIDMappingInfo {
 				for key, val := range pools {
-					mappedPoolID := getMappedID(key, val, poolID)
+					mappedPoolID := util.GetMappedID(key, val, poolID)
 					if mappedPoolID == "" {
 						continue
 					}
@@ -1146,20 +1146,6 @@ func generateVolumeFromMapping(
 	return vol, util.ErrPoolNotFound
 }
 
-// getMappedID check the input id is matching key or value.
-// If key==id the value will be returned.
-// If value==id the key will be returned.
-func getMappedID(key, value, id string) string {
-	if key == id {
-		return value
-	}
-	if value == id {
-		return key
-	}
-
-	return ""
-}
-
 func genVolFromVolumeOptions(
 	ctx context.Context,
 	volOptions, credentials map[string]string,
diff --git a/internal/rbd/rbd_util_test.go b/internal/rbd/rbd_util_test.go
index 2a44682db..a121daaf8 100644
--- a/internal/rbd/rbd_util_test.go
+++ b/internal/rbd/rbd_util_test.go
@@ -138,58 +138,6 @@ func TestValidateImageFeatures(t *testing.T) {
 	}
 }
 
-func TestGetMappedID(t *testing.T) {
-	t.Parallel()
-	type args struct {
-		key   string
-		value string
-		id    string
-	}
-	tests := []struct {
-		name     string
-		args     args
-		expected string
-	}{
-		{
-			name: "test for matching key",
-			args: args{
-				key:   "cluster1",
-				value: "cluster2",
-				id:    "cluster1",
-			},
-			expected: "cluster2",
-		},
-		{
-			name: "test for matching value",
-			args: args{
-				key:   "cluster1",
-				value: "cluster2",
-				id:    "cluster2",
-			},
-			expected: "cluster1",
-		},
-		{
-			name: "test for invalid match",
-			args: args{
-				key:   "cluster1",
-				value: "cluster2",
-				id:    "cluster3",
-			},
-			expected: "",
-		},
-	}
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-			val := getMappedID(tt.args.key, tt.args.value, tt.args.id)
-			if val != tt.expected {
-				t.Errorf("getMappedID() got = %v, expected %v", val, tt.expected)
-			}
-		})
-	}
-}
-
 func TestGetCephClientLogFileName(t *testing.T) {
 	t.Parallel()
 	type args struct {
diff --git a/internal/util/cluster_mapping.go b/internal/util/cluster_mapping.go
index 173f5126e..9d3b76b13 100644
--- a/internal/util/cluster_mapping.go
+++ b/internal/util/cluster_mapping.go
@@ -120,3 +120,17 @@ func getClusterMappingInfo(clusterID, filename string) (*[]ClusterMappingInfo, e
 func GetClusterMappingInfo(clusterID string) (*[]ClusterMappingInfo, error) {
 	return getClusterMappingInfo(clusterID, clusterMappingConfigFile)
 }
+
+// GetMappedID check the input id is matching key or value.
+// If key==id the value will be returned.
+// If value==id the key will be returned.
+func GetMappedID(key, value, id string) string {
+	if key == id {
+		return value
+	}
+	if value == id {
+		return key
+	}
+
+	return ""
+}
diff --git a/internal/util/cluster_mapping_test.go b/internal/util/cluster_mapping_test.go
index 2a85ed9ef..d783d9e47 100644
--- a/internal/util/cluster_mapping_test.go
+++ b/internal/util/cluster_mapping_test.go
@@ -239,3 +239,55 @@ func validateMapping(t *testing.T, clusterID, rbdPoolID, cephFSPoolID string, ma
 
 	return nil
 }
+
+func TestGetMappedID(t *testing.T) {
+	t.Parallel()
+	type args struct {
+		key   string
+		value string
+		id    string
+	}
+	tests := []struct {
+		name     string
+		args     args
+		expected string
+	}{
+		{
+			name: "test for matching key",
+			args: args{
+				key:   "cluster1",
+				value: "cluster2",
+				id:    "cluster1",
+			},
+			expected: "cluster2",
+		},
+		{
+			name: "test for matching value",
+			args: args{
+				key:   "cluster1",
+				value: "cluster2",
+				id:    "cluster2",
+			},
+			expected: "cluster1",
+		},
+		{
+			name: "test for invalid match",
+			args: args{
+				key:   "cluster1",
+				value: "cluster2",
+				id:    "cluster3",
+			},
+			expected: "",
+		},
+	}
+	for _, tt := range tests {
+		tt := tt
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+			val := GetMappedID(tt.args.key, tt.args.value, tt.args.id)
+			if val != tt.expected {
+				t.Errorf("getMappedID() got = %v, expected %v", val, tt.expected)
+			}
+		})
+	}
+}