diff --git a/pkg/compute/models/baremetalagents.go b/pkg/compute/models/baremetalagents.go index 7b4616a227..69fecfef85 100644 --- a/pkg/compute/models/baremetalagents.go +++ b/pkg/compute/models/baremetalagents.go @@ -188,16 +188,25 @@ func (self *SBaremetalagent) GetZone() *SZone { return nil } +func (self *SBaremetalagent) getMoreDetails(ctx context.Context, extra *jsonutils.JSONDict) *jsonutils.JSONDict { + zone := self.GetZone() + if zone != nil { + extra.Set("zone", jsonutils.NewString(zone.GetName())) + } + return extra +} + +func (self *SBaremetalagent) GetCustomizeColumns(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) *jsonutils.JSONDict { + extra := self.SStandaloneResourceBase.GetCustomizeColumns(ctx, userCred, query) + return self.getMoreDetails(ctx, extra) +} + func (self *SBaremetalagent) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*jsonutils.JSONDict, error) { extra, err := self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query) if err != nil { return nil, err } - zone := self.GetZone() - if zone != nil { - extra.Set("zone", jsonutils.NewString(zone.GetName())) - } - return extra, nil + return self.getMoreDetails(ctx, extra), nil } func (manager *SBaremetalagentManager) GetAgent(agentType api.TAgentType, zoneId string) *SBaremetalagent { diff --git a/pkg/mcclient/modules/mod_baremetalagents.go b/pkg/mcclient/modules/mod_baremetalagents.go index ab056f707e..4ae6a673ec 100644 --- a/pkg/mcclient/modules/mod_baremetalagents.go +++ b/pkg/mcclient/modules/mod_baremetalagents.go @@ -24,7 +24,8 @@ func init() { Baremetalagents = NewComputeManager( "baremetalagent", "baremetalagents", - []string{"ID", "Name", "Access_ip", "Manager_URI", "Status", "agent_type", "version"}, + []string{"ID", "Name", "Access_ip", "Manager_URI", "Status", "agent_type", "version", + "zone", "zone_id"}, []string{}, ) registerCompute(&Baremetalagents)