From fd4b5dadd562d169578cc0e2d9dd37eb9bb04025 Mon Sep 17 00:00:00 2001 From: TangBin Date: Tue, 25 Jun 2019 19:08:45 +0800 Subject: [PATCH] ucloud create instance & huawei change instance config bugfix --- pkg/util/huawei/instance.go | 7 ++++++- pkg/util/ucloud/host.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/util/huawei/instance.go b/pkg/util/huawei/instance.go index d7a52a7c5e..c0464859d6 100644 --- a/pkg/util/huawei/instance.go +++ b/pkg/util/huawei/instance.go @@ -587,13 +587,18 @@ func (self *SInstance) GetVNCInfo() (jsonutils.JSONObject, error) { } func (self *SInstance) NextDeviceName() (string, error) { + prefix := "s" + if strings.Contains(self.OSEXTSRVATTRRootDeviceName, "/vd") { + prefix = "v" + } + currents := []string{} for _, item := range self.OSExtendedVolumesVolumesAttached { currents = append(currents, strings.ToLower(item.Device)) } for i := 0; i < 25; i++ { - device := fmt.Sprintf("/dev/sd%s", string(98+i)) + device := fmt.Sprintf("/dev/%sd%s", prefix, string(98+i)) if ok, _ := utils.InStringArray(device, currents); !ok { return device, nil } diff --git a/pkg/util/ucloud/host.go b/pkg/util/ucloud/host.go index 2d787029a3..b555cbd4ec 100644 --- a/pkg/util/ucloud/host.go +++ b/pkg/util/ucloud/host.go @@ -339,7 +339,7 @@ func (self *SRegion) CreateInstance(name, imageId, hostType, password, vpcId, Su // data disk for i, disk := range disks[1:] { N := i + 1 - params.Set(fmt.Sprintf("Disks.%d.IsBoot", N), false) + params.Set(fmt.Sprintf("Disks.%d.IsBoot", N), "False") params.Set(fmt.Sprintf("Disks.%d.Type", N), disk.DiskType) params.Set(fmt.Sprintf("Disks.%d.Size", N), disk.SizeGB) }