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 #1109 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-order-bugfix to release/2.6.0

Browse Source 
* commit '129d568e59ee1afdb5158d9e9a315239f4f059d3':
  rename min disk
  order fix
This commit is contained in:
邱剑
2019-02-23 18:13:21 +08:00
parent ab61d33cf0 129d568e59
commit 93485e0ea8
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/huawei/client/client.go
+1 -1
View File
@@ -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)
pkg/util/huawei/client/modules/mod_orders.go
+3 -2
View File
@@ -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: "",
pkg/util/huawei/image.go
+2 -2
View File
@@ -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 {
pkg/util/huawei/instance.go
+1 -1
View File
@@ -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
}