Fix multi array zone info (#819)

dell · Dec 10, 2024 · 6e3737c · 6e3737c
1 parent 200c699
commit 6e3737c
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 8 deletions.
diff --git a/pkg/drivers/powerflex.go b/pkg/drivers/powerflex.go
@@ -359,8 +359,7 @@ func ExtractZonesFromSecret(ctx context.Context, kube client.Client, namespace s
 	type StorageArrayConfig struct {
 		SystemID string `json:"systemId"`
 		Zone     struct {
-			Name     string `json:"name"`
-			LabelKey string `json:"labelKey"`
+			Name string `json:"name"`
 		} `json:"zone"`
 	}
 
@@ -383,11 +382,9 @@ func ExtractZonesFromSecret(ctx context.Context, kube client.Client, namespace s
 			if configParam.SystemID == "" {
 				return nil, fmt.Errorf("invalid value for SystemID")
 			}
-			if configParam.Zone.LabelKey != "" {
-				if configParam.Zone.Name != "" {
-					zonesMapData[configParam.Zone.LabelKey] = configParam.Zone.Name
-					log.Infof("Zoning information configured for systemID %s: %v ", configParam.SystemID, zonesMapData)
-				}
+			if configParam.Zone.Name != "" {
+				zonesMapData[configParam.SystemID] = configParam.Zone.Name
+				log.Infof("Zoning information configured for systemID %s: %v ", configParam.SystemID, zonesMapData)
 			} else {
 				log.Info("Zoning information not found in the array config. Continue with topology-unaware driver installation mode")
 				return zonesMapData, nil

diff --git a/pkg/drivers/powerflex_test.go b/pkg/drivers/powerflex_test.go
@@ -220,6 +220,26 @@ func TestExtractZonesFromSecret(t *testing.T) {
   zone:
     name: "US-EAST"
     labelKey: "zone.csi-vxflexos.dellemc.com"
+`
+	zoneDataWithMultiArray := `
+- username: "admin"
+  password: "password"
+  systemID: "2b11bb111111bb1b"
+  endpoint: "https://127.0.0.2"
+  skipCertificateValidation: true
+  mdm: "10.0.0.3,10.0.0.4"
+  zone:
+    name: "ZONE-1"
+    labelKey: "zone.csi-vxflexos.dellemc.com"
+- username: "admin"
+  password: "password"
+  systemID: "1a99aa999999aa9a"
+  endpoint: "https://127.0.0.1"
+  skipCertificateValidation: true
+  mdm: "10.0.0.5,10.0.0.6"
+  zone:
+    name: "ZONE-2"
+    labelKey: "zone.csi-vxflexos.dellemc.com"
 `
 	dataWithoutZone := `
 - username: "admin"
@@ -243,7 +263,21 @@ func TestExtractZonesFromSecret(t *testing.T) {
 			}
 
 			client := fake.NewClientBuilder().WithObjects(secret).Build()
-			return client, map[string]string{"zone.csi-vxflexos.dellemc.com": "US-EAST"}, "vxflexos-config", false
+			return client, map[string]string{"2b11bb111111bb1b": "US-EAST"}, "vxflexos-config", false
+		},
+		"success with zone and multi array": func() (client.WithWatch, map[string]string, string, bool) {
+			secret := &corev1.Secret{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "vxflexos-config",
+					Namespace: "vxflexos",
+				},
+				Data: map[string][]byte{
+					"config": []byte(zoneDataWithMultiArray),
+				},
+			}
+
+			client := fake.NewClientBuilder().WithObjects(secret).Build()
+			return client, map[string]string{"2b11bb111111bb1b": "ZONE-1", "1a99aa999999aa9a": "ZONE-2"}, "vxflexos-config", false
 		},
 		"success no zone": func() (client.WithWatch, map[string]string, string, bool) {
 			secret := &corev1.Secret{