Fixes the disk device diff bug after attching it to instance

Author: xiaozhu36

src/bosh-alicloud-cpi/action/attach_disk.go

@@ -68,7 +68,12 @@ func (a AttachDiskMethod) attach(vmCID apiv1.VMCID, diskCID apiv1.DiskCID, cpiVe
 	err := a.disks.ChangeDiskStatus(diskCid, alicloud.DiskStatusInUse, func(disk *ecs.Disk) (bool, error) {
 		switch alicloud.DiskStatus(disk.Status) {
 		case alicloud.DiskStatusInUse:
-			device = alicloud.AmendDiskPath(disk.Device, alicloud.DiskCategory(disk.Category))
+			inst, er := a.instances.GetInstance(instCid)
+			if er == nil {
+				device = a.disks.GetDiskPath(disk.Device, diskCid, inst.InstanceType, alicloud.DiskCategory(disk.Category))
+			} else {
+				device = a.disks.GetDiskPath(disk.Device, diskCid, "", alicloud.DiskCategory(disk.Category))
+			}
 			return true, nil
 		case alicloud.DiskStatusAvailable:
 			return false, a.disks.AttachDisk(instCid, diskCid)

src/bosh-alicloud-cpi/alicloud/disk_manager.go

@@ -4,6 +4,9 @@
 package alicloud
 
 import (
+	"strings"
+
+	util "github.com/alibabacloud-go/tea-utils/service"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
 
 	"encoding/json"
@@ -38,6 +41,8 @@ type DiskManager interface {
 
 	WaitForDiskStatus(diskCid string, toStatus DiskStatus) (string, error)
 	ChangeDiskStatus(cid string, toStatus DiskStatus, checkFunc func(*ecs.Disk) (bool, error)) error
+
+	GetDiskPath(path, diskId, instanceType string, category DiskCategory) string
 }
 
 type DiskManagerImpl struct {
@@ -362,6 +367,53 @@ func AmendDiskPath(path string, category DiskCategory) string {
 	return path
 }
 
+func (a DiskManagerImpl) GetDiskPath(path, diskId, instanceType string, category DiskCategory) string {
+	amendPath := AmendDiskPath(path, category)
+
+	if instanceType == "" || diskId == "" {
+		return amendPath
+	}
+
+	conn, err := a.config.EcsTeaClient("")
+	if err != nil {
+		a.log("EcsTeaClient", err, nil, "")
+		return amendPath
+	}
+
+	invoker := NewInvoker()
+	invoker.AddCatcher(CreateInstanceCatcher_IdempotentProcessing)
+	invoker.AddCatcher(CreateInstanceCatcher_TokenProcessing)
+	invoker.AddCatcher(CreateInstanceCatcher_IpUsed)
+	invoker.AddCatcher(CreateInstanceCatcher_IpUsed2)
+
+	action := "DescribeInstanceTypes"
+	request := map[string]interface{}{
+		"InstanceTypes.1": instanceType,
+		"NvmeSupport":     "required",
+	}
+	runtime := util.RuntimeOptions{}
+	runtime.SetAutoretry(true)
+	err = invoker.Run(func() error {
+		resp, e := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2014-05-26"), StringPointer("AK"), nil, request, &runtime)
+		if e != nil {
+			return e
+		}
+		if resp["InstanceTypes"] != nil &&
+			resp["InstanceTypes"].(map[string]interface{})["InstanceType"] != nil &&
+			len(resp["InstanceTypes"].(map[string]interface{})["InstanceType"].([]interface{})) > 0 {
+			amendPath = "/dev/disk/by-id/nvme-Alibaba_Cloud_Elastic_Block_Storage_" + strings.Split(diskId, "-")[1]
+		} else {
+			amendPath = "/dev/disk/by-id/virtio-" + strings.Split(diskId, "-")[1]
+		}
+		return e
+	})
+	if err != nil {
+		a.log(action, err, request, "")
+	}
+
+	return amendPath
+}
+
 func DescribeDisks(client *ecs.Client, diskId string) (disk *ecs.Disk, err error) {
 	args := ecs.CreateDescribeDisksRequest()
 	bytes, _ := json.Marshal([]string{diskId})