lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-03 06:21:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.2.0 -> release/2.3.0

Browse Source 
* commit '557d28244c144ac079fa3b5e12b2822c8988069a':
  support export filter
This commit is contained in:
邱剑
2018-10-31 19:50:31 +08:00
parent 8ad2298b57 557d28244c
commit 918f047cff
4 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudcommon/db/db_dispatcher.go
View File

@@ -342,6 +342,12 @@ func query2List(manager IModelManager, ctx context.Context, userCred mcclient.To
}
jsonDict = getModelExtraDetails(item, ctx, jsonDict)
}
if query.Contains("export_keys") {
exportDict := item.GetExportItems(ctx, userCred, query)
if exportDict != nil {
jsonDict.Update(exportDict)
}
}
results = append(results, jsonDict)
}
return results, nil

1
pkg/cloudcommon/db/interface.go
View File

@@ -78,6 +78,7 @@ type IModel interface {
// get hooks
AllowGetDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool
GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) *jsonutils.JSONDict
GetExportItems(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) *jsonutils.JSONDict
// create hooks
CustomizeCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerProjId string, query jsonutils.JSONObject, data jsonutils.JSONObject) error

4
pkg/cloudcommon/db/modelbase.go
View File

@@ -193,6 +193,10 @@ func (model *SModelBase) GetCustomizeColumns(ctx context.Context, userCred mccli
return jsonutils.NewDict()
}
func (model *SModelBase) GetExportItems(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) *jsonutils.JSONDict {
return jsonutils.NewDict()
}
// get hooks
func (model *SModelBase) AllowGetDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool {
return false

14
pkg/compute/models/guests.go
View File

@@ -1123,6 +1123,20 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token
return self.moreExtraInfo(extra)
}
func (self *SGuest) GetExportItems(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) *jsonutils.JSONDict {
exportKeys, _ := query.GetString("export_keys")
keys := strings.Split(exportKeys, ",")
res := jsonutils.NewDict()
if utils.IsInStringArray("os_distribution", keys) {
osType := self.GetMetadata("os_distribution", userCred)
if len(osType) == 0 {
osType = self.OsType
}
res.Set("os_distribution", jsonutils.NewString(osType))
}
return res
}
func (self *SGuest) getNetworksDetails() string {
var buf bytes.Buffer
for _, nic := range self.GetNetworks() {