remove or operator from quarantined addresses query

Author: erikbocks

engine/schema/src/main/java/com/cloud/network/dao/PublicIpQuarantineDao.java

@@ -31,9 +31,9 @@ public interface PublicIpQuarantineDao extends GenericDao<PublicIpQuarantineVO,
     /**
      * Returns a list of public IP addresses that are actively quarantined at the specified date and the previous owner differs from the specified user.
      *
-     * @param userId used to check against the IP's previous owner.
+     * @param userId used to check against the IP's previous owner;
      * @param date used to check if the quarantine is active;
-     * @return a list of PublicIpQuarantineVOs
+     * @return a list of PublicIpQuarantineVOs.
      */
     List<PublicIpQuarantineVO> listQuarantinedIpAddressesToUser(Long userId, Date date);
 }

engine/schema/src/main/java/com/cloud/network/dao/PublicIpQuarantineDaoImpl.java

@@ -56,8 +56,6 @@ public void init() {
         quarantinedIpAddressesSearch.and();
         quarantinedIpAddressesSearch.op("removedIsNull", quarantinedIpAddressesSearch.entity().getRemoved(), SearchCriteria.Op.NULL);
         quarantinedIpAddressesSearch.and("endDate", quarantinedIpAddressesSearch.entity().getEndDate(), SearchCriteria.Op.GT);
-        quarantinedIpAddressesSearch.or("removedIsNotNull", quarantinedIpAddressesSearch.entity().getRemoved(), SearchCriteria.Op.NNULL);
-        quarantinedIpAddressesSearch.and("removedDateGt", quarantinedIpAddressesSearch.entity().getRemoved(), SearchCriteria.Op.GT);
         quarantinedIpAddressesSearch.cp();
 
         ipAddressSearchBuilder.done();
@@ -89,7 +87,6 @@ public List<PublicIpQuarantineVO> listQuarantinedIpAddressesToUser(Long userId,
 
         sc.setParameters("previousOwnerId", userId);
         sc.setParameters("endDate", date);
-        sc.setParameters("removedDateGt", date);
 
         return searchIncludingRemoved(sc, null, false, false);
     }

server/src/main/java/com/cloud/network/IpAddressManagerImpl.java

@@ -960,7 +960,7 @@ public List<IPAddressVO> listAvailablePublicIps(final long dcId, final Long podI
             List<PublicIpQuarantineVO> quarantinedAddresses = publicIpQuarantineDao.listQuarantinedIpAddressesToUser(owner.getId(), new Date());
             List<Long> quarantinedAddressesIDs = quarantinedAddresses.stream().map(PublicIpQuarantineVO::getPublicIpAddressId).collect(Collectors.toList());
 
-            logger.debug("Found addresses with the following IDs: {}.", quarantinedAddressesIDs);
+            logger.debug("Found addresses with the following IDs: [{}] that will be ignored when searching for available public IPs.", quarantinedAddressesIDs);
 
             if (CollectionUtils.isNotEmpty(quarantinedAddressesIDs)) {
                 sc.setParameters("id", quarantinedAddressesIDs.toArray());