Retrieve scsiName with test

Author: vincentBaer

go.mod

@@ -58,6 +58,8 @@ require (
 	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
 )
 
+require github.com/pmezard/go-difflib v1.0.0 // indirect
+
 require (
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
@@ -105,6 +107,7 @@ require (
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/spf13/cobra v1.4.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/testify v1.8.3
 	go.opentelemetry.io/contrib v0.20.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
 	go.opentelemetry.io/otel v0.20.0 // indirect

go.sum

@@ -400,6 +400,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

pkg/driver/node.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -654,11 +655,31 @@ func (d *nodeService) findDevicePath(devicePath, volumeID string) (string, error
 	}
 
 	// assumption it is a scsi volume for 3DS env
-	scsiName := "scsi-0QEMU_QEMU_HARDDISK_sd" + devicePath[len(devicePath)-1:]
+	scsiName, err := findScsiName(devicePath)
+	if err != nil {
+		return "", err
+	}
+
 	klog.V(4).Infof("findDevicePath: check if scsi device for %s is %s and return the device", devicePath, scsiName)
 	return findScsiVolume(scsiName)
 }
 
+func findScsiName(devicePath string) (string, error) {
+	myreg := regexp.MustCompile(`^/dev/xvd(?P<suffix>[a-z]{1,2})$`)
+	match := myreg.FindStringSubmatch(devicePath)
+	result := make(map[string]string)
+	if myreg.MatchString(devicePath) {
+		for i, name := range myreg.SubexpNames() {
+			if i != 0 && name != "" {
+				result[name] = match[i]
+			}
+		}
+		scsiName := "scsi-0QEMU_QEMU_HARDDISK_sd" + result["suffix"]
+		return scsiName, nil
+	}
+	return "", fmt.Errorf("devicePath %s is not supported", devicePath)
+}
+
 func findScsiVolume(findName string) (device string, err error) {
 	p := filepath.Join("/dev/disk/by-id/", findName)
 	stat, err := os.Lstat(p)

pkg/driver/node_test.go

@@ -19,6 +19,7 @@ package driver
 import (
 	"context"
 	"errors"
+	"fmt"
 	"os"
 	"reflect"
 	"testing"
@@ -27,6 +28,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/outscale-dev/osc-bsu-csi-driver/pkg/driver/internal"
 	"github.com/outscale-dev/osc-bsu-csi-driver/pkg/driver/mocks"
+	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	exec "k8s.io/utils/exec"
@@ -1528,6 +1530,44 @@ func TestNodeGetInfo(t *testing.T) {
 	}
 }
 
+func TestFindScsiName(t *testing.T) {
+	findScsiNameCase := []struct {
+		name                string
+		devicePath          string
+		scsiName            string
+		expTestFindScsiName error
+	}{
+		{
+			name:                "Validate format xvdx",
+			devicePath:          "/dev/xvda",
+			scsiName:            "scsi-0QEMU_QEMU_HARDDISK_sda",
+			expTestFindScsiName: nil,
+		},
+		{
+			name:                "Validate format xvdxy",
+			devicePath:          "/dev/xvdaa",
+			scsiName:            "scsi-0QEMU_QEMU_HARDDISK_sdaa",
+			expTestFindScsiName: nil,
+		},
+		{
+			name:                "Invalide format xvdxyz",
+			devicePath:          "/dev/xvdaaa",
+			scsiName:            "scsi-0QEMU_QEMU_HARDDISK_sd",
+			expTestFindScsiName: fmt.Errorf("devicePath /dev/xvdaaa is not supported"),
+		},
+	}
+	for _, fsnc := range findScsiNameCase {
+		t.Run(fsnc.name, func(t *testing.T) {
+			scsiName, err := findScsiName(fsnc.devicePath)
+			if err != nil {
+				assert.Equal(t, fsnc.expTestFindScsiName.Error(), err.Error())
+			} else {
+				assert.Equal(t, fsnc.scsiName, scsiName)
+			}
+		})
+	}
+}
+
 func expectErr(t *testing.T, actualErr error, expectedCode codes.Code) {
 	if actualErr == nil {
 		t.Fatalf("Expect error but got no error")