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

Automatic merge from release/2.2.0 -> release/2.3.0

Browse Source 
* commit 'c353ad31339bebd26d4270e1886ce374dc3bbd5b':
  Azure 计费依赖操作系统类型
This commit is contained in:
邱剑
2018-10-18 17:58:26 +08:00
parent 4b67ba65ec c353ad3133
commit eeb1969349
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+4
View File
@@ -3800,6 +3800,10 @@ func (self *SGuest) GetShortDesc() *jsonutils.JSONDict {
desc.Set("int_bandwidth", jsonutils.NewInt(int64(intBw)))
}
if len(self.OsType) > 0 {
desc.Add(jsonutils.NewString(self.OsType), "os_type")
}
if priceKey := self.GetMetadata("price_key", nil); len(priceKey) > 0 {
desc.Add(jsonutils.NewString(priceKey), "price_key")
}