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

allow list hosts by hypervisor

Browse Source
This commit is contained in:
Qiu Jian
2019-04-20 12:44:00 +08:00
parent a31e8172a1
commit b4240bf0bf
2 changed files with 8 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/hosts.go
+2
View File
@@ -46,6 +46,8 @@ func init() {
Usable *bool `help:"List all zones that is usable"`
Hypervisor string `help:"filter hosts by hypervisor"`
options.BaseListOptions
}
R(&HostListOptions{}, "host-list", "List hosts", func(s *mcclient.ClientSession, opts *HostListOptions) error {
pkg/compute/models/hosts.go
+6 -33
View File
@@ -322,42 +322,15 @@ func (manager *SHostManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
q = q.Filter(sqlchemy.In(q.Field("zone_id"), subq))
}
// vcenter
// zone
// cachedimage
/*managerStr := jsonutils.GetAnyString(query, []string{"manager", "cloudprovider", "cloudprovider_id", "manager_id"})
if len(managerStr) > 0 {
provider, err := CloudproviderManager.FetchByIdOrName(nil, managerStr)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(CloudproviderManager.Keyword(), managerStr)
}
return nil, httperrors.NewGeneralError(err)
hypervisorStr := jsonutils.GetAnyString(query, []string{"hypervisor"})
if len(hypervisorStr) > 0 {
hostType, ok := api.HYPERVISOR_HOSTTYPE[hypervisorStr]
if !ok {
return nil, httperrors.NewInputParameterError("not supported hypervisor %s", hypervisorStr)
}
q = q.Filter(sqlchemy.Equals(q.Field("manager_id"), provider.GetId()))
queryDict.Remove("manager_id")
q = q.Filter(sqlchemy.Equals(q.Field("host_type"), hostType))
}
accountStr := jsonutils.GetAnyString(query, []string{"account", "account_id", "cloudaccount", "cloudaccount_id"})
if len(accountStr) > 0 {
account, err := CloudaccountManager.FetchByIdOrName(nil, accountStr)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(CloudaccountManager.Keyword(), accountStr)
}
return nil, httperrors.NewGeneralError(err)
}
subq := CloudproviderManager.Query("id").Equals("cloudaccount_id", account.GetId()).SubQuery()
q = q.Filter(sqlchemy.In(q.Field("manager_id"), subq))
}
providerStr := jsonutils.GetAnyString(query, []string{"provider"})
if len(providerStr) > 0 {
subq := CloudproviderManager.Query("id").Equals("provider", providerStr).SubQuery()
q = q.Filter(sqlchemy.In(q.Field("manager_id"), subq))
}*/
usable := jsonutils.QueryBoolean(query, "usable", false)
if usable {
hosts := HostManager.Query().SubQuery()