fix: private cloud sku attached disk count

This commit is contained in:
Qu Xuan
2021-04-06 15:01:45 +08:00
parent e4a47a1e61
commit 73f952a5b4
4 changed files with 9 additions and 8 deletions
+1
View File
@@ -1093,6 +1093,7 @@ func (self *SServerSku) SyncWithPrivateCloudSku(ctx context.Context, userCred mc
}
func (self *SServerSku) constructSku(extSku cloudprovider.ICloudSku) {
self.ExternalId = extSku.GetGlobalId()
self.InstanceTypeFamily = extSku.GetInstanceTypeFamily()
self.InstanceTypeCategory = extSku.GetInstanceTypeCategory()
+1 -1
View File
@@ -153,7 +153,7 @@ func (self *SInstanceType) GetAttachedDiskSizeGB() int {
}
func (self *SInstanceType) GetAttachedDiskCount() int {
return 6
return 0
}
func (self *SInstanceType) GetDataDiskTypes() string {
+3 -3
View File
@@ -192,11 +192,11 @@ func (flavor *SFlavor) GetGlobalId() string {
}
func (flavor *SFlavor) GetInstanceTypeFamily() string {
return flavor.GetName()
return api.InstanceFamilies[api.SkuCategoryGeneralPurpose]
}
func (flavor *SFlavor) GetInstanceTypeCategory() string {
return flavor.GetName()
return api.SkuCategoryGeneralPurpose
}
func (flavor *SFlavor) GetPrepaidStatus() string {
@@ -244,7 +244,7 @@ func (flavor *SFlavor) GetAttachedDiskSizeGB() int {
}
func (flavor *SFlavor) GetAttachedDiskCount() int {
return 6
return 0
}
func (flavor *SFlavor) GetDataDiskTypes() string {
+4 -4
View File
@@ -154,11 +154,11 @@ func (region *SRegion) DeleteOffering(offeringId string) error {
}
func (offering *SInstanceOffering) GetInstanceTypeFamily() string {
return offering.AllocatorStrategy
return api.InstanceFamilies[api.SkuCategoryGeneralPurpose]
}
func (offering *SInstanceOffering) GetInstanceTypeCategory() string {
return offering.AllocatorStrategy
return api.SkuCategoryGeneralPurpose
}
func (offering *SInstanceOffering) GetPrepaidStatus() string {
@@ -206,7 +206,7 @@ func (offering *SInstanceOffering) GetAttachedDiskSizeGB() int {
}
func (offering *SInstanceOffering) GetAttachedDiskCount() int {
return 6
return 0
}
func (offering *SInstanceOffering) GetDataDiskTypes() string {
@@ -214,7 +214,7 @@ func (offering *SInstanceOffering) GetDataDiskTypes() string {
}
func (offering *SInstanceOffering) GetDataDiskMaxCount() int {
return 6
return 0
}
func (offering *SInstanceOffering) GetNicType() string {