From 6395e077f31203def16d1990e7957ad307e8a1c1 Mon Sep 17 00:00:00 2001
From: ioito <qu_xuan@icloud.com>
Date: Tue, 18 Oct 2022 19:46:36 +0800
Subject: [PATCH] fix(region): add disk_type for disk short desc

---
 pkg/cloudcommon/db/resourcebase.go  |  6 ++++++
 pkg/compute/models/dbinstances.go   | 15 +++++++++++++++
 pkg/compute/models/disks.go         |  1 +
 pkg/compute/models/miscresources.go | 11 +++++++++++
 4 files changed, 33 insertions(+)

diff --git a/pkg/cloudcommon/db/resourcebase.go b/pkg/cloudcommon/db/resourcebase.go
index d3a72ebea0..9f6e4dbe3c 100644
--- a/pkg/cloudcommon/db/resourcebase.go
+++ b/pkg/cloudcommon/db/resourcebase.go
@@ -81,6 +81,12 @@ func (model *SResourceBase) GetIResourceModel() IResourceModel {
 	return model.GetVirtualObject().(IResourceModel)
 }
 
+func (self *SResourceBase) GetShortDesc(ctx context.Context) *jsonutils.JSONDict {
+	desc := self.SModelBase.GetShortDesc(ctx)
+	desc.Set("created_at", jsonutils.NewTimeString(self.CreatedAt))
+	return desc
+}
+
 func (model *SResourceBase) MarkDelete() error {
 	model.Deleted = true
 	model.DeletedAt = timeutils.UtcNow().Round(time.Second)
diff --git a/pkg/compute/models/dbinstances.go b/pkg/compute/models/dbinstances.go
index 1f54966f59..653b69d76a 100644
--- a/pkg/compute/models/dbinstances.go
+++ b/pkg/compute/models/dbinstances.go
@@ -1138,6 +1138,21 @@ func (self *SDBInstance) SaveRenewInfo(
 	return nil
 }
 
+func (self *SDBInstance) GetShortDesc(ctx context.Context) *jsonutils.JSONDict {
+	desc := self.SVirtualResourceBase.GetShortDesc(ctx)
+	region, _ := self.GetRegion()
+	provider := self.GetCloudprovider()
+	info := MakeCloudProviderInfo(region, nil, provider)
+	desc.Set("engine", jsonutils.NewString(self.Engine))
+	desc.Set("storage_type", jsonutils.NewString(self.StorageType))
+	desc.Set("instance_type", jsonutils.NewString(self.InstanceType))
+	desc.Set("vcpu_count", jsonutils.NewInt(int64(self.VcpuCount)))
+	desc.Set("vmem_size_mb", jsonutils.NewInt(int64(self.VmemSizeMb)))
+	desc.Set("disk_size_gb", jsonutils.NewInt(int64(self.DiskSizeGB)))
+	desc.Update(jsonutils.Marshal(&info))
+	return desc
+}
+
 func (self *SDBInstance) StartDBInstanceDeleteTask(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict, parentTaskId string) error {
 	self.SetStatus(userCred, api.DBINSTANCE_DELETING, "")
 	task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceDeleteTask", self, userCred, data, parentTaskId, "", nil)
diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go
index 9a3672a4ed..51a96b008e 100644
--- a/pkg/compute/models/disks.go
+++ b/pkg/compute/models/disks.go
@@ -2520,6 +2520,7 @@ func (self *SDisk) ClearHostSchedCache() error {
 func (self *SDisk) GetShortDesc(ctx context.Context) *jsonutils.JSONDict {
 	desc := self.SVirtualResourceBase.GetShortDesc(ctx)
 	desc.Add(jsonutils.NewInt(int64(self.DiskSize)), "size")
+	desc.Add(jsonutils.NewString(self.DiskType), "disk_type")
 	storage, _ := self.GetStorage()
 	if storage != nil {
 		desc.Add(jsonutils.NewString(storage.StorageType), "storage_type")
diff --git a/pkg/compute/models/miscresources.go b/pkg/compute/models/miscresources.go
index 3956562ba7..ae4eeb455d 100644
--- a/pkg/compute/models/miscresources.go
+++ b/pkg/compute/models/miscresources.go
@@ -228,6 +228,17 @@ func (self *SCloudregion) newFromCloudMiscResource(ctx context.Context, userCred
 	return &misc, nil
 }
 
+func (self *SMiscResource) GetShortDesc(ctx context.Context) *jsonutils.JSONDict {
+	desc := self.SVirtualResourceBase.GetShortDesc(ctx)
+	desc.Update(self.MiscConf)
+	region, _ := self.GetRegion()
+	provider := self.GetCloudprovider()
+	info := MakeCloudProviderInfo(region, nil, provider)
+	desc.Update(jsonutils.Marshal(&info))
+	desc.Set("resource_type", jsonutils.NewString(self.ResourceType))
+	return desc
+}
+
 func (manager *SMiscResourceManager) ValidateCreateData(
 	ctx context.Context,
 	userCred mcclient.TokenCredential,