update

client/api/system/v1alpha1/api.proto

@@ -5,15 +5,15 @@ package v1alpha1;
 option go_package = "github.com/kubernetes-csi/csi-proxy/client/api/system/v1alpha1";
 
 service System {
-    // GetSerialNumber returns the device's serial number
-    rpc GetSerialNumber(GetSerialNumberRequest) returns (GetSerialNumberResponse) {}
+    // GetBIOSSerialNumber returns the device's serial number
+    rpc GetBIOSSerialNumber(GetBIOSSerialNumberRequest) returns (GetBIOSSerialNumberResponse) {}
 }
 
-message GetSerialNumberRequest {
+message GetBIOSSerialNumberRequest {
     // Intentionally empty
 }
 
-message GetSerialNumberResponse {
+message GetBIOSSerialNumberResponse {
     // Serial number
     string serial_number = 1;
 }

integrationtests/system_test.go

@@ -2,24 +2,32 @@ package integrationtests
 
 import (
 	"context"
+	"os/exec"
+	"strings"
 	"testing"
 
 	"github.com/kubernetes-csi/csi-proxy/client/api/system/v1alpha1"
 	v1alpha1client "github.com/kubernetes-csi/csi-proxy/client/groups/system/v1alpha1"
 	"github.com/stretchr/testify/require"
 )
 
-func TestGetSerialNumber(t *testing.T) {
-	t.Run("GetSerialNumber", func(t *testing.T) {
+func TestGetBIOSSerialNumber(t *testing.T) {
+	t.Run("GetBIOSSerialNumber", func(t *testing.T) {
 		client, err := v1alpha1client.NewClient()
 		require.Nil(t, err)
 		defer client.Close()
 
-		request := &v1alpha1.GetSerialNumberRequest{}
-		response, err := client.GetSerialNumber(context.TODO(), request)
+		request := &v1alpha1.GetBIOSSerialNumberRequest{}
+		response, err := client.GetBIOSSerialNumber(context.TODO(), request)
 		require.Nil(t, err)
 		require.NotNil(t, response)
-		require.NotEmpty(t, response.SerialNumber)
+
+		result, err := exec.Command("wmic", "bios", "get", "serialnumber").Output()
+		require.Nil(t, err)
+
 		t.Logf("The serial number is %s", response.SerialNumber)
+
+		resultString := string(result)
+		require.True(t, strings.Contains(resultString, response.SerialNumber))
 	})
 }

internal/os/system/api.go

@@ -17,7 +17,7 @@ func New() APIImplementor {
 	return APIImplementor{}
 }
 
-func (APIImplementor) GetSerialNumber() (string, error) {
+func (APIImplementor) GetBIOSSerialNumber() (string, error) {
 	// Taken from Kubernetes vSphere cloud provider
 	// https://github.com/kubernetes/kubernetes/blob/103e926604de6f79161b78af3e792d0ed282bc06/staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere_util_windows.go#L28
 	result, err := exec.Command("wmic", "bios", "get", "serialnumber").Output()

internal/server/system/internal/types.go

@@ -1,8 +1,8 @@
 package internal
 
-type GetSerialNumberRequest struct {
+type GetBIOSSerialNumberRequest struct {
 }
 
-type GetSerialNumberResponse struct {
+type GetBIOSSerialNumberResponse struct {
 	SerialNumber string
 }

internal/server/system/server.go

@@ -13,7 +13,7 @@ type Server struct {
 }
 
 type API interface {
-	GetSerialNumber() (string, error)
+	GetBIOSSerialNumber() (string, error)
 }
 
 func NewServer(hostAPI API) (*Server, error) {
@@ -22,12 +22,12 @@ func NewServer(hostAPI API) (*Server, error) {
 	}, nil
 }
 
-func (s *Server) GetSerialNumber(context context.Context, request *internal.GetSerialNumberRequest, version apiversion.Version) (*internal.GetSerialNumberResponse, error) {
-	klog.V(4).Infof("calling GetSerialNumber")
-	response := &internal.GetSerialNumberResponse{}
-	serialNumber, err := s.hostAPI.GetSerialNumber()
+func (s *Server) GetBIOSSerialNumber(context context.Context, request *internal.GetBIOSSerialNumberRequest, version apiversion.Version) (*internal.GetBIOSSerialNumberResponse, error) {
+	klog.V(4).Infof("calling GetBIOSSerialNumber")
+	response := &internal.GetBIOSSerialNumberResponse{}
+	serialNumber, err := s.hostAPI.GetBIOSSerialNumber()
 	if err != nil {
-		klog.Errorf("failed GetSerialNumber: %v", err)
+		klog.Errorf("failed GetBIOSSerialNumber: %v", err)
 		return response, err
 	}