From c14e79f4658d4f4cde16e2bbea285d5c881562d3 Mon Sep 17 00:00:00 2001
From: TangBin <tangbin@yunionyun.com>
Date: Tue, 30 Oct 2018 19:16:13 +0800
Subject: [PATCH] bugfix

---
 pkg/util/aws/instance.go | 4 ++--
 pkg/util/azure/host.go   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/util/aws/instance.go b/pkg/util/aws/instance.go
index dad2bd9e9f..d2b7765876 100644
--- a/pkg/util/aws/instance.go
+++ b/pkg/util/aws/instance.go
@@ -106,7 +106,7 @@ func (self *SInstance) GetId() string {
 }
 
 func (self *SInstance) GetName() string {
-	return self.HostName
+	return self.InstanceName
 }
 
 func (self *SInstance) GetGlobalId() string {
@@ -147,7 +147,7 @@ func (self *SInstance) GetMetadata() *jsonutils.JSONDict {
 
 	if len(self.ImageId) > 0 {
 		if image, err := self.host.zone.region.GetImage(self.ImageId); err != nil {
-			log.Errorf("Failed to find image %s for instance %s", self.ImageId, self.GetName())
+			log.Errorf("Failed to find image %s for instance %s zone %s", self.ImageId, self.GetId(), self.ZoneId)
 		} else if meta := image.GetMetadata(); meta != nil {
 			data.Update(meta)
 		}
diff --git a/pkg/util/azure/host.go b/pkg/util/azure/host.go
index c3d67fdf85..1e3ac49e8f 100644
--- a/pkg/util/azure/host.go
+++ b/pkg/util/azure/host.go
@@ -98,7 +98,7 @@ func (self *SHost) _createVM(name string, imgId string, sysDiskSize int, cpu int
 		DataDisks = append(DataDisks, compute.DataDisk{
 			Name:         &diskName,
 			DiskSizeGB:   &size,
-			CreateOption: compute.Empty,
+			CreateOption: compute.DiskCreateOptionTypesEmpty,
 			Lun:          &lun,
 		})
 	}
@@ -125,12 +125,12 @@ func (self *SHost) _createVM(name string, imgId string, sysDiskSize int, cpu int
 		StorageProfile: &compute.StorageProfile{
 			ImageReference: &compute.ImageReference{ID: &image.ID},
 			OsDisk: &compute.OSDisk{
-				Caching: compute.ReadWrite,
+				Caching: compute.CachingTypesReadWrite,
 				ManagedDisk: &compute.ManagedDiskParameters{
 					StorageAccountType: compute.StorageAccountTypes(storage.storageType),
 				},
 				Name:         &osDiskName,
-				CreateOption: compute.FromImage,
+				CreateOption: compute.DiskCreateOptionTypesEmpty,
 				OsType:       osType,
 				DiskSizeGB:   &DiskSizeGB,
 			},