From c2c8670444f03e7727f56c15f8a0840ab23e51da Mon Sep 17 00:00:00 2001 From: ioito Date: Wed, 8 Dec 2021 19:18:40 +0800 Subject: [PATCH] fix(region): kafka data --- pkg/compute/models/kafka.go | 2 +- pkg/multicloud/qcloud/kafka.go | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/kafka.go b/pkg/compute/models/kafka.go index 3c952d4547..f204c5b12a 100644 --- a/pkg/compute/models/kafka.go +++ b/pkg/compute/models/kafka.go @@ -81,7 +81,7 @@ type SKafka struct { // 存储类型 // example: local_ssd - StorageType string `nullable:"false" list:"user" create:"required"` + StorageType string `nullable:"true" list:"user" create:"required"` // 存储大小 // example: 1024 DiskSizeGb int `nullable:"false" list:"user" create:"required"` diff --git a/pkg/multicloud/qcloud/kafka.go b/pkg/multicloud/qcloud/kafka.go index a2965316a5..fe7f2e7951 100644 --- a/pkg/multicloud/qcloud/kafka.go +++ b/pkg/multicloud/qcloud/kafka.go @@ -17,6 +17,7 @@ package qcloud import ( "fmt" "strings" + "time" "yunion.io/x/jsonutils" "yunion.io/x/pkg/errors" @@ -97,6 +98,14 @@ func (self *SKafka) GetBillingType() string { return billing_api.BILLING_TYPE_PREPAID } +func (self *SKafka) GetCreatedAt() time.Time { + return time.Unix(int64(self.CreateTime), 0) +} + +func (self *SKafka) GetExpiredAt() time.Time { + return time.Unix(int64(self.ExpireTime), 0) +} + func (self *SKafka) GetInstanceType() string { return self.InstanceType } @@ -114,11 +123,11 @@ func (self *SKafka) IsMultiAz() bool { } func (self *SKafka) GetBandwidthMb() int { - return self.Bandwidth + return self.Bandwidth / 8 } func (self *SKafka) GetStorageType() string { - return "" + return self.DiskType } func (self *SKafka) GetEndpoint() string {