Merge pull request #31 from jingxu97/Mar/getDiskNumber

Add getDiskNumberbyDiskName into disk API

Author: k8s-ci-robot

client/api/disk/v1alpha1/api.pb.go

@@ -13,6 +13,9 @@ service Disk {
 
     // Rescan refreshes the host's storage cache
     rpc Rescan(RescanRequest) returns (RescanResponse) {}
+
+    // GetDiskNumberByName returns disk number based on the passing disk name information
+    rpc GetDiskNumberByName(GetDiskNumberByNameRequest) returns (GetDiskNumberByNameResponse) {}
 }
 
 message ListDiskLocationsRequest {
@@ -47,3 +50,14 @@ message RescanRequest {
 message RescanResponse {
     // Intentionally empty
 }
+
+
+message GetDiskNumberByNameRequest {
+    // Disk ID
+    string disk_name = 1;
+}
+
+message GetDiskNumberByNameResponse {
+    // Disk number
+    string disk_number = 1;
+}

client/api/disk/v1alpha1/api.proto

@@ -122,3 +122,12 @@ func (APIImplementor) CreatePartition(diskID string) error {
 	}
 	return nil
 }
+
+func (APIImplementor) GetDiskNumberByName(diskName string) (string, error) {
+	out, err := exec.Command("DiskUtil.exe", "-GetDiskNumberWithId", diskName).CombinedOutput()
+	outString := string(out)
+	if err != nil {
+		return "", fmt.Errorf("error getting disk number. %v, output %v", err, out)
+	}
+	return strings.TrimSpace(outString), nil
+}

client/groups/disk/v1alpha1/client_generated.go

@@ -28,3 +28,12 @@ type RescanRequest struct {
 
 type RescanResponse struct {
 }
+
+type GetDiskNumberByNameRequest struct {
+	// Disk device ID of the disk to partition
+	DiskName string
+}
+
+type GetDiskNumberByNameResponse struct {
+	DiskNumber string
+}

internal/os/disk/api.go

@@ -20,6 +20,7 @@ type API interface {
 	PartitionsExist(diskID string) (bool, error)
 	CreatePartition(diskID string) error
 	Rescan() error
+	GetDiskNumberByName(diskName string) (string, error) 
 }
 
 func NewServer(hostAPI API) (*Server, error) {
@@ -93,3 +94,15 @@ func (s *Server) Rescan(context context.Context, request *internal.RescanRequest
 	}
 	return response, nil
 }
+
+func (s *Server) GetDiskNumberByName(context context.Context, request *internal.GetDiskNumberByNameRequest, version apiversion.Version) (*internal.GetDiskNumberByNameResponse, error) {
+	response := &internal.GetDiskNumberByNameResponse{}
+	diskName := request.DiskName
+	number, err := s.hostAPI.GetDiskNumberByName(diskName)
+	if err != nil {
+		return nil, err
+	}
+
+	response.DiskNumber = number
+	return response, nil
+}