lblisteners: list: show certificate name

yunionio · Jul 30, 2020 · ab71f5e · ab71f5e
1 parent 8a79c0f
commit ab71f5e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/pkg/apis/compute/loadbalancerlistener.go b/pkg/apis/compute/loadbalancerlistener.go
@@ -19,6 +19,7 @@ import "yunion.io/x/onecloud/pkg/apis"
 type LoadbalancerListenerDetails struct {
 	apis.VirtualResourceDetails
 	LoadbalancerResourceInfo
+	LoadbalancerCertificateResourceInfo
 
 	SLoadbalancerListener
 

diff --git a/pkg/compute/models/loadbalancercertificateresource.go b/pkg/compute/models/loadbalancercertificateresource.go
@@ -33,7 +33,7 @@ import (
 
 type SLoadbalancerCertificateResourceBase struct {
 	// 本地负载均衡证书ID
-	CertificateId string `width:"36" charset:"ascii" nullable:"false" create:"required"  index:"true" list:"user" json:"certificate_id"`
+	CertificateId string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional" update:"user"`
 }
 
 type SLoadbalancerCertificateResourceBaseManager struct{}

diff --git a/pkg/compute/models/loadbalancerlisteners.go b/pkg/compute/models/loadbalancerlisteners.go
@@ -42,7 +42,9 @@ type SLoadbalancerListenerManager struct {
 	SLoadbalancerLogSkipper
 	db.SVirtualResourceBaseManager
 	db.SExternalizedResourceBaseManager
+
 	SLoadbalancerResourceBaseManager
+	SLoadbalancerCertificateResourceBaseManager
 }
 
 var LoadbalancerListenerManager *SLoadbalancerListenerManager
@@ -114,7 +116,8 @@ type SLoadbalancerHTTPRedirect struct {
 //  - Use certificate for tcp listener
 //  - Customize ciphers?
 type SLoadbalancerHTTPSListener struct {
-	CertificateId       string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional" update:"user"`
+	SLoadbalancerCertificateResourceBase
+
 	CachedCertificateId string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional" update:"user"`
 	TLSCipherPolicy     string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional" update:"user"`
 	EnableHttp2         bool   `create:"optional" list:"user" update:"user"`
@@ -533,11 +536,13 @@ func (manager *SLoadbalancerListenerManager) FetchCustomizeColumns(
 
 	virtRows := manager.SVirtualResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
 	lbRows := manager.SLoadbalancerResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
+	lbcertRows := manager.SLoadbalancerCertificateResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
 
 	for i := range rows {
 		rows[i] = api.LoadbalancerListenerDetails{
-			VirtualResourceDetails:   virtRows[i],
-			LoadbalancerResourceInfo: lbRows[i],
+			VirtualResourceDetails:              virtRows[i],
+			LoadbalancerResourceInfo:            lbRows[i],
+			LoadbalancerCertificateResourceInfo: lbcertRows[i],
 		}
 		rows[i], _ = objs[i].(*SLoadbalancerListener).getMoreDetails(rows[i])
 	}