java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
| 2 +-
java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
| 4 +++-
java/code/src/com/redhat/rhn/manager/system/SystemManager.java
| 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 97b2295e9d145dd796c2ffb993efd974c267a9a9
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu May 6 10:54:13 2010 -0400
ignoring virt bonded interfaces, changing dups page to not sure the same set, and
fixing inactive counts on mac and hostname pages
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index d573bf8..e5f7c8e 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1597,7 +1597,7 @@ DELETE FROM rhnSatelliteChannelFamily WHERE server_id = :sid
from rhnServerNetInterface NI2 inner join
rhnUserServerPerms USP2 on NI2.server_id = USP2.server_id
where USP2.user_id = :uid and
- NI2.ip_addr not in(%s)
+ NI2.ip_addr not in(%s) and NI2.name not like 'vnet%' and NI2.name not like
'virbr%'
group by NI2.ip_addr) SUMM on SUMM.ip_addr = NI.ip_addr
where USP.user_id = :uid and
SUMM.syscount > 1
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
index af9e145..85f0dfa 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
@@ -28,6 +28,7 @@ import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -63,7 +64,8 @@ public class DuplicateSystemsAction extends RhnAction implements
Listable {
request.setAttribute(INACTIVE_COUNT, inactiveHours);
- ListSessionSetHelper helper = new ListSessionSetHelper(this, request);
+ ListSessionSetHelper helper = new ListSessionSetHelper(this, request,
+ Collections.EMPTY_MAP, mapping.getParameter());
helper.setWillClearSet(false);
helper.execute();
if (helper.isDispatched()) {
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 25f1529..b0400a9 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2729,7 +2729,7 @@ public class SystemManager extends BaseManager {
List ignoreMacs = new ArrayList();
ignoreMacs.add("00:00:00:00:00:00");
ignoreMacs.add("fe:ff:ff:ff:ff:ff");
- return listDuplicates(user, "duplicate_system_ids_mac", ignoreMacs,
0L);
+ return listDuplicates(user, "duplicate_system_ids_mac", ignoreMacs,
inactiveHours);
}
/**
@@ -2741,7 +2741,7 @@ public class SystemManager extends BaseManager {
*/
public static List listDuplicatesByHostname(User user, Long inactiveHours) {
return listDuplicates(user, "duplicate_system_ids_hostname",
- Collections.EMPTY_LIST, 0L);
+ Collections.EMPTY_LIST, inactiveHours);
}
Show replies by date