Update DiskID to use map

Author: ksubrmnn

client/api/disk/v1beta1/api.pb.go

@@ -58,10 +58,11 @@ message ListDiskIDsRequest {
 }
 
 message DiskID {
-    string page83 = 1;
+    // Map of Disk ID types and Disk ID values
+    map <string, string> diskIDs = 1;
 }
 
 message ListDiskIDsResponse {
     // Map of disk device numbers and IDs <page83> associated with each disk device
-    map <string, DiskID> disk_IDs = 1;
+    map <string, DiskID> diskIDs = 1;
 }

client/api/disk/v1beta1/api.proto

@@ -288,7 +288,9 @@ func (imp APIImplementor) ListDiskIDs() (map[string]shared.DiskID, error) {
 
 		diskNumString := strconv.FormatUint(uint64(diskNumber), 10)
 
-		m[diskNumString] = shared.DiskID{Page83: page83}
+		diskIDs := make(map[string]string)
+		diskIDs["page83"] = page83
+		m[diskNumString] = shared.DiskID{DiskIDs: diskIDs}
 	}
 
 	return m, nil

internal/os/disk/api.go

@@ -39,7 +39,8 @@ type GetDiskNumberByNameResponse struct {
 }
 
 type DiskID struct {
-	Page83 string
+	// Map of Disk ID types and Disk ID values
+	DiskIDs map[string]string
 }
 
 type ListDiskIDsRequest struct {

internal/server/disk/internal/types.go

@@ -124,17 +124,22 @@ func (s *Server) ListDiskIDs(context context.Context, request *internal.ListDisk
 	}
 
 	response := &internal.ListDiskIDsResponse{}
-	m, err := s.hostAPI.ListDiskIDs()
+	diskIDs, err := s.hostAPI.ListDiskIDs()
 	if err != nil {
-		klog.Errorf("failed ListDiskIDs: %v", err)
-		return response, err
+		klog.Errorf("failed ListDiskIDs %v", err)
+		return nil, err
 	}
+	responseDiskIDs := make(map[string]*internal.DiskID)
 
-	response.Disk_IDs = make(map[string]*internal.DiskID)
-	for k, v := range m {
-		d := &internal.DiskID{}
-		d.Page83 = v.Page83
-		response.Disk_IDs[k] = d
+	// Convert from shared to internal type
+	for k, v := range diskIDs {
+		diskID := internal.DiskID{}
+		for k1, v1 := range v.DiskIDs {
+			diskID.DiskIDs[k1] = v1
+		}
+		responseDiskIDs[k] = &diskID
 	}
+	response.Disk_IDs = responseDiskIDs
+
 	return response, nil
 }

internal/server/disk/internal/v1beta1/conversion_generated.go

@@ -13,5 +13,6 @@ type DiskLocation struct {
 
 // DiskID definition
 type DiskID struct {
-	Page83 string
+	// Map of Disk ID types and Disk ID values
+	DiskIDs map[string]string
 }