From 4f024ad28223386d0581d3d0a6c1f6038ba8f44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <quxuan@yunionyun.com>
Date: Mon, 3 Sep 2018 10:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8C=E6=AD=A5log?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/cloudcommon/db/opslog.go | 3 +++
 pkg/compute/models/disks.go  | 9 +++++++++
 pkg/compute/models/guests.go | 5 +++++
 pkg/util/aliyun/disk.go      | 2 ++
 4 files changed, 19 insertions(+)

diff --git a/pkg/cloudcommon/db/opslog.go b/pkg/cloudcommon/db/opslog.go
index 11ad4edf6e..c531f74f40 100644
--- a/pkg/cloudcommon/db/opslog.go
+++ b/pkg/cloudcommon/db/opslog.go
@@ -113,6 +113,9 @@ const (
 	ACT_UNCACHE_IMAGE_FAIL = "uncache_image_fail"
 	ACT_UNCACHED_IMAGE     = "uncached_image"
 
+	ACT_SYNC_CLOUD_DISK   = "sync_cloud_disk"
+	ACT_SYNC_CLOUD_SERVER = "sync_cloud_server"
+
 	ACT_SPLIT = "net_split"
 
 	ACT_PENDING_DELETE = "pending_delete"
diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go
index b05fa85b5e..d8a21a6664 100644
--- a/pkg/compute/models/disks.go
+++ b/pkg/compute/models/disks.go
@@ -591,6 +591,7 @@ func (manager *SDiskManager) newFromCloudDisk(ctx context.Context, userCred mccl
 		}
 	}
 
+	db.OpsLog.LogEvent(&disk, db.ACT_SYNC_CLOUD_DISK, disk.GetShortDesc(), userCred)
 	return &disk, nil
 }
 
@@ -925,6 +926,14 @@ func (self *SDisk) GetShortDesc() *jsonutils.JSONDict {
 		desc.Add(jsonutils.NewString(priceKey), "price_key")
 	}
 
+	if hypervisor := self.GetMetadata("hypervisor", nil); len(hypervisor) > 0 {
+		desc.Add(jsonutils.NewString(hypervisor), "hypervisor")
+	}
+
+	if len(self.ExternalId) > 0 {
+		desc.Add(jsonutils.NewString(self.ExternalId), "externalId")
+	}
+
 	fs := self.GetFsFormat()
 	if len(fs) > 0 {
 		desc.Add(jsonutils.NewString(fs), "fs_format")
diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go
index 5706dedf53..655d215806 100644
--- a/pkg/compute/models/guests.go
+++ b/pkg/compute/models/guests.go
@@ -1305,6 +1305,7 @@ func (manager *SGuestManager) newCloudVM(ctx context.Context, userCred mcclient.
 		}
 	}
 
+	db.OpsLog.LogEvent(&guest, db.ACT_SYNC_CLOUD_SERVER, guest.GetShortDesc(), userCred)
 	return &guest, nil
 }
 
@@ -3185,6 +3186,10 @@ func (self *SGuest) GetShortDesc() *jsonutils.JSONDict {
 		desc.Add(jsonutils.NewString(priceKey), "price_key")
 	}
 
+	if len(self.ExternalId) > 0 {
+		desc.Add(jsonutils.NewString(self.ExternalId), "externalId")
+	}
+
 	desc.Set("hypervisor", jsonutils.NewString(self.GetHypervisor()))
 	spec := self.GetSpec(false)
 	if self.GetHypervisor() == HYPERVISOR_BAREMETAL {
diff --git a/pkg/util/aliyun/disk.go b/pkg/util/aliyun/disk.go
index 7349b8c7c0..74fe06c4f8 100644
--- a/pkg/util/aliyun/disk.go
+++ b/pkg/util/aliyun/disk.go
@@ -61,6 +61,8 @@ func (self *SDisk) GetMetadata() *jsonutils.JSONDict {
 	priceKey := fmt.Sprintf("%s::%s::%s", self.RegionId, self.Category, self.Type)
 	data.Add(jsonutils.NewString(priceKey), "price_key")
 
+	data.Add(jsonutils.NewString(models.HYPERVISOR_ALIYUN), "hypervisor")
+
 	return data
 }