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 #292 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-host-usable-filter to release/2.3.0

Browse Source 
* commit '98dc897eeb29c9adc2b080e87857e11b28fb73e7':
  增加：host-list增加usable过滤器
This commit is contained in:
李泽玺
2018-10-16 18:08:15 +08:00
parent 9f6db4f986 98dc897eeb
commit 6a9ba82120
3 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/hosts.go
+5
View File
@@ -26,6 +26,7 @@ func init() {
AnyMac string `help:"Mac matches one of the host's interface"`
Manager string `help:"Show regions belongs to the cloud provider"`
Usable bool `help:"List all zones that is usable"`
options.BaseListOptions
}
@@ -68,6 +69,10 @@ func init() {
params.Add(jsonutils.NewString(args.Manager), "manager")
}
if args.Usable {
params.Add(jsonutils.JSONTrue, "usable")
}
if args.Empty {
params.Add(jsonutils.JSONTrue, "is_empty")
} else if args.Occupied {
pkg/compute/models/hosts.go
+19 -6
View File
@@ -149,7 +149,7 @@ func (manager *SHostManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
q = q.Equals("access_mac", anyMac)
}
}
var scopeQuery *sqlchemy.SSubQuery
// var scopeQuery *sqlchemy.SSubQuery
schedTagStr := jsonutils.GetAnyString(query, []string{"schedtag", "schedtag_id"})
if len(schedTagStr) > 0 {
@@ -158,7 +158,8 @@ func (manager *SHostManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
return nil, httperrors.NewResourceNotFoundError("Schedtag %s not found", schedTagStr)
}
hostschedtags := HostschedtagManager.Query().SubQuery()
scopeQuery = hostschedtags.Query(hostschedtags.Field("host_id")).Equals("schedtag_id", schedTag.GetId()).SubQuery()
scopeQuery := hostschedtags.Query(hostschedtags.Field("host_id")).Equals("schedtag_id", schedTag.GetId()).SubQuery()
q = q.In("id", scopeQuery)
}
wireStr := jsonutils.GetAnyString(query, []string{"wire", "wire_id"})
@@ -168,7 +169,8 @@ func (manager *SHostManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
return nil, httperrors.NewResourceNotFoundError("Wire %s not found", wireStr)
}
hostwires := HostwireManager.Query().SubQuery()
scopeQuery = hostwires.Query(hostwires.Field("host_id")).Equals("wire_id", wire.GetId()).SubQuery()
scopeQuery := hostwires.Query(hostwires.Field("host_id")).Equals("wire_id", wire.GetId()).SubQuery()
q = q.In("id", scopeQuery)
}
storageStr := jsonutils.GetAnyString(query, []string{"storage", "storage_id"})
@@ -178,7 +180,8 @@ func (manager *SHostManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
return nil, httperrors.NewResourceNotFoundError("Storage %s not found", storageStr)
}
hoststorages := HoststorageManager.Query().SubQuery()
scopeQuery = hoststorages.Query(hoststorages.Field("host_id")).Equals("storage_id", storage.GetId()).SubQuery()
scopeQuery := hoststorages.Query(hoststorages.Field("host_id")).Equals("storage_id", storage.GetId()).SubQuery()
q = q.In("id", scopeQuery)
}
zoneStr := jsonutils.GetAnyString(query, []string{"zone", "zone_id"})
@@ -202,9 +205,18 @@ func (manager *SHostManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
q = q.Filter(sqlchemy.Equals(q.Field("manager_id"), provider.GetId()))
}
if scopeQuery != nil {
q = q.In("id", scopeQuery)
usable := jsonutils.QueryBoolean(query, "usable", false)
if usable {
hostwires := HostwireManager.Query().SubQuery()
networks := NetworkManager.Query().SubQuery()
hostQ := hostwires.Query(sqlchemy.DISTINCT("host_id", hostwires.Field("host_id")))
hostQ = hostQ.Join(networks, sqlchemy.Equals(hostwires.Field("wire_id"), networks.Field("wire_id")))
hostQ = hostQ.Filter(sqlchemy.Equals(networks.Field("status"), NETWORK_STATUS_AVAILABLE))
q = q.In("id", hostQ.SubQuery())
}
return q, nil
}
@@ -1632,6 +1644,7 @@ func (self *SHost) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict
memCommitRate = float64(usage.GuestVmemSize) * 1.0 / float64(totalMem)
}
extra.Add(jsonutils.NewFloat(memCommitRate), "mem_commit_rate")
extra = self.SManagedResourceBase.getExtraDetails(extra)
return extra
}
pkg/compute/models/managedresource.go
+9
View File
@@ -3,6 +3,7 @@ package models
import (
"fmt"
"yunion.io/x/jsonutils"
"yunion.io/x/onecloud/pkg/cloudprovider"
)
@@ -28,3 +29,11 @@ func (self *SManagedResourceBase) GetDriver() (cloudprovider.ICloudProvider, err
func (self *SManagedResourceBase) IsManaged() bool {
return len(self.ManagerId) > 0
}
func (self *SManagedResourceBase) getExtraDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict {
manager := self.GetCloudprovider()
if manager != nil {
extra.Add(jsonutils.NewString(manager.Name), "manager")
}
return extra
}