[cloudstack] branch master updated: Re-add affinity group (#4405)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 4c936b4  Re-add affinity group (#4405)
4c936b4 is described below

commit 4c936b469097e899abe2a3e9abb505ce0b2e25a7
Author: Gabriel Beims Bräscher <gabr...@apache.org>
AuthorDate: Fri Oct 16 04:16:19 2020 -0300

    Re-add affinity group (#4405)
---
 server/src/main/java/com/cloud/api/query/QueryManagerImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index 1d96707..28f6bfc 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -976,6 +976,10 @@ public class QueryManagerImpl extends 
MutualExclusiveIdsManagerBase implements Q
             sb.and("poolId", sb.entity().getPoolId(), SearchCriteria.Op.EQ);
         }
 
+        if (affinityGroupId != null) {
+            sb.and("affinityGroupId", sb.entity().getAffinityGroupId(), 
SearchCriteria.Op.EQ);
+        }
+
         if (keyPairName != null) {
             sb.and("keyPairName", sb.entity().getKeypairName(), 
SearchCriteria.Op.EQ);
         }