Skip to content
Snippets Groups Projects
Unverified Commit 7ea18998 authored by Zexi Li's avatar Zexi Li Committed by GitHub
Browse files

Merge pull request #13077 from ioito/automated-cherry-pick-of-#13076-upstream-release-3.8

Automated cherry pick of #13076: fix(region): wire topology name
parents a913e111 9fb52362
No related branches found
No related tags found
No related merge requests found
......@@ -1542,6 +1542,7 @@ func (self *SWire) GetDetailsTopology(ctx context.Context, userCred mcclient.Tok
hns := hosts[i].GetBaremetalnetworks()
host := api.HostTopologyOutput{
Name: hosts[i].Name,
Id: hosts[i].Id,
Status: hosts[i].Status,
HostStatus: hosts[i].HostStatus,
HostType: hosts[i].HostType,
......@@ -1573,7 +1574,7 @@ func (self *SWire) GetDetailsTopology(ctx context.Context, userCred mcclient.Tok
netAddrs := make([]api.SNetworkUsedAddress, 0)
q := networks[j].getUsedAddressQuery(userCred, rbacutils.ScopeDomain, false)
q := networks[j].getUsedAddressQuery(userCred, rbacutils.ScopeSystem, false)
err = q.All(&netAddrs)
if err != nil {
return nil, errors.Wrapf(err, "q.All")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment