From c77a8c68597bf8d4d2581a0d79c5ffbe884d5331 Mon Sep 17 00:00:00 2001 From: TangBin Date: Thu, 30 Aug 2018 20:13:33 +0800 Subject: [PATCH 1/2] bugfix --- pkg/compute/guestdrivers/aliyun.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/compute/guestdrivers/aliyun.go b/pkg/compute/guestdrivers/aliyun.go index 38b0123006..331b21585f 100644 --- a/pkg/compute/guestdrivers/aliyun.go +++ b/pkg/compute/guestdrivers/aliyun.go @@ -244,11 +244,11 @@ func (self *SAliyunGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gu params := task.GetParams() log.Debugf("Deploy VM params %s", params.String()) var name string - if v, e := params.GetString("name"); e != nil { + if v, e := params.GetString("name"); e == nil { name = v } var description string - if v, e := params.GetString("description"); e != nil { + if v, e := params.GetString("description"); e == nil { description = v } resetPassword := jsonutils.QueryBoolean(params, "reset_password", false) @@ -259,7 +259,7 @@ func (self *SAliyunGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gu } publicKey := "" - if k, e := config.GetString("public_key"); e != nil { + if k, e := config.GetString("public_key"); e == nil { publicKey = k } From 678a63d0b76729845790ba3ded029a5f29e07eca Mon Sep 17 00:00:00 2001 From: TangBin Date: Fri, 31 Aug 2018 14:22:32 +0800 Subject: [PATCH 2/2] code style fix --- pkg/compute/guestdrivers/aliyun.go | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkg/compute/guestdrivers/aliyun.go b/pkg/compute/guestdrivers/aliyun.go index 331b21585f..cc36281e73 100644 --- a/pkg/compute/guestdrivers/aliyun.go +++ b/pkg/compute/guestdrivers/aliyun.go @@ -243,14 +243,10 @@ func (self *SAliyunGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gu params := task.GetParams() log.Debugf("Deploy VM params %s", params.String()) - var name string - if v, e := params.GetString("name"); e == nil { - name = v - } - var description string - if v, e := params.GetString("description"); e == nil { - description = v - } + + name, _ := params.GetString("name") + description, _ := params.GetString("description") + publicKey, _ := config.GetString("public_key") resetPassword := jsonutils.QueryBoolean(params, "reset_password", false) deleteKeypair := jsonutils.QueryBoolean(params, "__delete_keypair__", false) password, _ := params.GetString("password") @@ -258,11 +254,6 @@ func (self *SAliyunGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gu password = seclib2.RandomPassword2(12) } - publicKey := "" - if k, e := config.GetString("public_key"); e == nil { - publicKey = k - } - taskman.LocalTaskRun(task, func() (jsonutils.JSONObject, error) { encpasswd, err := utils.EncryptAESBase64(guest.Id, password) if err != nil {