Skip to content

Commit 1d88598

Browse files
ioitoioito
committed
fix(yunionconf): add predefine tags
1 parent c900efe commit 1d88598

36 files changed

+337
-81
lines changed

‎cmd/climc/shell/compute/baremetalnetworks.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,11 @@ func init() {
3232
R(&HostNetworkListOptions{}, "host-network-list", "List baremetal network pairs", func(s *mcclient.ClientSession, args *HostNetworkListOptions) error {
3333
var params *jsonutils.JSONDict
3434
{
35-
var err error
36-
params, err = args.BaseListOptions.Params()
35+
param, err := args.BaseListOptions.Params()
3736
if err != nil {
3837
return err
39-
4038
}
39+
params = param.(*jsonutils.JSONDict)
4140
}
4241
if len(args.Network) > 0 {
4342
params.Add(jsonutils.NewString(args.Network), "network_id")

‎cmd/climc/shell/compute/baremetalstorages.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ func init() {
3131
R(&BaremetalStorageListOptions{}, "baremetal-storage-list", "List baremetal storage pairs", func(s *mcclient.ClientSession, args *BaremetalStorageListOptions) error {
3232
var params *jsonutils.JSONDict
3333
{
34-
var err error
35-
params, err = args.BaseListOptions.Params()
34+
param, err := args.BaseListOptions.Params()
3635
if err != nil {
3736
return err
38-
3937
}
38+
params = param.(*jsonutils.JSONDict)
4039
}
4140
var result *printutils.ListResult
4241
var err error

‎cmd/climc/shell/compute/cloudprovider_quota.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ func init() {
3131
}
3232

3333
R(&CloudproviderQuotaListOptions{}, "cloud-provider-quota-list", "List cloudprovider quota", func(s *mcclient.ClientSession, args *CloudproviderQuotaListOptions) error {
34-
params, err := args.Params()
34+
param, err := args.Params()
3535
if err != nil {
3636
return err
3737
}
38+
params := param.(*jsonutils.JSONDict)
3839

3940
if len(args.QuotaType) > 0 {
4041
params.Add(jsonutils.NewString(args.QuotaType), "quota_type")

‎cmd/climc/shell/compute/cloudproviderregions.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@ func init() {
3333
R(&CloudproviderRegionListOptions{}, "cloud-provider-region-list", "List cloudprovider region synchronization status", func(s *mcclient.ClientSession, args *CloudproviderRegionListOptions) error {
3434
var params *jsonutils.JSONDict
3535
{
36-
var err error
37-
params, err = args.BaseListOptions.Params()
36+
param, err := args.BaseListOptions.Params()
3837
if err != nil {
3938
return err
40-
4139
}
40+
params = param.(*jsonutils.JSONDict)
4241
}
4342
var result *printutils.ListResult
4443
var err error

‎cmd/climc/shell/compute/dynamicschedtags.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ func init() {
2929
R(&DynamicschedtagListOptions{}, "dynamic-schedtag-list", "List dynamic schedtag conditions", func(s *mcclient.ClientSession, args *DynamicschedtagListOptions) error {
3030
var params *jsonutils.JSONDict
3131
{
32-
var err error
33-
params, err = args.BaseListOptions.Params()
32+
param, err := args.BaseListOptions.Params()
3433
if err != nil {
3534
return err
3635
}
36+
params = param.(*jsonutils.JSONDict)
3737
}
3838
results, err := modules.Dynamicschedtags.List(s, params)
3939
if err != nil {

‎cmd/climc/shell/compute/hostcachedimages.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,11 @@ func init() {
3232
R(&HostCachedImageListOptions{}, "host-cachedimage-list", "List host cached image pairs", func(s *mcclient.ClientSession, args *HostCachedImageListOptions) error {
3333
var params *jsonutils.JSONDict
3434
{
35-
var err error
36-
params, err = args.BaseListOptions.Params()
35+
param, err := args.BaseListOptions.Params()
3736
if err != nil {
3837
return err
39-
4038
}
39+
params = param.(*jsonutils.JSONDict)
4140
}
4241
var result *printutils.ListResult
4342
var err error

‎cmd/climc/shell/compute/hoststorages.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,11 @@ func init() {
3232
R(&HostStorageListOptions{}, "host-storage-list", "List host storage pairs", func(s *mcclient.ClientSession, args *HostStorageListOptions) error {
3333
var params *jsonutils.JSONDict
3434
{
35-
var err error
36-
params, err = args.BaseListOptions.Params()
35+
param, err := args.BaseListOptions.Params()
3736
if err != nil {
3837
return err
39-
4038
}
39+
params = param.(*jsonutils.JSONDict)
4140
}
4241
var result *printutils.ListResult
4342
var err error

‎cmd/climc/shell/compute/isolated_device_models.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,11 @@ func init() {
4343
"List host Isolated device model pairs", func(s *mcclient.ClientSession, args *HostIsolatedDeviceModelListOptions) error {
4444
var params *jsonutils.JSONDict
4545
{
46-
var err error
47-
params, err = args.BaseListOptions.Params()
46+
param, err := args.BaseListOptions.Params()
4847
if err != nil {
4948
return err
50-
5149
}
50+
params = param.(*jsonutils.JSONDict)
5251
}
5352
var result *printutils.ListResult
5453
var err error

‎cmd/climc/shell/compute/isolatedevices.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ func init() {
3535
R(&DeviceListOptions{}, "isolated-device-list", "List isolated devices like GPU", func(s *mcclient.ClientSession, args *DeviceListOptions) error {
3636
var params *jsonutils.JSONDict
3737
{
38-
var err error
39-
params, err = args.BaseListOptions.Params()
38+
param, err := args.BaseListOptions.Params()
4039
if err != nil {
4140
return err
42-
4341
}
42+
params = param.(*jsonutils.JSONDict)
4443
}
4544
if len(args.Host) > 0 {
4645
params.Add(jsonutils.NewString(args.Host), "host")

‎cmd/climc/shell/compute/loadbalancernetworks.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@ func init() {
3333
R(&LoadbalancerNetworkListOptions{}, "lbnetwork-list", "List loadbalancer network pairs", func(s *mcclient.ClientSession, args *LoadbalancerNetworkListOptions) error {
3434
var params *jsonutils.JSONDict
3535
{
36-
var err error
37-
params, err = args.BaseListOptions.Params()
36+
param, err := args.BaseListOptions.Params()
3837
if err != nil {
3938
return err
40-
4139
}
40+
params = param.(*jsonutils.JSONDict)
4241
}
4342
if len(args.Ip) > 0 {
4443
params.Add(jsonutils.NewString(args.Ip), "ip_addr")

0 commit comments

Comments
 (0)