From 340790d894c0858a15d9f76cc2bb61df62d1c8b4 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Mon, 17 Oct 2022 17:10:37 +0800 Subject: [PATCH] fix: update auto-gen model api 20221017 --- pkg/apis/compute/zz_generated.model.go | 2 ++ pkg/apis/notify/emailqueue.go | 2 ++ pkg/apis/notify/zz_generated.model.go | 39 ++++++++++++++++++++++---- pkg/apis/zz_generated.model.go | 7 ++++- 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/pkg/apis/compute/zz_generated.model.go b/pkg/apis/compute/zz_generated.model.go index 4c15b66f05..c4c6c5605e 100644 --- a/pkg/apis/compute/zz_generated.model.go +++ b/pkg/apis/compute/zz_generated.model.go @@ -1287,6 +1287,8 @@ type SHost struct { MemReserved int `json:"mem_reserved"` // 内存超分比 MemCmtbound float32 `json:"mem_cmtbound"` + // 页大小 + PageSizeKB int `json:"page_size_kb"` // 存储大小,单位Mb StorageSize int `json:"storage_size"` // 存储类型 diff --git a/pkg/apis/notify/emailqueue.go b/pkg/apis/notify/emailqueue.go index 9ebbd369ff..3318e0a3a9 100644 --- a/pkg/apis/notify/emailqueue.go +++ b/pkg/apis/notify/emailqueue.go @@ -99,6 +99,8 @@ type EmailQueueSendInput struct { type EmailQueueDetails struct { apis.ModelBaseDetails + SEmailQueue + SentAt time.Time `json:"sent_at"` Status string `json:"status"` diff --git a/pkg/apis/notify/zz_generated.model.go b/pkg/apis/notify/zz_generated.model.go index 30750b43b3..f788434f35 100644 --- a/pkg/apis/notify/zz_generated.model.go +++ b/pkg/apis/notify/zz_generated.model.go @@ -31,13 +31,42 @@ type SConfig struct { Attribution string `json:"attribution"` } +// SEmailQueue is an autogenerated struct via yunion.io/x/onecloud/pkg/notify/models.SEmailQueue. +type SEmailQueue struct { + apis.SLogBase + RecvAt time.Time `json:"recv_at"` + Dest string `json:"dest"` + Subject string `json:"subject"` + SessionId string `json:"session_id"` + Content jsonutils.JSONObject `json:"content"` + ProjectId string `json:"project_id"` + Project string `json:"project"` + ProjectDomainId string `json:"project_domain_id"` + ProjectDomain string `json:"project_domain"` + UserId string `json:"user_id"` + User string `json:"user"` + DomainId string `json:"domain_id"` + Domain string `json:"domain"` + Roles string `json:"roles"` +} + +// SEmailQueueStatus is an autogenerated struct via yunion.io/x/onecloud/pkg/notify/models.SEmailQueueStatus. +type SEmailQueueStatus struct { + Id int64 `json:"id"` + SentAt time.Time `json:"sent_at"` + Status string `json:"status"` + Results string `json:"results"` +} + // SEvent is an autogenerated struct via yunion.io/x/onecloud/pkg/notify/models.SEvent. type SEvent struct { - apis.SStandaloneAnonResourceBase - Message string `json:"message"` - Event string `json:"event"` - AdvanceDays int `json:"advance_days"` - TopicId string `json:"topic_id"` + apis.SLogBase + // 资源创建时间 + CreatedAt time.Time `json:"created_at"` + Message string `json:"message"` + Event string `json:"event"` + AdvanceDays int `json:"advance_days"` + TopicId string `json:"topic_id"` } // SNotification is an autogenerated struct via yunion.io/x/onecloud/pkg/notify/models.SNotification. diff --git a/pkg/apis/zz_generated.model.go b/pkg/apis/zz_generated.model.go index 14fe7074e6..b56528359a 100644 --- a/pkg/apis/zz_generated.model.go +++ b/pkg/apis/zz_generated.model.go @@ -157,6 +157,11 @@ type SKeystoneCacheObject struct { Domain string `json:"domain"` } +// SLogBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SLogBase. +type SLogBase struct { + Id int64 `json:"id"` +} + // SMetadata is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SMetadata. type SMetadata struct { // 资源类型 @@ -187,7 +192,7 @@ type SMultiArchResourceBase struct { // SOpsLog is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SOpsLog. type SOpsLog struct { - Id int64 `json:"id"` + SLogBase ObjType string `json:"obj_type"` ObjId string `json:"obj_id"` ObjName string `json:"obj_name"`