From 7a4f3fca6eaff6e8d878c1607b39fac9fd465c23 Mon Sep 17 00:00:00 2001
From: Zexi Li <zexi.li@qq.com>
Date: Fri, 13 Dec 2019 16:00:59 +0800
Subject: [PATCH] region: fix schedule input project and domain missing

---
 pkg/apis/compute/api.go           | 8 ++------
 pkg/cloudcommon/cmdline/helper.go | 6 ++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/apis/compute/api.go b/pkg/apis/compute/api.go
index c06f4cf086..2f4045e258 100644
--- a/pkg/apis/compute/api.go
+++ b/pkg/apis/compute/api.go
@@ -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"`
diff --git a/pkg/cloudcommon/cmdline/helper.go b/pkg/cloudcommon/cmdline/helper.go
index 666ed74cda..25e0676622 100644
--- a/pkg/cloudcommon/cmdline/helper.go
+++ b/pkg/cloudcommon/cmdline/helper.go
@@ -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
 }