From 01b7c11aba403dc92bd428ff5a770400d046c88f Mon Sep 17 00:00:00 2001
From: TangBin <tangbin@yunionyun.com>
Date: Sat, 23 Feb 2019 17:59:32 +0800
Subject: [PATCH 1/2] order fix

---
 pkg/util/huawei/client/client.go             | 2 +-
 pkg/util/huawei/client/modules/mod_orders.go | 5 +++--
 pkg/util/huawei/instance.go                  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/util/huawei/client/client.go b/pkg/util/huawei/client/client.go
index deca1c11c8..8079d270b1 100644
--- a/pkg/util/huawei/client/client.go
+++ b/pkg/util/huawei/client/client.go
@@ -92,7 +92,7 @@ func (self *Client) initManagers() {
 		self.Disks = modules.NewDiskManager(self.regionId, self.projectId, self.signer, self.debug)
 		self.Domains = modules.NewDomainManager(self.signer, self.debug)
 		self.Keypairs = modules.NewKeypairManager(self.regionId, self.projectId, self.signer, self.debug)
-		self.Orders = modules.NewOrderManager(self.regionId, self.signer, self.debug)
+		self.Orders = modules.NewOrderManager(self.signer, self.debug)
 		self.SecurityGroupRules = modules.NewSecgroupRuleManager(self.regionId, self.projectId, self.signer, self.debug)
 		self.SecurityGroups = modules.NewSecurityGroupManager(self.regionId, self.projectId, self.signer, self.debug)
 		self.NovaSecurityGroups = modules.NewNovaSecurityGroupManager(self.regionId, self.projectId, self.signer, self.debug)
diff --git a/pkg/util/huawei/client/modules/mod_orders.go b/pkg/util/huawei/client/modules/mod_orders.go
index a6c563d2c2..f07f69492a 100644
--- a/pkg/util/huawei/client/modules/mod_orders.go
+++ b/pkg/util/huawei/client/modules/mod_orders.go
@@ -26,12 +26,13 @@ func (self *orderCtx) GetPath() string {
 	return fmt.Sprintf("%s/common", self.domainId)
 }
 
+// 客户运营能力API的Endpoint为“bss.cn-north-1.myhuaweicloud.com”。该Endpoint为全局Endpoint，中国站所有区域均可使用。
 // https://support.huaweicloud.com/api-oce/zh-cn_topic_0084961226.html
-func NewOrderManager(regionId string, signer auth.Signer, debug bool) *SOrderManager {
+func NewOrderManager(signer auth.Signer, debug bool) *SOrderManager {
 	return &SOrderManager{SResourceManager: SResourceManager{
 		SBaseManager:  NewBaseManager(signer, debug),
 		ServiceName:   ServiceNameBSS,
-		Region:        regionId,
+		Region:        "cn-north-1",
 		ProjectId:     "",
 		version:       "v1.0",
 		Keyword:       "",
diff --git a/pkg/util/huawei/instance.go b/pkg/util/huawei/instance.go
index 685b5ec456..dc89a2788b 100644
--- a/pkg/util/huawei/instance.go
+++ b/pkg/util/huawei/instance.go
@@ -757,7 +757,7 @@ func (self *SRegion) CreateInstance(name string, imageId string, instanceType st
 		err = cloudprovider.WaitCreated(10*time.Second, 180*time.Second, func() bool {
 			order, e := self.GetOrder(_id)
 			if e != nil {
-				log.Debugf(err.Error())
+				log.Debugf(e.Error())
 				return false
 			}
 

From 129d568e59ee1afdb5158d9e9a315239f4f059d3 Mon Sep 17 00:00:00 2001
From: TangBin <tangbin@yunionyun.com>
Date: Sat, 23 Feb 2019 18:11:13 +0800
Subject: [PATCH 2/2] rename min disk

---
 pkg/util/huawei/image.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/util/huawei/image.go b/pkg/util/huawei/image.go
index 0c1b725bec..10152ddd58 100644
--- a/pkg/util/huawei/image.go
+++ b/pkg/util/huawei/image.go
@@ -37,7 +37,7 @@ type SImage struct {
 	storageCache *SStoragecache
 
 	Schema             string    `json:"schema"`
-	MinDisk            int64     `json:"min_disk"`
+	MinDiskGB          int64     `json:"min_disk"`
 	CreatedAt          time.Time `json:"created_at"`
 	ImageSourceType    string    `json:"__image_source_type"`
 	ContainerFormat    string    `json:"container_format"`
@@ -150,7 +150,7 @@ func (self *SImage) GetOsArch() string {
 }
 
 func (self *SImage) GetMinOsDiskSizeGb() int {
-	return int(self.MinDisk)
+	return int(self.MinDiskGB)
 }
 
 func (self *SImage) GetImageFormat() string {