opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-04 23:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8483 from swordqiu/hotfix/qj-vpc-create-climc-no-region

Browse Source 
fix: climc vpc-create missing cloudregion_id
This commit is contained in:
yunion-ci-robot
2020-10-25 10:53:38 +08:00
committed by GitHub
parent ec6f90ac4c 588fff60fc
commit deb720d793
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/options/vpc.go
+6 -5
View File
@@ -39,18 +39,19 @@ func (opts *VpcListOptions) Params() (jsonutils.JSONObject, error) {
}
type VpcCreateOptions struct {
REGION string `help:"ID or name of the region where the VPC is created"`
REGION string `help:"ID or name of the region where the VPC is created" json:"cloudregion_id"`
Id string `help:"ID of the new VPC"`
NAME string `help:"Name of the VPC"`
NAME string `help:"Name of the VPC" json:"name"`
CIDR string `help:"CIDR block"`
Default bool `help:"default VPC for the region" default:"false"`
Desc string `help:"Description of the VPC"`
Manager string `help:"ID or Name of Cloud provider"`
ExternalAccessMode string `help:"Filter by external access mode" choices:"distgw|eip|eip-distgw" default:"eip-distgw"`
Manager string `help:"ID or Name of Cloud provider" json:"manager_id"`
ExternalAccessMode string `help:"Filter by external access mode" choices:"distgw|eip|eip-distgw" default:""`
}
func (opts *VpcCreateOptions) Params() (jsonutils.JSONObject, error) {
params := jsonutils.NewDict()
params.Add(jsonutils.NewString(opts.REGION), "cloudregion_id")
params.Add(jsonutils.NewString(opts.NAME), "name")
params.Add(jsonutils.NewString(opts.CIDR), "cidr_block")
if len(opts.Id) > 0 {
@@ -66,7 +67,7 @@ func (opts *VpcCreateOptions) Params() (jsonutils.JSONObject, error) {
params.Add(jsonutils.JSONTrue, "is_default")
}
if len(opts.Manager) > 0 {
params.Add(jsonutils.NewString(opts.Manager), "manager")
params.Add(jsonutils.NewString(opts.Manager), "manager_id")
}
return params, nil
}