Automatic merge from release/2.7.0 -> release/2.8.0

* commit 'f986db4706ff35462e6c7b88341c03e4aa72e2ac':
  fix: separate private cloud & on-premise

pkg/cloudprovider/cloudprovider.go

@@ -140,7 +140,7 @@ func GetPublicProviders() []string {
 func GetPrivateProviders() []string {
 	providers := make([]string, 0)
 	for p, d := range providerTable {
-		if !d.IsPublicCloud() {
+		if !d.IsPublicCloud() && !d.IsOnPremise() {
 			providers = append(providers, p)
 		}
 	}

pkg/compute/models/cloudaccounts.go

@@ -912,7 +912,7 @@ func (manager *SCloudaccountManager) ListItemFilter(ctx context.Context, q *sqlc
 	}
 
 	if jsonutils.QueryBoolean(query, "private_cloud", false) {
-		q = q.IsFalse("is_public_cloud")
+		q = q.IsFalse("is_public_cloud").IsFalse("is_on_premise")
 	}
 
 	if jsonutils.QueryBoolean(query, "is_on_premise", false) {

pkg/compute/models/cloudproviders.go

@@ -840,6 +840,7 @@ func (manager *SCloudproviderManager) ListItemFilter(ctx context.Context, q *sql
 		cloudaccounts := CloudaccountManager.Query().SubQuery()
 		q = q.Join(cloudaccounts, sqlchemy.Equals(cloudaccounts.Field("id"), q.Field("cloudaccount_id")))
 		q = q.Filter(sqlchemy.IsFalse(cloudaccounts.Field("is_public_cloud")))
+		q = q.Filter(sqlchemy.IsFalse(cloudaccounts.Field("is_on_premise")))
 	}
 
 	if jsonutils.QueryBoolean(query, "is_on_premise", false) {