opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5050 from ioito/hotfix/qx-model-detail

Browse Source 
统一 details -> isList
This commit is contained in:
Zexi Li
2020-02-10 11:12:21 +08:00
committed by GitHub
parent dcb89df2f8 366cbd4e36
commit b463203902
82 changed files with 166 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/caller.go
+2 -2
View File
@@ -172,8 +172,8 @@ func ListItemFilter(manager IModelManager, ctx context.Context, q *sqlchemy.SQue
return ret[0].Interface().(*sqlchemy.SQuery), nil
}
func GetExtraDetails(model IModel, ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (*jsonutils.JSONDict, error) {
ret, err := call(model, "GetExtraDetails", ctx, userCred, query, details)
func GetExtraDetails(model IModel, ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (*jsonutils.JSONDict, error) {
ret, err := call(model, "GetExtraDetails", ctx, userCred, query, isList)
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
pkg/cloudcommon/db/db_dispatcher.go
+2 -2
View File
@@ -376,7 +376,7 @@ func Query2List(manager IModelManager, ctx context.Context, userCred mcclient.To
jsonDict = jsonDict.CopyIncludes([]string(listF)...)
jsonDict.Update(extraData)
if showDetails && !query.Contains("export_keys") {
extraDict, _ := GetExtraDetails(item, ctx, userCred, query, false)
extraDict, _ := GetExtraDetails(item, ctx, userCred, query, true)
if extraDict != nil {
// Fix for Now
extraDict.Update(jsonDict)
@@ -753,7 +753,7 @@ func getModelItemDetails(manager IModelManager, item IModel, ctx context.Context
}
func getItemDetails(manager IModelManager, item IModel, ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {
extraDict, err := GetExtraDetails(item, ctx, userCred, query, true)
extraDict, err := GetExtraDetails(item, ctx, userCred, query, false)
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
pkg/cloudcommon/db/modelbase.go
+1 -1
View File
@@ -456,7 +456,7 @@ func (model *SModelBase) AllowGetDetails(ctx context.Context, userCred mcclient.
return false
}
func (model *SModelBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (apis.ModelBaseDetails, error) {
func (model *SModelBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (apis.ModelBaseDetails, error) {
return getModelExtraDetails(model.GetIModel(), ctx), nil
}
pkg/cloudcommon/db/sharablevirtual.go
+2 -2
View File
@@ -277,10 +277,10 @@ func (model *SSharableVirtualResourceBase) getMoreDetails(ctx context.Context, u
return out
}
func (model *SSharableVirtualResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (apis.SharableVirtualResourceDetails, error) {
func (model *SSharableVirtualResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (apis.SharableVirtualResourceDetails, error) {
var err error
out := apis.SharableVirtualResourceDetails{}
out.VirtualResourceDetails, err = model.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = model.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/cloudcommon/db/standalone.go
+2 -2
View File
@@ -239,10 +239,10 @@ func (model *SStandaloneResourceBase) GetShortDescV2(ctx context.Context) *apis.
return desc
}
func (model *SStandaloneResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (apis.StandaloneResourceDetails, error) {
func (model *SStandaloneResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (apis.StandaloneResourceDetails, error) {
var err error
out := apis.StandaloneResourceDetails{}
out.ModelBaseDetails, err = model.SResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = model.SResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/cloudcommon/db/virtualresource.go
+2 -2
View File
@@ -296,10 +296,10 @@ func (model *SVirtualResourceBase) GetTenantCache(ctx context.Context) (*STenant
return TenantCacheManager.FetchTenantById(ctx, model.ProjectId)
}
func (model *SVirtualResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (apis.VirtualResourceDetails, error) {
func (model *SVirtualResourceBase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (apis.VirtualResourceDetails, error) {
var err error
out := apis.VirtualResourceDetails{}
out.StandaloneResourceDetails, err = model.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = model.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/baremetalagents.go
+2 -2
View File
@@ -208,10 +208,10 @@ func (self *SBaremetalagent) getMoreDetails(ctx context.Context, out api.Baremet
return out
}
func (self *SBaremetalagent) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.BaremetalagentDetails, error) {
func (self *SBaremetalagent) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.BaremetalagentDetails, error) {
var err error
out := api.BaremetalagentDetails{}
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/buckets.go
+2 -2
View File
@@ -518,10 +518,10 @@ func (bucket *SBucket) RemoteCreate(ctx context.Context, userCred mcclient.Token
return nil
}
func (bucket *SBucket) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.BucketDetails, error) {
func (bucket *SBucket) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.BucketDetails, error) {
var err error
out := api.BucketDetails{}
out.VirtualResourceDetails, err = bucket.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = bucket.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/cachedimages.go
+2 -2
View File
@@ -306,10 +306,10 @@ func (manager *SCachedimageManager) getImageInfo(ctx context.Context, userCred m
return manager.getImageByName(ctx, userCred, imageId, refresh)
}
func (self *SCachedimage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.CachedimageDetails, error) {
func (self *SCachedimage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.CachedimageDetails, error) {
var err error
out := api.CachedimageDetails{}
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/cloudaccounts.go
+2 -2
View File
@@ -930,10 +930,10 @@ func (self *SCloudaccount) getMoreDetails(out api.CloudaccountDetail) api.Clouda
return out
}
func (self *SCloudaccount) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.CloudaccountDetail, error) {
func (self *SCloudaccount) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.CloudaccountDetail, error) {
var err error
out := api.CloudaccountDetail{}
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/cloudproviderregions.go
+2 -2
View File
@@ -115,10 +115,10 @@ func (self *SCloudproviderregion) GetRegion() *SCloudregion {
return regionObj.(*SCloudregion)
}
func (self *SCloudproviderregion) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.CloudproviderregionDetails, error) {
func (self *SCloudproviderregion) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.CloudproviderregionDetails, error) {
var err error
out := api.CloudproviderregionDetails{}
out.ModelBaseDetails, err = self.SJointResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SJointResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/cloudproviders.go
+2 -2
View File
@@ -893,10 +893,10 @@ func (self *SCloudprovider) getMoreDetails(ctx context.Context, out api.Cloudpro
return out
}
func (self *SCloudprovider) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.CloudproviderDetails, error) {
func (self *SCloudprovider) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.CloudproviderDetails, error) {
var err error
out := api.CloudproviderDetails{}
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/cloudregions.go
+2 -2
View File
@@ -251,10 +251,10 @@ func (self *SCloudregion) getMoreDetails(out api.CloudregionDetails) api.Cloudre
return out
}
func (self *SCloudregion) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.CloudregionDetails, error) {
func (self *SCloudregion) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.CloudregionDetails, error) {
var err error
out := api.CloudregionDetails{}
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/dbinstance_accounts.go
+2 -2
View File
@@ -159,10 +159,10 @@ func (self *SDBInstanceAccount) getMoreDetails(ctx context.Context, userCred mcc
return out, nil
}
func (self *SDBInstanceAccount) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.DBInstanceAccountDetails, error) {
func (self *SDBInstanceAccount) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.DBInstanceAccountDetails, error) {
var err error
out := api.DBInstanceAccountDetails{}
out.StandaloneResourceDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/dbinstance_databases.go
+2 -2
View File
@@ -244,10 +244,10 @@ func (self *SDBInstanceDatabase) GetDBInstance() (*SDBInstance, error) {
return instance.(*SDBInstance), nil
}
func (self *SDBInstanceDatabase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.DBInstancedatabaseDetails, error) {
func (self *SDBInstanceDatabase) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.DBInstancedatabaseDetails, error) {
var err error
out := api.DBInstancedatabaseDetails{}
out.StandaloneResourceDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/dbinstances.go
+2 -2
View File
@@ -365,10 +365,10 @@ func (self *SDBInstance) PostCreate(ctx context.Context, userCred mcclient.Token
task.ScheduleRun(nil)
}
func (self *SDBInstance) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.DBInstanceDetails, error) {
func (self *SDBInstance) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.DBInstanceDetails, error) {
var err error
out := api.DBInstanceDetails{}
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/disks.go
+2 -2
View File
@@ -1809,10 +1809,10 @@ func (self *SDisk) getMoreDetails(ctx context.Context, userCred mcclient.TokenCr
return out
}
func (self *SDisk) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.DiskDetails, error) {
func (self *SDisk) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.DiskDetails, error) {
var err error
out := api.DiskDetails{}
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/dynamicschedtags.go
+2 -2
View File
@@ -205,10 +205,10 @@ func (self *SDynamicschedtag) getMoreColumns(out api.DynamicschedtagDetails) api
return out
}
func (self *SDynamicschedtag) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.DynamicschedtagDetails, error) {
func (self *SDynamicschedtag) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.DynamicschedtagDetails, error) {
var err error
out := api.DynamicschedtagDetails{}
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/elasticcache_instances.go
+2 -2
View File
@@ -163,10 +163,10 @@ func (self *SElasticcache) updateExtraDetails(ctx context.Context, userCred mccl
return out
}
func (self *SElasticcache) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.ElasticcacheDetails, error) {
func (self *SElasticcache) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.ElasticcacheDetails, error) {
var err error
out := api.ElasticcacheDetails{}
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/elasticips.go
+2 -2
View File
@@ -1077,10 +1077,10 @@ func (self *SElasticip) StartEipSyncstatusTask(ctx context.Context, userCred mcc
return nil
}
func (self *SElasticip) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.ElasticipDetails, error) {
func (self *SElasticip) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.ElasticipDetails, error) {
var err error
out := api.ElasticipDetails{}
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/external_projects.go
+2 -2
View File
@@ -94,10 +94,10 @@ func (self *SExternalProject) getMoreDetails(ctx context.Context, userCred mccli
return out
}
func (self *SExternalProject) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.ExternalProjectDetails, error) {
func (self *SExternalProject) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.ExternalProjectDetails, error) {
var err error
out := api.ExternalProjectDetails{}
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/globalvpcs.go
+2 -2
View File
@@ -74,10 +74,10 @@ func (self *SGlobalVpc) GetVpcs() ([]SVpc, error) {
return vpcs, nil
}
func (self *SGlobalVpc) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.GlobalVpcDetails, error) {
func (self *SGlobalVpc) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.GlobalVpcDetails, error) {
var err error
out := api.GlobalVpcDetails{}
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/groupguests.go
+2 -2
View File
@@ -65,10 +65,10 @@ func (joint *SGroupguest) Slave() db.IStandaloneModel {
return db.JointSlave(joint)
}
func (self *SGroupguest) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.GroupguestDetails, error) {
func (self *SGroupguest) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.GroupguestDetails, error) {
var err error
out := api.GroupguestDetails{}
out.ModelBaseDetails, err = self.SGroupJointsBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SGroupJointsBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/groupnetworks.go
+2 -2
View File
@@ -71,10 +71,10 @@ func (joint *SGroupnetwork) Slave() db.IStandaloneModel {
return db.JointSlave(joint)
}
func (self *SGroupnetwork) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.GroupnetworkDetails, error) {
func (self *SGroupnetwork) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.GroupnetworkDetails, error) {
var err error
out := api.GroupnetworkDetails{}
out.ModelBaseDetails, err = self.SGroupJointsBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SGroupJointsBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/groups.go
+2 -2
View File
@@ -100,10 +100,10 @@ func (sm *SGroupManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery,
}
func (group *SGroup) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject, details bool) (api.InstanceGroupDetail, error) {
query jsonutils.JSONObject, isList bool) (api.InstanceGroupDetail, error) {
var err error
out := api.InstanceGroupDetail{}
out.VirtualResourceDetails, err = group.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = group.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/guest_template.go
+2 -2
View File
@@ -178,10 +178,10 @@ func (gt *SGuestTemplate) ValidateUpdateData(ctx context.Context, userCred mccli
}
func (gt *SGuestTemplate) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject, details bool) (computeapis.GuesttemplateDetails, error) {
query jsonutils.JSONObject, isList bool) (computeapis.GuesttemplateDetails, error) {
var err error
out := computeapis.GuesttemplateDetails{}
out.SharableVirtualResourceDetails, err = gt.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.SharableVirtualResourceDetails, err = gt.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/guestdisks.go
+2 -2
View File
@@ -121,10 +121,10 @@ func (self *SGuestdisk) getExtraInfo(out api.GuestDiskDetails) api.GuestDiskDeta
return out
}
func (self *SGuestdisk) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.GuestDiskDetails, error) {
func (self *SGuestdisk) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.GuestDiskDetails, error) {
var err error
out := api.GuestDiskDetails{}
out.ModelBaseDetails, err = self.SGuestJointsBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SGuestJointsBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/guestnetworks.go
+2 -2
View File
@@ -99,10 +99,10 @@ func (joint *SGuestnetwork) Slave() db.IStandaloneModel {
return db.JointSlave(joint)
}
func (self *SGuestnetwork) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.GuestnetworkDetails, error) {
func (self *SGuestnetwork) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.GuestnetworkDetails, error) {
var err error
out := api.GuestnetworkDetails{}
out.ModelBaseDetails, err = self.SGuestJointsBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SGuestJointsBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/guests.go
+1
View File
@@ -1687,6 +1687,7 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token
}
} else {
out.Networks = self.getNetworksDetails()
out.Disks = self.getDisksDetails()
out.DisksInfo = self.getDisksInfoDetails()
out.VirtualIps = strings.Join(self.getVirtualIPs(), ",")
out.SecurityRules = self.getSecurityGroupsRules()
pkg/compute/models/hostnetworks.go
+2 -2
View File
@@ -71,10 +71,10 @@ func (bn *SHostnetwork) Slave() db.IStandaloneModel {
return db.JointSlave(bn)
}
func (bn *SHostnetwork) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.HostnetworkDetails, error) {
func (bn *SHostnetwork) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.HostnetworkDetails, error) {
var err error
out := api.HostnetworkDetails{}
out.ModelBaseDetails, err = bn.SHostJointsBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = bn.SHostJointsBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/hosts.go
+2 -2
View File
@@ -2434,10 +2434,10 @@ func (self *SHost) getMoreDetails(ctx context.Context, out api.HostDetails) api.
return out
}
func (self *SHost) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.HostDetails, error) {
func (self *SHost) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.HostDetails, error) {
var err error
out := api.HostDetails{}
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/hostschedtags.go
+2 -2
View File
@@ -70,9 +70,9 @@ func (self *SHostschedtag) Master() db.IStandaloneModel {
return self.SSchedtagJointsBase.master(self)
}
func (self *SHostschedtag) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.HostschedtagDetails, error) {
func (self *SHostschedtag) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.HostschedtagDetails, error) {
out := api.HostschedtagDetails{}
out.JoinModelBaseDetails, _ = self.SSchedtagJointsBase.getExtraDetails(self, ctx, userCred, query, details)
out.JoinModelBaseDetails, _ = self.SSchedtagJointsBase.getExtraDetails(self, ctx, userCred, query, isList)
out.Host, out.Schedtag = db.JointModelExtra(self)
out.Baremetal = out.Host
return out, nil
pkg/compute/models/hoststorages.go
+2 -2
View File
@@ -88,10 +88,10 @@ func (joint *SHoststorage) Slave() db.IStandaloneModel {
return db.JointSlave(joint)
}
func (self *SHoststorage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.HoststorageDetails, error) {
func (self *SHoststorage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.HoststorageDetails, error) {
var err error
out := api.HoststorageDetails{}
out.ModelBaseDetails, err = self.SHostJointsBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SHostJointsBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/hostwires.go
+2 -2
View File
@@ -80,10 +80,10 @@ func (joint *SHostwire) Slave() db.IStandaloneModel {
return db.JointSlave(joint)
}
func (self *SHostwire) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.HostwireDetails, error) {
func (self *SHostwire) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.HostwireDetails, error) {
var err error
out := api.HostwireDetails{}
out.ModelBaseDetails, err = self.SHostJointsBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SHostJointsBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/instance_snapshots.go
+2 -2
View File
@@ -139,10 +139,10 @@ func (self *SInstanceSnapshot) getMoreDetails(userCred mcclient.TokenCredential,
return out
}
func (self *SInstanceSnapshot) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.InstnaceSnapshotDetails, error) {
func (self *SInstanceSnapshot) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.InstnaceSnapshotDetails, error) {
var err error
out := api.InstnaceSnapshotDetails{}
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/isolated_devices.go
+2 -2
View File
@@ -604,10 +604,10 @@ func (self *SIsolatedDevice) getMoreDetails(out api.IsolateDeviceDetails) api.Is
return out
}
func (self *SIsolatedDevice) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.IsolateDeviceDetails, error) {
func (self *SIsolatedDevice) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.IsolateDeviceDetails, error) {
var err error
out := api.IsolateDeviceDetails{}
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/loadbalanceracls.go
+2 -2
View File
@@ -252,10 +252,10 @@ func (lbacl *SLoadbalancerAcl) PostCreate(ctx context.Context, userCred mcclient
lbacl.SetStatus(userCred, api.LB_STATUS_ENABLED, "")
}
func (lbacl *SLoadbalancerAcl) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.LoadbalancerAclDetails, error) {
func (lbacl *SLoadbalancerAcl) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.LoadbalancerAclDetails, error) {
var err error
out := api.LoadbalancerAclDetails{}
out.SharableVirtualResourceDetails, err = lbacl.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.SharableVirtualResourceDetails, err = lbacl.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
return out, err
}
pkg/compute/models/loadbalanceragents.go
+2 -2
View File
@@ -547,10 +547,10 @@ func (lbagent *SLoadbalancerAgent) ValidateUpdateData(ctx context.Context, userC
return data, nil
}
func (lbagent *SLoadbalancerAgent) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.LoadbalancerAgentDetails, error) {
func (lbagent *SLoadbalancerAgent) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.LoadbalancerAgentDetails, error) {
var err error
out := api.LoadbalancerAgentDetails{}
out.StandaloneResourceDetails, err = lbagent.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = lbagent.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/loadbalancerbackendgroups.go
+2 -2
View File
@@ -386,10 +386,10 @@ func (lbbg *SLoadbalancerBackendGroup) ValidatePurgeCondition(ctx context.Contex
return nil
}
func (lbbg *SLoadbalancerBackendGroup) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.LoadbalancerBackendGroupDetails, error) {
func (lbbg *SLoadbalancerBackendGroup) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.LoadbalancerBackendGroupDetails, error) {
var err error
out := api.LoadbalancerBackendGroupDetails{}
out.VirtualResourceDetails, err = lbbg.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = lbbg.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/loadbalancerbackends.go
+2 -2
View File
@@ -294,10 +294,10 @@ func (lbb *SLoadbalancerBackend) getVpc(ctx context.Context) (*SVpc, error) {
return vpc, nil
}
func (lbb *SLoadbalancerBackend) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.LoadbalancerBackendDetails, error) {
func (lbb *SLoadbalancerBackend) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.LoadbalancerBackendDetails, error) {
var err error
out := api.LoadbalancerBackendDetails{}
out.VirtualResourceDetails, err = lbb.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = lbb.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/loadbalancercachedacls.go
+2 -2
View File
@@ -202,10 +202,10 @@ func (lbacl *SCachedLoadbalancerAcl) GetListener() (*SLoadbalancerListener, erro
return listener.(*SLoadbalancerListener), nil
}
func (lbacl *SCachedLoadbalancerAcl) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.CachedLoadbalancerAclDetails, error) {
func (lbacl *SCachedLoadbalancerAcl) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.CachedLoadbalancerAclDetails, error) {
var err error
out := api.CachedLoadbalancerAclDetails{}
out.SharableVirtualResourceDetails, err = lbacl.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.SharableVirtualResourceDetails, err = lbacl.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/loadbalancercachedcertificates.go
+2 -2
View File
@@ -189,10 +189,10 @@ func (self *SCachedLoadbalancerCertificate) PostCreate(ctx context.Context, user
return
}
func (self *SCachedLoadbalancerCertificate) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.CachedLoadbalancerCertificateDetails, error) {
func (self *SCachedLoadbalancerCertificate) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.CachedLoadbalancerCertificateDetails, error) {
var err error
out := api.CachedLoadbalancerCertificateDetails{}
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/loadbalancercertificates.go
+2 -2
View File
@@ -122,10 +122,10 @@ func (lbcert *SLoadbalancerCertificate) PostCreate(ctx context.Context, userCred
lbcert.SetStatus(userCred, api.LB_STATUS_ENABLED, "")
}
func (lbcert *SLoadbalancerCertificate) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.LoadbalancerCertificateDetails, error) {
func (lbcert *SLoadbalancerCertificate) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.LoadbalancerCertificateDetails, error) {
var err error
out := api.LoadbalancerCertificateDetails{}
out.VirtualResourceDetails, err = lbcert.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = lbcert.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
return out, err
}
pkg/compute/models/loadbalancerclusters.go
+2 -2
View File
@@ -172,10 +172,10 @@ func (lbc *SLoadbalancerCluster) ValidateDeleteCondition(ctx context.Context) er
return lbc.SStandaloneResourceBase.ValidateDeleteCondition(ctx)
}
func (lbc *SLoadbalancerCluster) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.LoadbalancerCusterDetails, error) {
func (lbc *SLoadbalancerCluster) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.LoadbalancerCusterDetails, error) {
var err error
out := api.LoadbalancerCusterDetails{}
out.StandaloneResourceDetails, err = lbc.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = lbc.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/loadbalancerlistenerrules.go
+2 -2
View File
@@ -498,10 +498,10 @@ func (lbr *SLoadbalancerListenerRule) ValidateUpdateData(ctx context.Context, us
return region.GetDriver().ValidateUpdateLoadbalancerListenerRuleData(ctx, userCred, data, backendGroupV.Model)
}
func (lbr *SLoadbalancerListenerRule) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.LoadbalancerListenerRuleDetails, error) {
func (lbr *SLoadbalancerListenerRule) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.LoadbalancerListenerRuleDetails, error) {
var err error
out := api.LoadbalancerListenerRuleDetails{}
out.VirtualResourceDetails, err = lbr.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = lbr.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/loadbalancerlisteners.go
+2 -2
View File
@@ -405,10 +405,10 @@ func (lblis *SLoadbalancerListener) StartLoadBalancerListenerSyncTask(ctx contex
return nil
}
func (lblis *SLoadbalancerListener) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.LoadbalancerListenerDetails, error) {
func (lblis *SLoadbalancerListener) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.LoadbalancerListenerDetails, error) {
var err error
out := api.LoadbalancerListenerDetails{}
out.VirtualResourceDetails, err = lblis.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = lblis.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/loadbalancernetworks.go
+2 -2
View File
@@ -213,10 +213,10 @@ func (ln *SLoadbalancerNetwork) Detach(ctx context.Context, userCred mcclient.To
return db.DetachJoint(ctx, userCred, ln)
}
func (ln *SLoadbalancerNetwork) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.LoadbalancernetworkDetails, error) {
func (ln *SLoadbalancerNetwork) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.LoadbalancernetworkDetails, error) {
var err error
out := api.LoadbalancernetworkDetails{}
out.ModelBaseDetails, err = ln.SVirtualJointResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = ln.SVirtualJointResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/loadbalancers.go
+2 -2
View File
@@ -409,10 +409,10 @@ func (lb *SLoadbalancer) ValidateUpdateData(ctx context.Context, userCred mcclie
return lb.SVirtualResourceBase.ValidateUpdateData(ctx, userCred, query, data)
}
func (lb *SLoadbalancer) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.LoadbalancerDetails, error) {
func (lb *SLoadbalancer) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.LoadbalancerDetails, error) {
var err error
out := api.LoadbalancerDetails{}
out.VirtualResourceDetails, err = lb.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = lb.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/natdtable.go
+2 -2
View File
@@ -246,10 +246,10 @@ func (manager *SNatDEntryManager) newFromCloudNatDTable(ctx context.Context, use
return &table, nil
}
func (self *SNatDEntry) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.NatDEntryDetails, error) {
func (self *SNatDEntry) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.NatDEntryDetails, error) {
var err error
out := api.NatDEntryDetails{}
out.StandaloneResourceDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/natstable.go
+2 -2
View File
@@ -302,10 +302,10 @@ func (manager *SNatSEntryManager) checkNetWorkId(networkId string) (*SNetwork, e
return model.(*SNetwork), nil
}
func (self *SNatSEntry) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.NatSEntryDetails, error) {
func (self *SNatSEntry) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.NatSEntryDetails, error) {
var err error
out := api.NatSEntryDetails{}
out.StandaloneResourceDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/networks.go
+4 -4
View File
@@ -989,7 +989,7 @@ func (self *SNetwork) GetPorts() int {
return self.getIPRange().AddressCount()
}
func (self *SNetwork) getMoreDetails(ctx context.Context, out api.NetworkDetails, details bool) (api.NetworkDetails, error) {
func (self *SNetwork) getMoreDetails(ctx context.Context, out api.NetworkDetails, isList bool) (api.NetworkDetails, error) {
wire := self.GetWire()
if wire != nil {
out.Wire = wire.Name
@@ -1027,14 +1027,14 @@ func (self *SNetwork) getMoreDetails(ctx context.Context, out api.NetworkDetails
return out, nil
}
func (self *SNetwork) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.NetworkDetails, error) {
func (self *SNetwork) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.NetworkDetails, error) {
var err error
out := api.NetworkDetails{}
out.SharableVirtualResourceDetails, err = self.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.SharableVirtualResourceDetails, err = self.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
return self.getMoreDetails(ctx, out, details)
return self.getMoreDetails(ctx, out, isList)
}
func (self *SNetwork) AllowPerformReserveIp(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {
pkg/compute/models/networkschedtags.go
+2 -2
View File
@@ -70,10 +70,10 @@ func (s *SNetworkschedtag) Master() db.IStandaloneModel {
return s.SSchedtagJointsBase.master(s)
}
func (s *SNetworkschedtag) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.NetworkschedtagDetails, error) {
func (s *SNetworkschedtag) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.NetworkschedtagDetails, error) {
var err error
out := api.NetworkschedtagDetails{}
out.JoinModelBaseDetails, err = s.SSchedtagJointsBase.getExtraDetails(s, ctx, userCred, query, details)
out.JoinModelBaseDetails, err = s.SSchedtagJointsBase.getExtraDetails(s, ctx, userCred, query, isList)
out.Network, out.Schedtag = db.JointModelExtra(s)
return out, err
pkg/compute/models/reservedips.go
+2 -2
View File
@@ -189,10 +189,10 @@ func (self *SReservedip) Release(ctx context.Context, userCred mcclient.TokenCre
return err
}
func (self *SReservedip) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.ReservedipDetails, error) {
func (self *SReservedip) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.ReservedipDetails, error) {
var err error
out := api.ReservedipDetails{}
out.ModelBaseDetails, err = self.SResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/routetables.go
+2 -2
View File
@@ -328,10 +328,10 @@ func (rt *SRouteTable) PerformDelRoutes(ctx context.Context, userCred mcclient.T
return nil, nil
}
func (rt *SRouteTable) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.RouteTableDetails, error) {
func (rt *SRouteTable) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.RouteTableDetails, error) {
var err error
out := api.RouteTableDetails{}
out.VirtualResourceDetails, err = rt.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = rt.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/schedpolicies.go
+2 -2
View File
@@ -146,10 +146,10 @@ func (self *SSchedpolicy) getMoreColumns(out api.SchedpolicyDetails) api.Schedpo
return out
}
func (self *SSchedpolicy) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.SchedpolicyDetails, error) {
func (self *SSchedpolicy) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.SchedpolicyDetails, error) {
var err error
out := api.SchedpolicyDetails{}
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/schedtagjoint.go
+2 -2
View File
@@ -147,10 +147,10 @@ func (joint *SSchedtagJointsBase) Slave() db.IStandaloneModel {
return db.JointSlave(joint)
}
func (joint *SSchedtagJointsBase) getExtraDetails(obj db.IJointModel, ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (apis.JoinModelBaseDetails, error) {
func (joint *SSchedtagJointsBase) getExtraDetails(obj db.IJointModel, ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (apis.JoinModelBaseDetails, error) {
var err error
out := apis.JoinModelBaseDetails{}
out.ModelBaseDetails, err = joint.SJointResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = joint.SJointResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/schedtags.go
+2 -2
View File
@@ -334,10 +334,10 @@ func (self *SSchedtag) getMoreColumns(out api.SchedtagDetails) api.SchedtagDetai
return out
}
func (self *SSchedtag) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.SchedtagDetails, error) {
func (self *SSchedtag) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.SchedtagDetails, error) {
var err error
out := api.SchedtagDetails{}
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/skus.go
+2 -2
View File
@@ -255,10 +255,10 @@ func (self *SServerSku) AllowGetDetails(ctx context.Context, userCred mcclient.T
return true
}
func (self *SServerSku) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.ServerSkuDetails, error) {
func (self *SServerSku) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.ServerSkuDetails, error) {
var err error
out := api.ServerSkuDetails{}
out.StandaloneResourceDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/snapshotpolicy.go
+2 -2
View File
@@ -314,10 +314,10 @@ func (sp *SSnapshotPolicy) StartSnapshotPolicyDeleteTask(ctx context.Context, us
}
func (sp *SSnapshotPolicy) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject, details bool) (api.SnapshotPolicyDetails, error) {
query jsonutils.JSONObject, isList bool) (api.SnapshotPolicyDetails, error) {
var err error
out := api.SnapshotPolicyDetails{}
out.VirtualResourceDetails, err = sp.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = sp.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/snapshotpolicydisks.go
+3 -3
View File
@@ -95,16 +95,16 @@ func (sd *SSnapshotPolicyDisk) SetStatus(userCred mcclient.TokenCredential, stat
return nil
}
func (self *SSnapshotPolicyDisk) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (compute.SnapshotPolicyDiskDetails, error) {
func (self *SSnapshotPolicyDisk) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (compute.SnapshotPolicyDiskDetails, error) {
var err error
out := compute.SnapshotPolicyDiskDetails{}
out.ModelBaseDetails, err = self.SVirtualJointResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SVirtualJointResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
_, out.Snapshotpolicy = db.JointModelExtra(self)
disk := DiskManager.FetchDiskById(self.DiskId)
out.Disk, err = disk.GetExtraDetails(ctx, userCred, query, details)
out.Disk, err = disk.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, nil
}
pkg/compute/models/snapshots.go
+2 -2
View File
@@ -142,10 +142,10 @@ func (manager *SSnapshotManager) ListItemFilter(ctx context.Context, q *sqlchemy
return q, nil
}
func (self *SSnapshot) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.SnapshotDetails, error) {
func (self *SSnapshot) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.SnapshotDetails, error) {
var err error
out := api.SnapshotDetails{}
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.VirtualResourceDetails, err = self.SVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/storagecachedimages.go
+2 -2
View File
@@ -145,10 +145,10 @@ func (self *SStoragecachedimage) GetHost() (*SHost, error) {
return sc.GetHost()
}
func (self *SStoragecachedimage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.StoragecachedimageDetails, error) {
func (self *SStoragecachedimage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.StoragecachedimageDetails, error) {
var err error
out := api.StoragecachedimageDetails{}
out.ModelBaseDetails, err = self.SJointResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SJointResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/storagecaches.go
+2 -2
View File
@@ -254,10 +254,10 @@ func (self *SStoragecache) syncWithCloudStoragecache(ctx context.Context, userCr
return nil
}
func (self *SStoragecache) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.StoragecacheDetails, error) {
func (self *SStoragecache) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.StoragecacheDetails, error) {
var err error
out := api.StoragecacheDetails{}
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/storages.go
+2 -2
View File
@@ -415,10 +415,10 @@ func (self *SStorage) getMoreDetails(ctx context.Context, out api.StorageDetails
return out
}
func (self *SStorage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.StorageDetails, error) {
func (self *SStorage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.StorageDetails, error) {
var err error
out := api.StorageDetails{}
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/storageschedtags.go
+2 -2
View File
@@ -70,10 +70,10 @@ func (joint *SStorageschedtag) Master() db.IStandaloneModel {
return joint.SSchedtagJointsBase.master(joint)
}
func (joint *SStorageschedtag) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.StorageschedtagDetails, error) {
func (joint *SStorageschedtag) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.StorageschedtagDetails, error) {
var err error
out := api.StorageschedtagDetails{}
out.JoinModelBaseDetails, err = joint.SSchedtagJointsBase.getExtraDetails(joint, ctx, userCred, query, details)
out.JoinModelBaseDetails, err = joint.SSchedtagJointsBase.getExtraDetails(joint, ctx, userCred, query, isList)
out.Storage, out.Schedtag = db.JointModelExtra(joint)
return out, err
}
pkg/compute/models/vpcs.go
+2 -2
View File
@@ -285,10 +285,10 @@ func (self *SVpc) getZoneByExternalId(externalId string) (*SZone, error) {
return nil, fmt.Errorf("found %d duplicate zones by externalId %s in cloudregion %s(%s)", len(zones), externalId, region.Name, region.Id)
}
func (self *SVpc) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.VpcDetails, error) {
func (self *SVpc) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.VpcDetails, error) {
var err error
out := api.VpcDetails{}
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/compute/models/zones.go
+2 -2
View File
@@ -202,10 +202,10 @@ func zoneExtra(zone *SZone, out api.ZoneDetails) api.ZoneDetails {
return out
}
func (zone *SZone) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.ZoneDetails, error) {
func (zone *SZone) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.ZoneDetails, error) {
var err error
out := api.ZoneDetails{}
out.StandaloneResourceDetails, err = zone.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = zone.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/image/models/image_guest.go
+3 -3
View File
@@ -330,15 +330,15 @@ func (self *SGuestImage) getMoreDetails(ctx context.Context, userCred mcclient.T
}
func (self *SGuestImage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject, details bool) (api.GuestImageDetails, error) {
query jsonutils.JSONObject, isList bool) (api.GuestImageDetails, error) {
var err error
out := api.GuestImageDetails{}
out.SharableVirtualResourceDetails, err = self.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.SharableVirtualResourceDetails, err = self.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
if details && query.Contains("image_ids") {
if !isList && query.Contains("image_ids") {
out.ImageIds, _ = query.Get("image_ids")
}
pkg/image/models/images.go
+2 -2
View File
@@ -262,10 +262,10 @@ func (self *SImage) getMoreDetails(ctx context.Context, userCred mcclient.TokenC
return out
}
func (self *SImage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.ImageDetails, error) {
func (self *SImage) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.ImageDetails, error) {
var err error
out := api.ImageDetails{}
out.SharableVirtualResourceDetails, err = self.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.SharableVirtualResourceDetails, err = self.SSharableVirtualResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/credentials.go
+2 -2
View File
@@ -166,10 +166,10 @@ func (self *SCredential) ValidateUpdateData(ctx context.Context, userCred mcclie
return self.SStandaloneResourceBase.ValidateUpdateData(ctx, userCred, query, data)
}
func (self *SCredential) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.CredentialDetails, error) {
func (self *SCredential) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.CredentialDetails, error) {
var err error
out := api.CredentialDetails{}
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/domains.go
+2 -2
View File
@@ -268,10 +268,10 @@ func (domain *SDomain) ValidateUpdateData(ctx context.Context, userCred mcclient
return domain.SStandaloneResourceBase.ValidateUpdateData(ctx, userCred, query, data)
}
func (domain *SDomain) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.DomainDetails, error) {
func (domain *SDomain) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.DomainDetails, error) {
var err error
out := api.DomainDetails{}
out.StandaloneResourceDetails, err = domain.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = domain.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/endpoints.go
+2 -2
View File
@@ -283,10 +283,10 @@ func (endpoint *SEndpoint) ValidateDeleteCondition(ctx context.Context) error {
return endpoint.SStandaloneResourceBase.ValidateDeleteCondition(ctx)
}
func (endpoint *SEndpoint) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.EndpointDetails, error) {
func (endpoint *SEndpoint) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.EndpointDetails, error) {
var err error
out := api.EndpointDetails{}
out.StandaloneResourceDetails, err = endpoint.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = endpoint.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/groups.go
+2 -2
View File
@@ -144,10 +144,10 @@ func (group *SGroup) Delete(ctx context.Context, userCred mcclient.TokenCredenti
return group.SIdentityBaseResource.Delete(ctx, userCred)
}
func (group *SGroup) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.GroupDetails, error) {
func (group *SGroup) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.GroupDetails, error) {
var err error
out := api.GroupDetails{}
out.StandaloneResourceDetails, err = group.SIdentityBaseResource.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = group.SIdentityBaseResource.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/identity_provider.go
+2 -2
View File
@@ -398,10 +398,10 @@ func (self *SIdentityProvider) PerformSync(ctx context.Context, userCred mcclien
return nil, nil
}
func (self *SIdentityProvider) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.IdentityProviderDetails, error) {
func (self *SIdentityProvider) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.IdentityProviderDetails, error) {
var err error
out := api.IdentityProviderDetails{}
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = self.SEnabledStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/policies.go
+2 -2
View File
@@ -222,10 +222,10 @@ func (manager *SPolicyManager) ListItemFilter(ctx context.Context, q *sqlchemy.S
return q, nil
}
func (policy *SPolicy) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.PolicyDetails, error) {
func (policy *SPolicy) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.PolicyDetails, error) {
var err error
out := api.PolicyDetails{}
out.StandaloneResourceDetails, err = policy.SEnabledIdentityBaseResource.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = policy.SEnabledIdentityBaseResource.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/projects.go
+2 -2
View File
@@ -289,10 +289,10 @@ func (proj *SProject) ValidateUpdateData(ctx context.Context, userCred mcclient.
return proj.SIdentityBaseResource.ValidateUpdateData(ctx, userCred, query, data)
}
func (proj *SProject) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.ProjectDetails, error) {
func (proj *SProject) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.ProjectDetails, error) {
var err error
out := api.ProjectDetails{}
out.StandaloneResourceDetails, err = proj.SIdentityBaseResource.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = proj.SIdentityBaseResource.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/regions.go
+2 -2
View File
@@ -99,10 +99,10 @@ func (region *SRegion) ValidateDeleteCondition(ctx context.Context) error {
return region.SStandaloneResourceBase.ValidateDeleteCondition(ctx)
}
func (region *SRegion) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.RegionDetails, error) {
func (region *SRegion) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.RegionDetails, error) {
var err error
out := api.RegionDetails{}
out.StandaloneResourceDetails, err = region.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = region.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/roles.go
+2 -2
View File
@@ -195,10 +195,10 @@ func (role *SRole) ValidateDeleteCondition(ctx context.Context) error {
return role.SIdentityBaseResource.ValidateDeleteCondition(ctx)
}
func (role *SRole) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.RoleDetails, error) {
func (role *SRole) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.RoleDetails, error) {
var err error
out := api.RoleDetails{}
out.StandaloneResourceDetails, err = role.SIdentityBaseResource.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = role.SIdentityBaseResource.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/services.go
+2 -2
View File
@@ -108,10 +108,10 @@ func (service *SService) ValidateDeleteCondition(ctx context.Context) error {
return service.SStandaloneResourceBase.ValidateDeleteCondition(ctx)
}
func (service *SService) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.ServiceDetails, error) {
func (service *SService) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.ServiceDetails, error) {
var err error
out := api.ServiceDetails{}
out.StandaloneResourceDetails, err = service.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = service.SStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/keystone/models/users.go
+2 -2
View File
@@ -478,10 +478,10 @@ func (user *SUser) GetCredentialCount() (int, error) {
return q.CountWithError()
}
func (user *SUser) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.UserDetails, error) {
func (user *SUser) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.UserDetails, error) {
var err error
out := api.UserDetails{}
out.StandaloneResourceDetails, err = user.SEnabledIdentityBaseResource.GetExtraDetails(ctx, userCred, query, details)
out.StandaloneResourceDetails, err = user.SEnabledIdentityBaseResource.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/notify/models/mod_contact.go
+2 -2
View File
@@ -210,10 +210,10 @@ func (self *SContact) getMoreDetail(ctx context.Context, userCred mcclient.Token
}
func (self *SContact) GetExtraDetail(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject, details bool) (api.ContactDetails, error) {
query jsonutils.JSONObject, isList bool) (api.ContactDetails, error) {
var err error
out := api.ContactDetails{}
out.ModelBaseDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}
pkg/notify/models/mod_notification.go
+2 -2
View File
@@ -104,10 +104,10 @@ type UserDetail struct {
ReceivedAt time.Time
}
func (self *SNotification) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, details bool) (api.NotificationDetails, error) {
func (self *SNotification) GetExtraDetails(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, isList bool) (api.NotificationDetails, error) {
var err error
out := api.NotificationDetails{}
out.ModelBaseDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, details)
out.ModelBaseDetails, err = self.SStatusStandaloneResourceBase.GetExtraDetails(ctx, userCred, query, isList)
if err != nil {
return out, err
}