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 #4146 from zexi/bugfix/schedule-input-project-domain-missing

Browse Source 
region: fix schedule input project and domain missing
This commit is contained in:
yunion-ci-robot
2019-12-13 17:32:59 +08:00
committed by GitHub
parent 432bcaaf1b 7a4f3fca6e
commit 59ad1765b5
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/api.go
+2 -6
View File
@@ -121,10 +121,8 @@ type ServerConfigs struct {
// ResourceType "shared|prepaid|dedicated"`
ResourceType string `json:"resource_type"`
InstanceType string `json:"instance_type"`
// Project string `json:"project_id"`
// Domain string `json:"domain_id"`
Backup bool `json:"backup"`
Count int `json:"count"`
Backup bool `json:"backup"`
Count int `json:"count"`
Disks []*DiskConfig `json:"disks"`
Networks []*NetworkConfig `json:"nets"`
@@ -161,8 +159,6 @@ type ServerCreateInput struct {
*ServerConfigs
// Name string `json:"name"`
// GenerateName string `json:"generate_name"`
VmemSize int `json:"vmem_size"`
VcpuCount int `json:"vcpu_count"`
UserData string `json:"user_data"`
pkg/cloudcommon/cmdline/helper.go
+6
View File
@@ -337,6 +337,12 @@ func FetchScheduleInputByJSON(obj jsonutils.JSONObject) (*scheduler.ScheduleInpu
if err != nil {
return nil, err
}
if input.Domain == "" {
input.Domain = jsonutils.GetAnyString(obj, []string{"project_domain", "domain_id"})
}
if input.Project == "" {
input.Project = jsonutils.GetAnyString(obj, []string{"project", "project_id"})
}
return input, nil
}