opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.1.0 -> release/2.2.0

Browse Source 
* commit 'e46e08fa176e26efb3e3028a67e1f2966fef410e':
  修正: zone-capability spec 信息不生效
This commit is contained in:
邱剑
2018-09-15 10:41:32 +08:00
parent 33a98593cb e46e08fa17
commit 38febe3769
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/capabilities.go
+3
View File
@@ -38,6 +38,9 @@ func GetCapabilities(ctx context.Context, userCred mcclient.TokenCredential, que
query = jsonutils.NewDict()
}
var err error
if zone != nil {
query.(*jsonutils.JSONDict).Add(jsonutils.NewString(zone.GetId()), "zone")
}
mans := []ISpecModelManager{HostManager, IsolatedDeviceManager}
capa.Specs, err = GetModelsSpecs(ctx, userCred, query.(*jsonutils.JSONDict), mans...)
return capa, err