Merge pull request #6945 from yousong/automated-cherry-pick-of-#6943-upstream-release-3.2

Automated cherry pick of #6943: lb: include cluster name info in details

pkg/apis/compute/loadbalancer.go

@@ -170,6 +170,8 @@ type LoadbalancerDetails struct {
 	ManagedResourceInfo
 	CloudregionResourceInfo
 
+	LoadbalancerClusterResourceInfo
+
 	VpcResourceInfoBase
 	ZoneResourceInfoBase
 	NetworkResourceInfoBase

pkg/compute/models/loadbalanceragents.go

@@ -544,6 +544,9 @@ func (man *SLoadbalancerAgentManager) CleanPendingDeleteLoadbalancers(ctx contex
 }
 
 func (lbagent *SLoadbalancerAgent) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
+	if data.Contains("cluster_id") {
+		data.Remove("cluster_id")
+	}
 	{
 		keyV := map[string]validators.IValidator{
 			"hb_timeout": validators.NewNonNegativeValidator("hb_timeout").Optional(true),

pkg/compute/models/loadbalancerclusterresource.go

@@ -33,7 +33,7 @@ import (
 
 type SLoadbalancerClusterResourceBase struct {
 	// 归属LB集群
-	ClusterId string `width:"36" charset:"ascii" nullable:"false" list:"user" create:"required" json:"cluster_id"`
+	ClusterId string `width:"36" charset:"ascii" nullable:"false" list:"user" update:"user" create:"required" json:"cluster_id"`
 }
 
 type SLoadbalancerClusterResourceBaseManager struct {

pkg/compute/models/loadbalancers.go

@@ -53,6 +53,8 @@ type SLoadbalancerManager struct {
 
 	SManagedResourceBaseManager
 	SCloudregionResourceBaseManager
+
+	SLoadbalancerClusterResourceBaseManager
 }
 
 var LoadbalancerManager *SLoadbalancerManager
@@ -107,8 +109,7 @@ type SLoadbalancer struct {
 	// 虚拟私有网络Id
 	// VpcId string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional"`
 
-	// 负载均衡集群Id
-	ClusterId string `width:"36" charset:"ascii" nullable:"true" list:"user" create:"optional" json:"cluster_id"`
+	SLoadbalancerClusterResourceBase
 
 	// 计费类型
 	ChargeType string `list:"user" get:"user" create:"optional" update:"user" json:"charge_type"`
@@ -548,6 +549,7 @@ func (man *SLoadbalancerManager) FetchCustomizeColumns(
 ) []api.LoadbalancerDetails {
 	rows := make([]api.LoadbalancerDetails, len(objs))
 
+	clusterRows := man.SLoadbalancerClusterResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
 	virtRows := man.SVirtualResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
 	manRows := man.SManagedResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
 	regRows := man.SCloudregionResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
@@ -557,6 +559,8 @@ func (man *SLoadbalancerManager) FetchCustomizeColumns(
 
 	for i := range rows {
 		rows[i] = api.LoadbalancerDetails{
+			LoadbalancerClusterResourceInfo: clusterRows[i],
+
 			VirtualResourceDetails:  virtRows[i],
 			ManagedResourceInfo:     manRows[i],
 			CloudregionResourceInfo: regRows[i],