From 662c80dcae7bcc7462bdabbd136c6edf5894a3fd Mon Sep 17 00:00:00 2001
From: Qu Xuan <quxuan@yunionyun.com>
Date: Tue, 24 Dec 2019 22:01:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20list=E5=A2=9E=E5=8A=A0provider=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5,=E8=BF=87=E6=BB=A4=E5=B7=B2=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=9A=84cloudevent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/cloudevent/models/cloudevents.go | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkg/cloudevent/models/cloudevents.go b/pkg/cloudevent/models/cloudevents.go
index 1b0f773974..6a3842306b 100644
--- a/pkg/cloudevent/models/cloudevents.go
+++ b/pkg/cloudevent/models/cloudevents.go
@@ -84,7 +84,6 @@ func (manager *SCloudeventManager) ListItemFilter(ctx context.Context, q *sqlche
 	if err != nil {
 		return nil, err
 	}
-	log.Errorf("input: %s", jsonutils.Marshal(input).PrettyString())
 	if len(input.Cloudprovider) > 0 {
 		providerObj, err := CloudproviderManager.FetchByIdOrName(userCred, input.Cloudprovider)
 		if err != nil {
@@ -102,6 +101,9 @@ func (manager *SCloudeventManager) ListItemFilter(ctx context.Context, q *sqlche
 		q = q.Join(sq, sqlchemy.Equals(q.Field("cloudprovider_id"), sq.Field("id"))).
 			Filter(sqlchemy.In(sq.Field("provider"), input.Providers))
 	}
+	//过滤已删除的cloudprovider日志
+	sq := CloudproviderManager.Query("id").SubQuery()
+	q = q.In("cloudprovider_id", sq)
 	return q, nil
 }
 
@@ -113,11 +115,13 @@ func (self *SCloudevent) GetCloudprovider() (*SCloudprovider, error) {
 	return cloudprovider.(*SCloudprovider), nil
 }
 
-func (self *SCloudevent) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*jsonutils.JSONDict, error) {
-	extra, err := self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query)
-	if err != nil {
-		return nil, err
-	}
+func (self *SCloudevent) GetCustomizeColumns(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) *jsonutils.JSONDict {
+	extra := self.SStatusStandaloneResourceBase.GetCustomizeColumns(ctx, userCred, query)
+	extra, _ = self.getMoreDetails(ctx, userCred, query, extra)
+	return extra
+}
+
+func (self *SCloudevent) getMoreDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, extra *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
 	cloudprovider, err := self.GetCloudprovider()
 	if err != nil {
 		return nil, err
@@ -130,6 +134,14 @@ func (self *SCloudevent) GetExtraDetails(ctx context.Context, userCred mcclient.
 	return extra, nil
 }
 
+func (self *SCloudevent) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*jsonutils.JSONDict, error) {
+	extra, err := self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query)
+	if err != nil {
+		return nil, err
+	}
+	return self.getMoreDetails(ctx, userCred, query, extra)
+}
+
 func (self *SCloudeventManager) fetchMods(ctx context.Context, userCred mcclient.TokenCredential) {
 	if len(mods) > 0 {
 		return