From d8ced4352ef33f82284ecb834327a6c49bec046a Mon Sep 17 00:00:00 2001
From: TangBin <tangbin@yunionyun.com>
Date: Tue, 16 Apr 2019 10:35:35 +0800
Subject: [PATCH 1/2] instance spec query add cache

---
 pkg/compute/models/skus.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkg/compute/models/skus.go b/pkg/compute/models/skus.go
index 3b17d1f094..2286fed99f 100644
--- a/pkg/compute/models/skus.go
+++ b/pkg/compute/models/skus.go
@@ -486,6 +486,12 @@ func providerFilter(q *sqlchemy.SQuery, provider string, public_cloud bool) *sql
 }
 
 func (self *SServerSkuManager) GetPropertyInstanceSpecs(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {
+	specsKey := "InstanceSpecs"
+	v := Cache.Get(specsKey)
+	if v != nil {
+		return v.(*jsonutils.JSONDict), nil
+	}
+
 	q := self.Query()
 	// 未明确指定provider或者public_cloud时，默认查询私有云
 	provider, _ := query.GetString("provider")
@@ -562,6 +568,8 @@ func (self *SServerSkuManager) GetPropertyInstanceSpecs(ctx context.Context, use
 
 	r_obj := jsonutils.Marshal(&cpu_mems_mb)
 	ret.Add(r_obj, "cpu_mems_mb")
+	// cache
+	Cache.Set(specsKey, ret)
 	return ret, nil
 }
 

From 50d45b560b9b955cb6d9193a171964f30fea17af Mon Sep 17 00:00:00 2001
From: TangBin <tangbin@yunionyun.com>
Date: Tue, 16 Apr 2019 18:01:18 +0800
Subject: [PATCH 2/2] only list vpc usable skus

---
 pkg/compute/models/skus.go | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/pkg/compute/models/skus.go b/pkg/compute/models/skus.go
index 2286fed99f..3a430e838b 100644
--- a/pkg/compute/models/skus.go
+++ b/pkg/compute/models/skus.go
@@ -461,12 +461,42 @@ func providerFilter(q *sqlchemy.SQuery, provider string, public_cloud bool) *sql
 	// 过滤出公有云provider状态健康的sku
 	if public_cloud {
 		providerTable := CloudproviderManager.Query().SubQuery()
-		q = q.Join(providerTable, sqlchemy.Equals(q.Field("provider"), providerTable.Field("provider")))
+		providerRegionTable := CloudproviderRegionManager.Query().SubQuery()
+		q = q.Join(providerRegionTable, sqlchemy.Equals(q.Field("cloudregion_id"), providerRegionTable.Field("cloudregion_id")))
+		q = q.Join(providerTable, sqlchemy.Equals(providerRegionTable.Field("cloudprovider_id"), providerTable.Field("id")))
 		q = q.Filter(sqlchemy.IsTrue(providerTable.Field("enabled")))
 		q = q.Filter(sqlchemy.In(providerTable.Field("status"), api.CLOUD_PROVIDER_VALID_STATUS))
 		q = q.Filter(sqlchemy.Equals(providerTable.Field("health_status"), api.CLOUD_PROVIDER_HEALTH_NORMAL))
 	}
 
+	// 过滤出network usable的sku
+	providers := CloudproviderManager.Query().SubQuery()
+	networks := NetworkManager.Query().SubQuery()
+	wires := WireManager.Query().SubQuery()
+	vpcs := VpcManager.Query().SubQuery()
+
+	sq := vpcs.Query(sqlchemy.DISTINCT("cloudregion_id", vpcs.Field("cloudregion_id")))
+	sq = sq.Join(wires, sqlchemy.Equals(vpcs.Field("id"), wires.Field("vpc_id")))
+	sq = sq.Join(networks, sqlchemy.Equals(wires.Field("id"), networks.Field("wire_id")))
+	sq = sq.Join(providers, sqlchemy.Equals(vpcs.Field("manager_id"), providers.Field("id")))
+	sq = sq.Filter(sqlchemy.Equals(networks.Field("status"), NETWORK_STATUS_AVAILABLE))
+	sq = sq.Filter(sqlchemy.IsTrue(providers.Field("enabled")))
+	sq = sq.Filter(sqlchemy.In(providers.Field("status"), api.CLOUD_PROVIDER_VALID_STATUS))
+	sq = sq.Filter(sqlchemy.Equals(providers.Field("health_status"), api.CLOUD_PROVIDER_HEALTH_NORMAL))
+	sq = sq.Filter(sqlchemy.Equals(vpcs.Field("status"), VPC_STATUS_AVAILABLE))
+
+	sq2 := vpcs.Query(sqlchemy.DISTINCT("cloudregion_id", vpcs.Field("cloudregion_id")))
+	sq2 = sq2.Join(wires, sqlchemy.Equals(vpcs.Field("id"), wires.Field("vpc_id")))
+	sq2 = sq2.Join(networks, sqlchemy.Equals(wires.Field("id"), networks.Field("wire_id")))
+	sq2 = sq2.Filter(sqlchemy.Equals(networks.Field("status"), NETWORK_STATUS_AVAILABLE))
+	sq2 = sq2.Filter(sqlchemy.IsNullOrEmpty(vpcs.Field("manager_id")))
+	sq2 = sq2.Filter(sqlchemy.Equals(vpcs.Field("status"), VPC_STATUS_AVAILABLE))
+
+	q = q.Filter(sqlchemy.OR(
+		sqlchemy.In(q.Field("cloudregion_id"), sq.SubQuery()),
+		sqlchemy.In(q.Field("cloudregion_id"), sq2.SubQuery()),
+	))
+
 	if provider == "all" {
 		// provider 参数为all时。表示查询所有instance type.
 		return q