Re-add affinity group (#4405)

GabrielBrascher · web-flow · commit 4c936b469097 · 2020-10-16T09:16:19.000+02:00
diff --git 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);
         }

Original file line number	Diff line number	Diff line change
`@@ -976,6 +976,10 @@ private Pair<List<UserVmJoinVO>, Integer> searchForUserVMsInternal(ListVMsCmd cm`
`976`	`976`	`sb.and("poolId", sb.entity().getPoolId(), SearchCriteria.Op.EQ);`
`977`	`977`	`}`
`978`	`978`
	`979`	`+ if (affinityGroupId != null) {`
	`980`	`+ sb.and("affinityGroupId", sb.entity().getAffinityGroupId(), SearchCriteria.Op.EQ);`
	`981`	`+ }`
	`982`	`+`
`979`	`983`	`if (keyPairName != null) {`
`980`	`984`	`sb.and("keyPairName", sb.entity().getKeypairName(), SearchCriteria.Op.EQ);`
`981`	`985`	`}`