From 73f952a5b40b30cd115428fbbca667e29305a6c3 Mon Sep 17 00:00:00 2001
From: Qu Xuan <quxuan@yunionyun.com>
Date: Tue, 6 Apr 2021 15:01:45 +0800
Subject: [PATCH] fix: private cloud sku attached disk count

---
 pkg/compute/models/skus.go            | 1 +
 pkg/multicloud/apsara/instancetype.go | 2 +-
 pkg/multicloud/openstack/flavor.go    | 6 +++---
 pkg/multicloud/zstack/offering.go     | 8 ++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkg/compute/models/skus.go b/pkg/compute/models/skus.go
index 981b0b2715..17cf0b8222 100644
--- a/pkg/compute/models/skus.go
+++ b/pkg/compute/models/skus.go
@@ -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()
 
diff --git a/pkg/multicloud/apsara/instancetype.go b/pkg/multicloud/apsara/instancetype.go
index 686a13fa9f..cc980f329c 100644
--- a/pkg/multicloud/apsara/instancetype.go
+++ b/pkg/multicloud/apsara/instancetype.go
@@ -153,7 +153,7 @@ func (self *SInstanceType) GetAttachedDiskSizeGB() int {
 }
 
 func (self *SInstanceType) GetAttachedDiskCount() int {
-	return 6
+	return 0
 }
 
 func (self *SInstanceType) GetDataDiskTypes() string {
diff --git a/pkg/multicloud/openstack/flavor.go b/pkg/multicloud/openstack/flavor.go
index 9d583c1951..b1c275c77a 100644
--- a/pkg/multicloud/openstack/flavor.go
+++ b/pkg/multicloud/openstack/flavor.go
@@ -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 {
diff --git a/pkg/multicloud/zstack/offering.go b/pkg/multicloud/zstack/offering.go
index 9237a48689..2d6339d548 100644
--- a/pkg/multicloud/zstack/offering.go
+++ b/pkg/multicloud/zstack/offering.go
@@ -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 {