From 89d86fa89f3d12d9ba307717761fdfcb8e49f565 Mon Sep 17 00:00:00 2001
From: Gabriel Brascher <gabriel@apache.org>
Date: Wed, 14 Oct 2020 11:50:02 -0300
Subject: [PATCH] Re-add affinity group

Fix mistake from PR #4397 List VMs by Security Group & HA
---
 .../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 1d967072e6d5..28f6bfcba283 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 @@ private Pair<List<UserVmJoinVO>, Integer> searchForUserVMsInternal(ListVMsCmd cm
             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);
         }