opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3649 from swordqiu/hotfix/qj-baremetal-agent-list-show-zone

Browse Source 
fix: agent-list show zone info
This commit is contained in:
yunion-ci-robot
2019-11-14 12:38:22 +08:00
committed by GitHub
parent 2504cf70da ad58d41c80
commit 51c77cd798
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/baremetalagents.go
+14 -5
View File
@@ -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 {
pkg/mcclient/modules/mod_baremetalagents.go
+2 -1
View File
@@ -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)