admin: return additional info in admin API responses (minio#935)

this enhances the admin API responses by returning additional
information

pkg/admin/cordon.go

@@ -29,6 +29,7 @@ import (
 type CordonResult struct {
 	NodeID    directpvtypes.NodeID
 	DriveName directpvtypes.DriveName
+	DriveID   directpvtypes.DriveID
 }
 
 // CordonArgs represents the args to Cordon the drive
@@ -104,6 +105,7 @@ func (client *Client) Cordon(ctx context.Context, args CordonArgs, log LogFunc)
 		results = append(results, CordonResult{
 			NodeID:    result.Drive.GetNodeID(),
 			DriveName: result.Drive.GetDriveName(),
+			DriveID:   result.Drive.GetDriveID(),
 		})
 	}
 

pkg/admin/label_drives.go

@@ -44,6 +44,7 @@ func (l Label) String() string {
 type LabelDriveResult struct {
 	NodeID    directpvtypes.NodeID
 	DriveName directpvtypes.DriveName
+	DriveID   directpvtypes.DriveID
 }
 
 // LabelDriveArgs represents the arguments for adding/removing labels on/from the drives
@@ -116,11 +117,12 @@ func (client *Client) LabelDrives(ctx context.Context, args LabelDriveArgs, labe
 							FormattedMessage: fmt.Sprintf("Label '%s' successfully %s %v/%v\n", labels[i].String(), verb, drive.GetNodeID(), drive.GetDriveName()),
 						},
 					)
+					results = append(results, LabelDriveResult{
+						NodeID:    drive.GetNodeID(),
+						DriveName: drive.GetDriveName(),
+						DriveID:   drive.GetDriveID(),
+					})
 				}
-				results = append(results, LabelDriveResult{
-					NodeID:    drive.GetNodeID(),
-					DriveName: drive.GetDriveName(),
-				})
 				return
 			}
 			retry.RetryOnConflict(retry.DefaultRetry, updateFunc)

pkg/admin/label_volumes.go

@@ -108,11 +108,11 @@ func (client *Client) LabelVolumes(ctx context.Context, args LabelVolumeArgs, la
 							FormattedMessage: fmt.Sprintf("Label '%s' successfully %s %v\n", labels[i].String(), verb, volume.Name),
 						},
 					)
+					results = append(results, LabelVolumeResult{
+						NodeID:     volume.GetNodeID(),
+						VolumeName: volume.Name,
+					})
 				}
-				results = append(results, LabelVolumeResult{
-					NodeID:     volume.GetNodeID(),
-					VolumeName: volume.Name,
-				})
 				return
 			}
 			retry.RetryOnConflict(retry.DefaultRetry, updateFunc)

pkg/admin/remove.go

@@ -39,6 +39,7 @@ type RemoveArgs struct {
 type RemoveResult struct {
 	NodeID    directpvtypes.NodeID
 	DriveName directpvtypes.DriveName
+	DriveID   directpvtypes.DriveID
 }
 
 // Remove removes the initialized drive(s)
@@ -103,6 +104,7 @@ func (client *Client) Remove(ctx context.Context, args RemoveArgs, log LogFunc)
 				results = append(results, RemoveResult{
 					NodeID:    result.Drive.GetNodeID(),
 					DriveName: result.Drive.GetDriveName(),
+					DriveID:   result.Drive.GetDriveID(),
 				})
 			}
 		}

pkg/admin/repair.go

@@ -60,8 +60,9 @@ type RepairArgs struct {
 
 // RepairResult represents result of repaired drive
 type RepairResult struct {
-	JobName string
-	DriveID directpvtypes.DriveID
+	JobName   string
+	DriveName directpvtypes.DriveName
+	DriveID   directpvtypes.DriveID
 }
 
 type repairContainerParams struct {
@@ -229,7 +230,7 @@ func (client *Client) Repair(ctx context.Context, args RepairArgs, log LogFunc)
 				},
 			)
 
-			results = append(results, RepairResult{JobName: jobName, DriveID: result.Drive.GetDriveID()})
+			results = append(results, RepairResult{JobName: jobName, DriveName: result.Drive.GetDriveName(), DriveID: result.Drive.GetDriveID()})
 		}
 	}
 

pkg/admin/suspend_drives.go

@@ -42,6 +42,8 @@ type SuspendDriveArgs struct {
 type SuspendDriveResult struct {
 	NodeID    directpvtypes.NodeID
 	DriveName directpvtypes.DriveName
+	DriveID   directpvtypes.DriveID
+	Volumes   []string
 }
 
 // SuspendDrives suspends the drive
@@ -103,6 +105,8 @@ func (client *Client) SuspendDrives(ctx context.Context, args SuspendDriveArgs,
 		results = append(results, SuspendDriveResult{
 			NodeID:    result.Drive.GetNodeID(),
 			DriveName: result.Drive.GetDriveName(),
+			DriveID:   result.Drive.GetDriveID(),
+			Volumes:   result.Drive.GetVolumes(),
 		})
 	}
 

pkg/admin/suspend_volumes.go

@@ -38,8 +38,12 @@ type SuspendVolumeArgs struct {
 
 // SuspendVolumeResult represents the suspended volume
 type SuspendVolumeResult struct {
-	NodeID     directpvtypes.NodeID
-	VolumeName string
+	NodeID       directpvtypes.NodeID
+	VolumeName   string
+	DriveID      directpvtypes.DriveID
+	DriveName    directpvtypes.DriveName
+	PodName      string
+	PodNamespace string
 }
 
 // SuspendVolumes suspends the volume
@@ -98,8 +102,12 @@ func (client *Client) SuspendVolumes(ctx context.Context, args SuspendVolumeArgs
 		)
 
 		results = append(results, SuspendVolumeResult{
-			NodeID:     result.Volume.GetNodeID(),
-			VolumeName: result.Volume.Name,
+			NodeID:       result.Volume.GetNodeID(),
+			VolumeName:   result.Volume.Name,
+			DriveID:      result.Volume.GetDriveID(),
+			DriveName:    result.Volume.GetDriveName(),
+			PodName:      result.Volume.GetPodName(),
+			PodNamespace: result.Volume.GetPodNS(),
 		})
 	}
 	if !processed {

pkg/admin/uncordon.go

@@ -80,6 +80,7 @@ func (client *Client) Uncordon(ctx context.Context, args UncordonArgs, log LogFu
 		results = append(results, UncordonResult{
 			NodeID:    result.Drive.GetNodeID(),
 			DriveName: result.Drive.GetDriveName(),
+			DriveID:   result.Drive.GetDriveID(),
 		})
 	}