From c7ff5c6f87c1d354a8002abf09a2efd1367596c4 Mon Sep 17 00:00:00 2001 From: TangBin Date: Wed, 7 Nov 2018 17:50:00 +0800 Subject: [PATCH] bugfix --- pkg/util/aws/host.go | 2 +- pkg/util/aws/instance.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/util/aws/host.go b/pkg/util/aws/host.go index f81de2a77a..ec82c3233d 100644 --- a/pkg/util/aws/host.go +++ b/pkg/util/aws/host.go @@ -155,7 +155,7 @@ func (self *SHost) GetInstanceById(instanceId string) (*SInstance, error) { func (self *SHost) CreateVM(name, imgId string, sysDiskSize, cpu, memMB int, networkId, ipAddr, desc, passwd, storageType string, diskSizes []int, publicKey string, secgroupId string, userData string) (cloudprovider.ICloudVM, error) { - if len(publicKey) < 0 { + if len(publicKey) == 0 { return nil, fmt.Errorf("AWS instance create error: keypair required") } diff --git a/pkg/util/aws/instance.go b/pkg/util/aws/instance.go index c53cb0c76c..750373b9b8 100644 --- a/pkg/util/aws/instance.go +++ b/pkg/util/aws/instance.go @@ -620,13 +620,13 @@ func (self *SRegion) GetInstanceStatus(instanceId string) (string, error) { } func (self *SRegion) instanceStatusChecking(instanceId, status string) error { - status, err := self.GetInstanceStatus(instanceId) + remoteStatus, err := self.GetInstanceStatus(instanceId) if err != nil { log.Errorf("Fail to get instance status on StartVM: %s", err) return err } - if status != status { - log.Errorf("StartVM: vm status is %s expect %s", status, status) + if status != remoteStatus { + log.Errorf("StartVM: vm status is %s expect %s", remoteStatus, status) return cloudprovider.ErrInvalidStatus }