java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e5660b436411cfa6232d4c8a5c2a447b7ac6f6a9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Nov 15 10:50:41 2011 +0100
Automatic commit of package [spacewalk-java] release [1.6.77-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4eef533..fb89dc7 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.76
+Version: 1.6.77
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Nov 15 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.77-1
+- 738999 - VirtualInstance.confirmed is number not boolean
+
* Wed Nov 09 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.76-1
- 682845 - check the input parameters for repo related APIs
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c1c893c..7168611 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.76-1 java/
+1.6.77-1 java/
12 years, 6 months
2 commits - backend/server java/code
by Michael Mraka
backend/server/rhnVirtualization.py | 2 +-
java/code/src/com/redhat/rhn/domain/server/VirtualInstance.hbm.xml | 2 +-
java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java | 10 +++++-----
java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 50eea0912d7d1fefe970968d5885f8982ff3502d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 30 14:16:49 2011 +0200
738999 - VirtualInstance.confirmed is number not boolean
diff --git a/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.hbm.xml b/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.hbm.xml
index 2755718..03f1b98 100644
--- a/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.hbm.xml
@@ -15,7 +15,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</id>
<property name="uuid" column="UUID" type="string" length="128"/>
- <property name="confirmed" column="CONFIRMED" type="boolean"/>
+ <property name="confirmed" column="CONFIRMED" type="long"/>
<property name="created" column="CREATED" type="timestamp" insert="false" update="false"/>
<property name="modified" column="MODIFIED" type="timestamp" insert="false" update="false"/>
diff --git a/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java b/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
index eca4921..32441e9 100644
--- a/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
+++ b/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
@@ -40,7 +40,7 @@ public class VirtualInstance extends BaseDomainHelper {
private Server guest;
private Server host;
private String uuid;
- private boolean confirmed;
+ private Long confirmed;
private VirtualInstanceInfo info;
/**
@@ -88,17 +88,17 @@ public class VirtualInstance extends BaseDomainHelper {
/**
*
- * @return true or false
+ * @return confirmed
*/
- public boolean isConfirmed() {
+ public Long getConfirmed() {
return confirmed;
}
/**
*
- * @param isConfirmed true or false
+ * @param isConfirmed long
*/
- public void setConfirmed(boolean isConfirmed) {
+ public void setConfirmed(Long isConfirmed) {
confirmed = isConfirmed;
}
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
index c99296c..3ed6836 100644
--- a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
+++ b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
@@ -180,7 +180,7 @@ public class ServerFactoryVirtualizationTest extends RhnBaseTestCase {
Server retrievedGuest = ServerFactory.lookupById(guest.getId());
retrievedGuest.setName("the_guest");
- retrievedGuest.getVirtualInstance().setConfirmed(true);
+ retrievedGuest.getVirtualInstance().setConfirmed(1);
ServerFactory.save(retrievedGuest);
flushAndEvict(retrievedGuest);
@@ -188,8 +188,8 @@ public class ServerFactoryVirtualizationTest extends RhnBaseTestCase {
Server updatedGuest = ServerFactory.lookupById(guest.getId());
assertEquals(updatedGuest.getName(), retrievedGuest.getName());
- assertEquals(updatedGuest.getVirtualInstance().isConfirmed(),
- retrievedGuest.getVirtualInstance().isConfirmed());
+ assertEquals(updatedGuest.getVirtualInstance().getConfirmed(),
+ retrievedGuest.getVirtualInstance().getConfirmed());
}
}
commit 36208823bf8ecda8f4bc1376be4e8e69f4e0f2a6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Nov 11 14:55:55 2011 +0100
738999 - aliases in update don't work
fixing
[Fri Nov 11 08:38:15 2011] [error] SQL Error generated: ('column "rvii" of relation "rhn
virtualinstanceinfo" does not exist\\nLINE 3: SET rvii.state=(\\n
^\\n', 0, '\\n UPDATE rhnVirtualInstanceInfo rvii\\n
SET rvii.state=(\\n SELECT rvis.id \\n FROM rhnVirtualInst
anceState rvis\\n WHERE rvis.label=%(state)s\\n )\\n
WHERE\\n rvii.instance_id IN (\\n SELECT rvi.id\\n
FROM rhnVirtualInstance rvi\\n WHERE rvi.confirmed=
0)\\n ')
diff --git a/backend/server/rhnVirtualization.py b/backend/server/rhnVirtualization.py
index 0383589..974a2f2 100644
--- a/backend/server/rhnVirtualization.py
+++ b/backend/server/rhnVirtualization.py
@@ -692,7 +692,7 @@ class VirtualizationEventHandler:
update_sql = """
UPDATE rhnVirtualInstanceInfo rvii
- SET rvii.state=(
+ SET state=(
SELECT rvis.id
FROM rhnVirtualInstanceState rvis
WHERE rvis.label=:state
12 years, 6 months
Branch 'ipv6' - java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/domain/server/Server.java | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 5b66e7383bc7908d63e511290097666a3bdb72c3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Nov 11 13:11:29 2011 +0100
IPv6: also browse through NIC's IPv6 addresses
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index 7f98d03..3a3eefa 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -880,6 +880,12 @@ public class Server extends BaseDomainHelper implements Identifiable {
log.debug("Found NetworkInterface !localhost");
return n;
}
+ for (ServerNetAddress6 ad6 : n.getIPv6Addresses()) {
+ if (ad6 != null && !ad6.getAddress().equals("::1")) {
+ log.debug("Found NetworkInterface !localhost");
+ return n;
+ }
+ }
}
// If we didnt match any of the above criteria
// just give up and return the 1st one.
12 years, 6 months
Branch 'ipv6' - java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 16 ++++++
java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java | 3 +
java/code/src/com/redhat/rhn/frontend/dto/SystemCompareDto.java | 26 ++++++++++
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 12 +++-
4 files changed, 54 insertions(+), 3 deletions(-)
New commits:
commit 4890dad42e294ee4279ed759a4e86e703bea56db
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Nov 10 17:51:48 2011 +0100
IPv6: duplicate system comparison based on IPv6 (webui)
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 bed8f0e..411aab2 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
@@ -1678,6 +1678,22 @@ SELECT 1
</query>
</mode>
+<mode name="duplicate_system_ids_ipv6_key" class="com.redhat.rhn.frontend.dto.SystemOverview">
+ <query params="uid, key">
+ select distinct s.id as id,
+ s.name as name,
+ si.checkin as last_checkin,
+ 1 as selectable
+ from rhnserver s inner join
+ rhnuserserverperms usp on s.id = usp.server_id inner join
+ rhnservernetinterface ni on ni.server_id = s.id inner join
+ rhnserverinfo si on si.server_id = s.id inner join
+ rhnservernetaddress6 sa6 on sa6.interface_id = ni.id
+ where usp.user_id = :uid and
+ sa6.address = :key
+ </query>
+</mode>
+
<mode name="duplicate_system_ids_mac" class="com.redhat.rhn.frontend.dto.NetworkDto">
<query params="uid, inactive_date">
SELECT distinct S.id as id, S.name as name, NI.hw_addr as key, si.checkin as last_checkin,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java
index 3f971cd..bdb945e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java
@@ -132,6 +132,9 @@ public class DuplicateSystemsCompareAction extends RhnAction implements Listable
else if (DuplicateSystemsAction.MAC_ADDRESS.equals(keyType)) {
return SystemManager.listDuplicatesByMac(contextIn.getLoggedInUser(), key);
}
+ else if (DuplicateSystemsAction.IPV6.equals(keyType)) {
+ return SystemManager.listDuplicatesByIPv6(contextIn.getLoggedInUser(), key);
+ }
return SystemManager.listDuplicatesByIP(contextIn.getLoggedInUser(), key);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemCompareDto.java b/java/code/src/com/redhat/rhn/frontend/dto/SystemCompareDto.java
index b0ce4b4..a875d1b 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SystemCompareDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemCompareDto.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.server.MonitoredServer;
import com.redhat.rhn.domain.server.NetworkInterface;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.ServerGroup;
+import com.redhat.rhn.domain.server.ServerNetAddress6;
import com.redhat.rhn.domain.token.ActivationKey;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
@@ -179,6 +180,18 @@ public class SystemCompareDto {
}
/**
+ * Returns a list of ( ipv6 addresses available per system)
+ * @return a list of ip addresses per system
+ */
+ public List<List<Item>> getIpv6Addresses() {
+ List<List> addresses = new LinkedList<List>();
+ for (Server system : servers) {
+ addresses.add(getIpv6Addresses(system));
+ }
+ return compareList(addresses);
+ }
+
+ /**
* Returns a list of (system groups available per system)
* @return a list of system groups per system
*/
@@ -405,6 +418,19 @@ public class SystemCompareDto {
return macs;
}
+ private List<String> getIpv6Addresses(Server system) {
+ List<String> addrs = new LinkedList<String>();
+ for (NetworkInterface n : system.getNetworkInterfaces()) {
+ for (ServerNetAddress6 ad6 : n.getIPv6Addresses()) {
+ String addr = ad6.getAddress();
+ if (addr != null && !addr.equals("::1")) {
+ addrs.add(addr);
+ }
+ }
+ }
+ return addrs;
+ }
+
/**
* An item object to represent
* value/ id/ and similarity
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
index 808d091..a8ed2eb 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
@@ -109,8 +109,8 @@
</tr>
<tr>
<th colspan="${requestScope.systems.size + 1}"><bean:message key="System Identity Properties"/>
- <a id='sysIdHide' href="javascript:pageToggleRows('sysId', ['lastCheckinRow', 'macAddressRow','ipAddressRow','systemGroupsRow'])"><bean:message key="Click Here To Hide"/> </a>
- <a style="display:none" id='sysIdShow' href="javascript:pageToggleRows('sysId', ['lastCheckinRow', 'macAddressRow','ipAddressRow','systemGroupsRow'])"><bean:message key="Click Here To Show"/> </a>
+ <a id='sysIdHide' href="javascript:pageToggleRows('sysId', ['lastCheckinRow', 'macAddressRow','ipAddressRow','ipv6AddressRow','systemGroupsRow'])"><bean:message key="Click Here To Hide"/> </a>
+ <a style="display:none" id='sysIdShow' href="javascript:pageToggleRows('sysId', ['lastCheckinRow', 'macAddressRow','ipAddressRow','ipv6AddressRow','systemGroupsRow'])"><bean:message key="Click Here To Show"/> </a>
</th>
</tr>
<tr class="list-row-odd" id="lastCheckinRow">
@@ -131,7 +131,13 @@
<c:set var ="href" value=""/>
<%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %>
</tr>
- <tr class="list-row-even" id = "systemGroupsRow">
+ <tr class="list-row-even" id = "ipv6AddressRow">
+ <c:set var ="key" value="row.ipv6"/>
+ <c:set var ="items_list" value="${requestScope.systems.ipv6Addresses}"/>
+ <c:set var ="href" value=""/>
+ <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %>
+ </tr>
+ <tr class="list-row-odd" id = "systemGroupsRow">
<c:set var ="key" value="System Groups"/>
<c:set var ="items_list" value="${requestScope.systems.systemGroups}"/>
<c:set var ="href" value="/network/systems/groups/details.pxt?sgid="/>
12 years, 6 months
Branch 'ipv6' - java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 29 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 +
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 7 ++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 23 +++++++
java/code/webapp/WEB-INF/nav/duplicate_systems_tabs.xml | 3 +
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 4 +
java/code/webapp/WEB-INF/struts-config.xml | 23 ++++++-
8 files changed, 93 insertions(+), 3 deletions(-)
New commits:
commit c66aafb7c00884adddc5fbe390d90b8205e47f8e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Nov 10 16:13:22 2011 +0100
IPv6: find system duplicates based on IPv6
New webui page: systems/DuplicateIPv6List to list duplicate systems
with identical IPv6 addresses.
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 f703757..bed8f0e 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
@@ -1648,6 +1648,35 @@ SELECT 1
</query>
</mode>
+<mode name="duplicate_system_ids_ipv6" class="com.redhat.rhn.frontend.dto.NetworkDto">
+ <query params="uid, inactive_date">
+ select distinct s.id as id,
+ s.name as name,
+ sa6.address as key,
+ si.checkin as last_checkin,
+ (select count(*)
+ from rhnserverinfo si2
+ where s.id = si2.server_id and
+ si2.checkin < :inactive_date) as inactive
+ from rhnserver s inner join
+ rhnuserserverperms usp on s.id = usp.server_id inner join
+ rhnservernetinterface ni on ni.server_id = s.id inner join
+ rhnserverinfo si on si.server_id = s.id inner join
+ rhnservernetaddress6 sa6 on sa6.interface_id = ni.id inner join
+ (select sa6_2.address,
+ sa6_2.scope,
+ count(distinct ni2.server_id) as syscount
+ from rhnservernetinterface ni2 inner join
+ rhnuserserverperms usp2 on ni2.server_id = usp2.server_id inner join
+ rhnservernetaddress6 sa6_2 on sa6_2.interface_id = ni2.id
+ where usp2.user_id = :uid and
+ sa6_2.address not in(%s) and
+ ni2.name not like 'vnet%' and ni2.name not like 'virbr%'
+ group by sa6_2.address, sa6_2.scope
+ having count(distinct ni2.server_id) > 1) summ on summ.address = sa6.address and summ.scope = sa6.scope
+ where usp.user_id = :uid
+ </query>
+</mode>
<mode name="duplicate_system_ids_mac" class="com.redhat.rhn.frontend.dto.NetworkDto">
<query params="uid, inactive_date">
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 cc614c1..332fa6b 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
@@ -45,6 +45,7 @@ public class DuplicateSystemsAction extends RhnAction implements Listable {
private static final String INACTIVE_COUNT = "inactive_count";
public static final String MAC_ADDRESS = "macaddress";
public static final String HOSTNAME = "hostname";
+ public static final String IPV6 = "ipv6";
/**
*
* {@inheritDoc}
@@ -117,6 +118,9 @@ public class DuplicateSystemsAction extends RhnAction implements Listable {
else if (contextIn.getRequest().getAttribute(MAC_ADDRESS) != null) {
return SystemManager.listDuplicatesByMac(contextIn.getLoggedInUser(), count);
}
+ else if (contextIn.getRequest().getAttribute(IPV6) != null) {
+ return SystemManager.listDuplicatesByIPv6(contextIn.getLoggedInUser(), count);
+ }
return SystemManager.listDuplicatesByIP(contextIn.getLoggedInUser(), count);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 66c0e54..85ea4e8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -62,6 +62,9 @@
<trans-unit id="row.ip">
<source>IP Address</source>
</trans-unit>
+ <trans-unit id="row.ipv6">
+ <source>IPv6 Address</source>
+ </trans-unit>
<trans-unit id="row.hostname">
<source>Hostname</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
index 22dcd87..c8c0930 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
@@ -125,6 +125,13 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
</context-group>
</trans-unit>
+ <trans-unit id="duplicate.systems.nav.ip6s">
+ <source>Duplicate IPv6 Address</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">Duplicate Systems Navigation Menu</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="duplicate.systems.nav.mac_address">
<source>Duplicate MAC Address</source>
<context-group name="ctx">
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 0935be0..f4d0e44 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2747,6 +2747,29 @@ public class SystemManager extends BaseManager {
}
/**
+ * List duplicate systems by ipv6 address
+ * @param user the user doing the search
+ * @param inactiveHours the number of hours a system hasn't checked in
+ * to consider it inactive
+ * @return List of DuplicateSystemGrouping objects
+ */
+ public static List listDuplicatesByIPv6(User user, long inactiveHours) {
+ List ignoreIps = new ArrayList();
+ ignoreIps.add("::1");
+ return listDuplicates(user, "duplicate_system_ids_ipv6", ignoreIps, inactiveHours);
+ }
+
+ /**
+ * List duplicate systems by ipv6 address
+ * @param user the user doing the search
+ * @param ip ip address of the system
+ * @return List of DuplicateSystemGrouping objects
+ */
+ public static List<SystemOverview> listDuplicatesByIPv6(User user, String ip) {
+ return listDuplicates(user, "duplicate_system_ids_ipv6_key", ip);
+ }
+
+ /**
* List duplicate systems by mac address
* @param user the user doing the search
* @param inactiveHours the number of hours a system hasn't checked in
diff --git a/java/code/webapp/WEB-INF/nav/duplicate_systems_tabs.xml b/java/code/webapp/WEB-INF/nav/duplicate_systems_tabs.xml
index 417b05e..95ab8f3 100644
--- a/java/code/webapp/WEB-INF/nav/duplicate_systems_tabs.xml
+++ b/java/code/webapp/WEB-INF/nav/duplicate_systems_tabs.xml
@@ -4,6 +4,9 @@
<rhn-tab name="duplicate.systems.nav.ips">
<rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
</rhn-tab>
+ <rhn-tab name="duplicate.systems.nav.ip6s">
+ <rhn-tab-url>/rhn/systems/DuplicateIPv6List.do</rhn-tab-url>
+ </rhn-tab>
<rhn-tab name="duplicate.systems.nav.hostname">
<rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
</rhn-tab>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
index 317b02b..2e228d5 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
@@ -24,6 +24,10 @@
<c:set var="filtermessage" value="row.ip"/>
<c:set var="key_type" value="ip"/>
</c:when>
+ <c:when test="${not empty requestScope.ipv6}">
+ <c:set var="filtermessage" value="row.ipv6"/>
+ <c:set var="key_type" value="ipv6"/>
+ </c:when>
<c:otherwise>
<c:set var="filtermessage" value="row.macaddress"/>
<c:set var="key_type" value="macaddress"/>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index f991165..b2e2b6d 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -2629,9 +2629,23 @@
<set-property property="postRequiredIfSubmitted" value="true" />
<forward name="default"
path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
- <forward name="confirm"
- path="/systems/ssm/DeleteConfirm.do"
- redirect="true"/>
+ <forward name="confirm"
+ path="/systems/ssm/DeleteConfirm.do"
+ redirect="true"/>
+ </action>
+
+ <action path="/systems/DuplicateIPv6List"
+ scope="request"
+ input="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"
+ type="com.redhat.rhn.frontend.action.systems.duplicate.DuplicateSystemsAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping"
+ parameter="ipv6">
+ <set-property property="postRequiredIfSubmitted" value="true" />
+ <forward name="default"
+ path="/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp"/>
+ <forward name="confirm"
+ path="/systems/ssm/DeleteConfirm.do"
+ redirect="true"/>
</action>
<action path="/systems/DuplicateHostName"
@@ -2678,6 +2692,9 @@
<forward name="ip"
path="/systems/DuplicateIPList"
redirect="true"/>
+ <forward name="ipv6"
+ path="/systems/DuplicateIPv6List"
+ redirect="true"/>
<forward name="macaddress"
path="/systems/DuplicateMacAddress"
redirect="true"/>
12 years, 6 months
Branch 'ipv6' - java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7a12b058c00b09ecdec11487990b1c29062f60f7
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Nov 10 14:10:46 2011 +0100
IPv6: fix duplicates based on IP comparison
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 a060ae3..f703757 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
@@ -1641,9 +1641,10 @@ SELECT 1
inner join rhnUserServerPerms USP on S.id = USP.server_id
inner join rhnServerNetInterface NI on NI.server_id = S.id
inner join rhnServerInfo si on si.server_id = S.id
+ inner join rhnServerNetAddress4 sa4 on sa4.interface_id = NI.id
where
USP.user_id = :uid
- and NI.ip_addr = :key
+ and sa4.address = :key
</query>
</mode>
12 years, 6 months
Branch 'ipv6' - java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 12 +++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit aefe48159a0b296244e50453db014195af2da0d0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Nov 10 13:47:22 2011 +0100
IPv6: fix duplicates based on IP comparison
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 2c93cb1..a060ae3 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
@@ -1616,18 +1616,20 @@ SELECT 1
<mode name="duplicate_system_ids_ip" class="com.redhat.rhn.frontend.dto.NetworkDto">
<query params="uid, inactive_date">
- SELECT distinct S.id as id, S.name as name, NI.ip_addr as key, si.checkin as last_checkin,
+ SELECT distinct S.id as id, S.name as name, sa4.address as key, si.checkin as last_checkin,
(select count(*) from rhnServerInfo Si2 where S.id = Si2.server_id and Si2.checkin < :inactive_date) as inactive
from rhnServer S inner join
rhnUserServerPerms USP on S.id = USP.server_id inner join
rhnServerNetInterface NI on NI.server_id = S.id inner join
rhnServerInfo si on si.server_id = S.id inner join
- ( Select NI2.ip_addr, count(distinct NI2.server_id) as syscount
+ rhnServerNetAddress4 sa4 on sa4.interface_id = NI.id inner join
+ ( Select sa4_2.address, count(distinct NI2.server_id) as syscount
from rhnServerNetInterface NI2 inner join
- rhnUserServerPerms USP2 on NI2.server_id = USP2.server_id
+ rhnUserServerPerms USP2 on NI2.server_id = USP2.server_id inner join
+ rhnServerNetAddress4 sa4_2 on sa4_2.interface_id = ni2.id
where USP2.user_id = :uid and
- NI2.ip_addr not in(%s) and NI2.name not like 'vnet%' and NI2.name not like 'virbr%'
- group by NI2.ip_addr having count(distinct NI2.server_id) > 1) SUMM on SUMM.ip_addr = NI.ip_addr
+ sa4_2.address not in(%s) and NI2.name not like 'vnet%' and NI2.name not like 'virbr%'
+ group by sa4_2.address having count(distinct NI2.server_id) > 1) SUMM on SUMM.address = sa4.address
where USP.user_id = :uid
</query>
</mode>
12 years, 6 months
rel-eng/comps
by jblazek
rel-eng/comps/comps-spacewalk-client-fedora16.xml | 36 ++++
rel-eng/comps/comps-spacewalk-server-fedora16.xml | 163 ++++++++++++++++++++++
2 files changed, 199 insertions(+)
New commits:
commit ebe14b506fdbe9cac80229823a1e6c8beae6b311
Author: Jan Blazek <jblazek(a)redhat.com>
Date: Thu Nov 10 10:57:57 2011 +0100
Add comps for Fedora 16.
diff --git a/rel-eng/comps/comps-spacewalk-client-fedora16.xml b/rel-eng/comps/comps-spacewalk-client-fedora16.xml
new file mode 100644
index 0000000..d8b5c4c
--- /dev/null
+++ b/rel-eng/comps/comps-spacewalk-client-fedora16.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
+
+<comps>
+<!-- <meta> -->
+<!-- Meta information will go here eventually -->
+<!-- </meta> -->
+ <group>
+ <id>spacewalk-client</id>
+ <name>Spacewalk Client</name>
+ <description>Spacewalk Client Packages</description>
+ <uservisible>true</uservisible>
+ <packagelist>
+ <packagereq type="default">rhncfg</packagereq>
+ <packagereq type="default">rhncfg-actions</packagereq>
+ <packagereq type="default">rhncfg-client</packagereq>
+ <packagereq type="default">rhncfg-management</packagereq>
+ <packagereq type="default">rhn-custom-info</packagereq>
+ <packagereq type="default">osad</packagereq>
+ <packagereq type="default">rhn-client-tools</packagereq>
+ <packagereq type="default">rhn-virtualization-common</packagereq>
+ <packagereq type="default">rhn-virtualization-host</packagereq>
+ <packagereq type="default">spacewalk-koan</packagereq>
+ <packagereq type="default">rhnlib</packagereq>
+ <packagereq type="default">rhnmd</packagereq>
+ <packagereq type="default">rhnsd</packagereq>
+ <packagereq type="default">rhn-check</packagereq>
+ <packagereq type="default">rhn-setup</packagereq>
+ <packagereq type="default">rhn-setup-gnome</packagereq>
+ <packagereq type="default">yum-rhn-plugin</packagereq>
+ <packagereq type="default">spacewalk-certs-tools</packagereq>
+ <packagereq type="default">spacewalk-client-repo</packagereq>
+ <packagereq type="default">spacewalk-backend-libs</packagereq>
+ </packagelist>
+ </group>
+</comps>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
new file mode 100644
index 0000000..fe0d2ea
--- /dev/null
+++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
+
+<comps>
+<!-- <meta> -->
+<!-- Meta information will go here eventually -->
+<!-- </meta> -->
+ <group>
+ <id>spacewalk-server</id>
+ <name>Spacewalk Server</name>
+ <description>Spacewalk Server Packages</description>
+ <uservisible>true</uservisible>
+ <packagelist>
+<!-- client libs - needed till it get propagated to distribuitions -->
+ <packagereq type="default">rhnlib</packagereq>
+ <packagereq type="default">rhn-check</packagereq>
+ <packagereq type="default">rhn-setup</packagereq>
+ <packagereq type="default">rhn-setup-gnome</packagereq>
+ <packagereq type="default">rhn-client-tools</packagereq>
+ <packagereq type="default">yum-rhn-plugin</packagereq>
+
+ <packagereq type="default">cx_Oracle</packagereq>
+ <packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="default">heirloom-pkgtools</packagereq>
+ <packagereq type="default">jpam</packagereq>
+ <packagereq type="default">MessageQueue</packagereq>
+ <packagereq type="default">nocpulse-common</packagereq>
+ <packagereq type="default">nocpulse-db-perl</packagereq>
+ <packagereq type="default">NOCpulsePlugins</packagereq>
+ <packagereq type="default">NOCpulsePlugins-Oracle</packagereq>
+ <packagereq type="default">NPalert</packagereq>
+ <packagereq type="default">nutch</packagereq>
+ <packagereq type="default">oracle-instantclient-selinux</packagereq>
+ <packagereq type="default">oracle-instantclient-sqlplus-selinux</packagereq>
+ <packagereq type="default">oracle-lib-compat</packagereq>
+ <packagereq type="default">oracle-nofcontext-selinux</packagereq>
+ <packagereq type="default">oracle-selinux</packagereq>
+ <packagereq type="default">oracle-xe-selinux</packagereq>
+ <packagereq type="default">osa-dispatcher</packagereq>
+ <packagereq type="default">osa-dispatcher-selinux</packagereq>
+ <packagereq type="default">perl-DBD-Oracle</packagereq>
+ <packagereq type="default">perl-NOCpulse-CLAC</packagereq>
+ <packagereq type="default">perl-NOCpulse-Debug</packagereq>
+ <packagereq type="default">perl-NOCpulse-Gritch</packagereq>
+ <packagereq type="default">perl-NOCpulse-Object</packagereq>
+ <packagereq type="default">perl-NOCpulse-OracleDB</packagereq>
+ <packagereq type="default">perl-NOCpulse-PersistentConnection</packagereq>
+ <packagereq type="default">perl-NOCpulse-Probe</packagereq>
+ <packagereq type="default">perl-NOCpulse-Probe-Oracle</packagereq>
+ <packagereq type="default">perl-NOCpulse-ProcessPool</packagereq>
+ <packagereq type="default">perl-NOCpulse-Scheduler</packagereq>
+ <packagereq type="default">perl-NOCpulse-SetID</packagereq>
+ <packagereq type="default">perl-NOCpulse-Utils</packagereq>
+ <packagereq type="default">perl-Satcon</packagereq>
+ <packagereq type="default">ProgAGoGo</packagereq>
+ <packagereq type="default">python-gzipstream</packagereq>
+ <packagereq type="default">quartz</packagereq>
+ <packagereq type="default">quartz-oracle</packagereq>
+ <packagereq type="default">redstone-xmlrpc</packagereq>
+ <packagereq type="default">rhnpush</packagereq>
+ <packagereq type="default">SatConfig-bootstrap</packagereq>
+ <packagereq type="default">SatConfig-bootstrap-server</packagereq>
+ <packagereq type="default">SatConfig-cluster</packagereq>
+ <packagereq type="default">SatConfig-general</packagereq>
+ <packagereq type="default">SatConfig-generator</packagereq>
+ <packagereq type="default">SatConfig-installer</packagereq>
+ <packagereq type="default">SatConfig-spread</packagereq>
+ <packagereq type="default">scdb</packagereq>
+ <packagereq type="default">simple-core</packagereq>
+ <packagereq type="default">SNMPAlerts</packagereq>
+ <packagereq type="default">spacecmd</packagereq>
+ <packagereq type="default">spacewalk-admin</packagereq>
+ <packagereq type="default">spacewalk-backend</packagereq>
+ <packagereq type="default">spacewalk-backend-app</packagereq>
+ <packagereq type="default">spacewalk-backend-applet</packagereq>
+ <packagereq type="default">spacewalk-backend-config-files</packagereq>
+ <packagereq type="default">spacewalk-backend-config-files-common</packagereq>
+ <packagereq type="default">spacewalk-backend-config-files-tool</packagereq>
+ <packagereq type="default">spacewalk-backend-iss</packagereq>
+ <packagereq type="default">spacewalk-backend-iss-export</packagereq>
+ <packagereq type="default">spacewalk-backend-libs</packagereq>
+ <packagereq type="default">spacewalk-backend-package-push-server</packagereq>
+ <packagereq type="default">spacewalk-backend-server</packagereq>
+ <packagereq type="default">spacewalk-backend-sql</packagereq>
+ <packagereq type="default">spacewalk-backend-sql-oracle</packagereq>
+ <packagereq type="default">spacewalk-backend-sql-postgresql</packagereq>
+ <packagereq type="default">spacewalk-backend-tools</packagereq>
+ <packagereq type="default">spacewalk-backend-xml-export-libs</packagereq>
+ <packagereq type="default">spacewalk-backend-xmlrpc</packagereq>
+ <packagereq type="default">spacewalk-backend-xp</packagereq>
+ <packagereq type="default">spacewalk-base</packagereq>
+ <packagereq type="default">spacewalk-base-minimal</packagereq>
+ <packagereq type="default">spacewalk-branding</packagereq>
+ <packagereq type="default">spacewalk-certs-tools</packagereq>
+ <packagereq type="default">spacewalk-client-repo</packagereq>
+ <packagereq type="default">spacewalk-common</packagereq>
+ <packagereq type="default">spacewalk-config</packagereq>
+ <packagereq type="default">spacewalk-dobby</packagereq>
+ <packagereq type="default">spacewalk-doc-indexes</packagereq>
+ <packagereq type="default">spacewalk-grail</packagereq>
+ <packagereq type="default">spacewalk-html</packagereq>
+ <packagereq type="default">spacewalk-java</packagereq>
+ <packagereq type="default">spacewalk-java-config</packagereq>
+ <packagereq type="default">spacewalk-java-lib</packagereq>
+ <packagereq type="default">spacewalk-java-oracle</packagereq>
+ <packagereq type="default">spacewalk-java-postgresql</packagereq>
+ <packagereq type="default">spacewalk-monitoring</packagereq>
+ <packagereq type="default">spacewalk-monitoring-selinux</packagereq>
+ <packagereq type="default">spacewalk-oracle</packagereq>
+ <packagereq type="default">spacewalk-postgresql</packagereq>
+ <packagereq type="default">spacewalk-proxy-broker</packagereq>
+ <packagereq type="default">spacewalk-proxy-common</packagereq>
+ <packagereq type="default">spacewalk-proxy-docs</packagereq>
+ <packagereq type="default">spacewalk-proxy-html</packagereq>
+ <packagereq type="default">spacewalk-proxy-installer</packagereq>
+ <packagereq type="default">spacewalk-proxy-management</packagereq>
+ <packagereq type="default">spacewalk-proxy-monitoring</packagereq>
+ <packagereq type="default">spacewalk-proxy-package-manager</packagereq>
+ <packagereq type="default">spacewalk-proxy-redirect</packagereq>
+ <packagereq type="default">spacewalk-proxy-selinux</packagereq>
+ <packagereq type="default">spacewalk-pxt</packagereq>
+ <packagereq type="default">spacewalk-repo</packagereq>
+ <packagereq type="default">spacewalk-reports</packagereq>
+ <packagereq type="default">spacewalk-schema</packagereq>
+ <packagereq type="default">spacewalk-search</packagereq>
+ <packagereq type="default">spacewalk-selinux</packagereq>
+ <packagereq type="default">spacewalk-setup</packagereq>
+ <packagereq type="default">spacewalk-setup-jabberd</packagereq>
+ <packagereq type="default">spacewalk-slf4j</packagereq>
+ <packagereq type="default">spacewalk-sniglets</packagereq>
+ <packagereq type="default">spacewalk-ssl-cert-check</packagereq>
+ <packagereq type="default">spacewalk-taskomatic</packagereq>
+ <packagereq type="default">spacewalk-utils</packagereq>
+ <packagereq type="default">spacewalk-remote-utils</packagereq>
+ <packagereq type="default">SputLite-client</packagereq>
+ <packagereq type="default">SputLite-server</packagereq>
+ <packagereq type="default">ssl_bridge</packagereq>
+ <packagereq type="default">status_log_acceptor</packagereq>
+ <packagereq type="default">stringtree-json</packagereq>
+ <packagereq type="default">tanukiwrapper</packagereq>
+ <packagereq type="default">tsdb</packagereq>
+ </packagelist>
+ </group>
+ <group>
+ <id>spacewalk-server-docs</id>
+ <name>Spacewalk Server Documentation</name>
+ <description>Spacewalk Server Documentation Packages</description>
+ <uservisible>false</uservisible>
+ <packagelist>
+ <packagereq type="optional">jpam-javadoc</packagereq>
+ </packagelist>
+ </group>
+ <group>
+ <id>spacewalk-server-no-install</id>
+ <name>Spacewalk Server Junk</name>
+ <description>Spacewalk Server Non-installatble Packages</description>
+ <uservisible>false</uservisible>
+ <packagelist>
+ <packagereq type="optional">oracle-rhnsat-selinux</packagereq>
+ <packagereq type="optional">perl-DBD-Oracle-explain</packagereq>
+ </packagelist>
+ </group>
+</comps>
12 years, 6 months
Branch 'ipv6' - java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java | 21 ++++++++++
1 file changed, 21 insertions(+)
New commits:
commit 8ec76cd90b411efcbc8d83dcdb549822f1c0b678
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Nov 10 10:19:09 2011 +0100
IPv6: system.getNetworkDevices() modifications (API)
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
index e5ac890..e2d500c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
@@ -15,12 +15,15 @@
package com.redhat.rhn.frontend.xmlrpc.serializer;
import com.redhat.rhn.domain.server.NetworkInterface;
+import com.redhat.rhn.domain.server.ServerNetAddress6;
import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
import org.apache.commons.lang.StringUtils;
import java.io.IOException;
import java.io.Writer;
+import java.util.ArrayList;
+import java.util.HashMap;
import redstone.xmlrpc.XmlRpcCustomSerializer;
import redstone.xmlrpc.XmlRpcException;
@@ -40,6 +43,13 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "hardware_address", "Hardware Address of device.")
* #prop_desc("string", "module", "Network driver used for this device.")
* #prop_desc("string", "broadcast", " Broadcast address for device.")
+ * #array("list of ipv6 addresses")
+ * #struct("ipv6 address")
+ * #prop_desc("string", "address", "IPv6 address of this network device")
+ * #prop_desc("string", "netmask", "IPv6 netmask of this network device")
+ * #prop_desc("string", "scope", "IPv6 address scope")
+ * #struct_end()
+ * #array_end()
* #struct_end()
*
*/
@@ -57,8 +67,19 @@ public class NetworkInterfaceSerializer implements XmlRpcCustomSerializer {
throws XmlRpcException, IOException {
NetworkInterface device = (NetworkInterface)value;
SerializerHelper devMap = new SerializerHelper(builtInSerializer);
+ ArrayList ipv6List = new ArrayList();
+
+ for (ServerNetAddress6 addr : device.getIPv6Addresses()) {
+// SerializerHelper m = new SerializerHelper(builtInSerializer);
+ HashMap m = new HashMap();
+ m.put("address", StringUtils.defaultString(addr.getAddress()));
+ m.put("netmask", StringUtils.defaultString(addr.getNetmask()));
+ m.put("scope", StringUtils.defaultString(addr.getScope()));
+ ipv6List.add(m);
+ }
devMap.add("interface", StringUtils.defaultString(device.getName()));
+ devMap.add("ipv6", ipv6List);
devMap.add("ip", StringUtils.defaultString(device.getIpaddr()));
devMap.add("netmask", StringUtils.defaultString(device.getNetmask()));
devMap.add("broadcast", StringUtils.defaultString(device.getBroadcast()));
12 years, 6 months
Branch 'ipv6' - java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3225118b8b1d4c4a51fed0f6ebe83d16a1b1453a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 9 20:50:30 2011 +0100
api doc: typo fix
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
index ee0300b..e5ac890 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
@@ -39,7 +39,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "netmask", "Network mask assigned to device")
* #prop_desc("string", "hardware_address", "Hardware Address of device.")
* #prop_desc("string", "module", "Network driver used for this device.")
- * #prop_desc("string", "broadcase", " Broadcast address for device.")
+ * #prop_desc("string", "broadcast", " Broadcast address for device.")
* #struct_end()
*
*/
12 years, 6 months