schema/spacewalk
by Milan Zazrivec
schema/spacewalk/spacewalk-schema-upgrade | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit e744a5458f947ca3b2f87f5a5ee7b9cf2a24d302
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri May 29 14:49:20 2009 +0200
no need to add whitespace to upgrade script
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 946d0a8..20fe969 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -199,10 +199,10 @@ EOF
close FILE;
$f_in =~ s!\[\[.*?\]\]|__.*?__!$default_tablespace!g;
$in .= <<EOF;
- set echo on
- spool $logfile append
- whenever sqlerror exit sql.sqlcode
- select '$dir/$name' from dual;
+set echo on
+spool $logfile append
+whenever sqlerror exit sql.sqlcode
+select '$dir/$name' from dual;
EOF
$in .= $f_in;
$in .= "commit;\n";
15 years, 1 month
Branch 'VADER' - spacewalk/setup
by Miroslav Suchý
spacewalk/setup/bin/spacewalk-setup | 23 -----------------------
1 file changed, 23 deletions(-)
New commits:
commit e13a759d6d38f9a4501a226976625439428d0353
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 29 13:44:33 2009 +0200
502475 - remove initialization of scout from perl
java code from code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java do it for us now
(cherry picked from commit 311273317beb8f8539b50d2e281287751e3cb90f)
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 4fe73c2..df3a956 100644
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -39,10 +39,7 @@ use Getopt::Long;
use Spacewalk::Setup;
use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC);
-use RHN::SatInstall;
-use RHN::SatCluster;
use RHN::DB;
-use RHN::Utils;
my $DEBUG;
$DEBUG = 0;
@@ -1115,26 +1112,6 @@ sub setup_monitoring {
update_monitoring_config($answers, \%mon_config);
update_monitoring_environment($answers);
- my $scout;
- eval { # scout on Satellite has always ID = 1
- $scout = RHN::SatCluster->lookup(-recid => 1);
- };
- if ($@) { #scout does not exist, lets create new
- my $ip_addr = RHN::Utils::find_ip_address($answers->{'hostname'});
- my $org_id = RHN::SatInstall->get_satellite_org_id();
- $scout = new RHN::SatCluster(customer_id => $org_id,
- description => 'RHN Monitoring Satellite',
- last_update_user => 'installer',
- vip => $ip_addr,
- );
- $scout->create_new();
- } else {
- print Spacewalk::Setup::loc("** Skipping scout creation. Already created.\n");
- }
-
- my $scout_shared_key = RHN::SatCluster->fetch_key($scout->recid);
- write_config({ monitoringDOTscout_shared_key => $scout_shared_key }, Spacewalk::Setup::DEFAULT_SATCON_DICT);
-
# Bugzilla 466747: On s390x, stty: standard input: Bad file descriptor
# For some reason DBI mistakenly sets FD_CLOEXEC on a stdin file descriptor
# here. This made it impossible for us to succesfully call `stty -echo`
15 years, 1 month
spacewalk/setup
by Miroslav Suchý
spacewalk/setup/bin/spacewalk-setup | 23 -----------------------
1 file changed, 23 deletions(-)
New commits:
commit 311273317beb8f8539b50d2e281287751e3cb90f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 29 13:44:33 2009 +0200
502475 - remove initialization of scout from perl
java code from code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java do it for us now
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 4fe73c2..df3a956 100644
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -39,10 +39,7 @@ use Getopt::Long;
use Spacewalk::Setup;
use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC);
-use RHN::SatInstall;
-use RHN::SatCluster;
use RHN::DB;
-use RHN::Utils;
my $DEBUG;
$DEBUG = 0;
@@ -1115,26 +1112,6 @@ sub setup_monitoring {
update_monitoring_config($answers, \%mon_config);
update_monitoring_environment($answers);
- my $scout;
- eval { # scout on Satellite has always ID = 1
- $scout = RHN::SatCluster->lookup(-recid => 1);
- };
- if ($@) { #scout does not exist, lets create new
- my $ip_addr = RHN::Utils::find_ip_address($answers->{'hostname'});
- my $org_id = RHN::SatInstall->get_satellite_org_id();
- $scout = new RHN::SatCluster(customer_id => $org_id,
- description => 'RHN Monitoring Satellite',
- last_update_user => 'installer',
- vip => $ip_addr,
- );
- $scout->create_new();
- } else {
- print Spacewalk::Setup::loc("** Skipping scout creation. Already created.\n");
- }
-
- my $scout_shared_key = RHN::SatCluster->fetch_key($scout->recid);
- write_config({ monitoringDOTscout_shared_key => $scout_shared_key }, Spacewalk::Setup::DEFAULT_SATCON_DICT);
-
# Bugzilla 466747: On s390x, stty: standard input: Bad file descriptor
# For some reason DBI mistakenly sets FD_CLOEXEC on a stdin file descriptor
# here. This made it impossible for us to succesfully call `stty -echo`
15 years, 1 month
java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 93cd947973483266daa6c7f4fca806b439a341c9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 29 09:28:01 2009 +0200
fix checkstyle
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
index d1c4c6d..a4b7d49 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
@@ -58,8 +58,7 @@ public class ProxyHandler extends BaseHandler {
/**
* Create Monitoring Scout for proxy.
* @param clientcert client certificate of the system.
- * @return 1 on success.
- * @return 0 if system is not proxy (scout is not created)
+ * @return 1 on success, 0 if system is not proxy (scout is not created)
* @throws MethodInvalidParamException thrown if certificate is invalid.
* @since 10.7
*
@@ -94,11 +93,11 @@ public class ProxyHandler extends BaseHandler {
throw new MethodInvalidParamException();
}
if (server.isProxy()) {
- User owner=server.getCreator();
+ User owner = server.getCreator();
SatCluster scout = SatClusterFactory.createSatCluster(owner);
scout.setDescription(LocalizationService.getInstance().
- getMessage("RHN Proxy")+ " " +
+ getMessage("RHN Proxy") + " " +
server.getHostname() +
" (" + server.getId() + ")");
scout.setVip(server.getIpAddress());
@@ -109,7 +108,8 @@ public class ProxyHandler extends BaseHandler {
node.setLastUpdateDate(new Date());
return 1;
- } else {
+ }
+ else {
return 0;
}
}
15 years, 1 month
Branch 'VADER' - java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 1e0ce77512d997531928da7ead0ebf02dfad66f0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 29 09:28:01 2009 +0200
fix checkstyle
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
index d1c4c6d..a4b7d49 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java
@@ -58,8 +58,7 @@ public class ProxyHandler extends BaseHandler {
/**
* Create Monitoring Scout for proxy.
* @param clientcert client certificate of the system.
- * @return 1 on success.
- * @return 0 if system is not proxy (scout is not created)
+ * @return 1 on success, 0 if system is not proxy (scout is not created)
* @throws MethodInvalidParamException thrown if certificate is invalid.
* @since 10.7
*
@@ -94,11 +93,11 @@ public class ProxyHandler extends BaseHandler {
throw new MethodInvalidParamException();
}
if (server.isProxy()) {
- User owner=server.getCreator();
+ User owner = server.getCreator();
SatCluster scout = SatClusterFactory.createSatCluster(owner);
scout.setDescription(LocalizationService.getInstance().
- getMessage("RHN Proxy")+ " " +
+ getMessage("RHN Proxy") + " " +
server.getHostname() +
" (" + server.getId() + ")");
scout.setVip(server.getIpAddress());
@@ -109,7 +108,8 @@ public class ProxyHandler extends BaseHandler {
node.setLastUpdateDate(new Date());
return 1;
- } else {
+ }
+ else {
return 0;
}
}
15 years, 1 month
Branch 'VADER' - java/code
by Partha Aji
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b20cad8185ab511bd5f79232c86edc3348ec6577
Author: Partha Aji <paji(a)redhat.com>
Date: Thu May 28 17:30:31 2009 -0400
502923 - Fixed a null pointer that occured on saving non existent xen distro..
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java
index d3011ef..aaeeff6 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java
@@ -92,14 +92,14 @@ public class CobblerDistroCommand extends CobblerCommand {
xen.setKernel(tree.getKernelXenPath());
xen.setInitrd(tree.getInitrdXenPath());
xen.setKsMeta(ksmeta);
+ xen.save();
}
if (nonXen != null) {
nonXen.setInitrd(tree.getInitrdPath());
nonXen.setKernel(tree.getKernelPath());
nonXen.setKsMeta(ksmeta);
+ nonXen.save();
}
- xen.save();
- nonXen.save();
}
15 years, 1 month
java/code
by Partha Aji
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 94212613ccdb495863342c69c7212e12357758f2
Author: Partha Aji <paji(a)redhat.com>
Date: Thu May 28 17:30:31 2009 -0400
502923 - Fixed a null pointer that occured on saving non existent xen distro..
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java
index d3011ef..aaeeff6 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java
@@ -92,14 +92,14 @@ public class CobblerDistroCommand extends CobblerCommand {
xen.setKernel(tree.getKernelXenPath());
xen.setInitrd(tree.getInitrdXenPath());
xen.setKsMeta(ksmeta);
+ xen.save();
}
if (nonXen != null) {
nonXen.setInitrd(tree.getInitrdPath());
nonXen.setKernel(tree.getKernelPath());
nonXen.setKsMeta(ksmeta);
+ nonXen.save();
}
- xen.save();
- nonXen.save();
}
15 years, 1 month
client/tools
by Pradeep Kilambi
client/tools/rhn-virtualization/virtualization/poller.py | 4 ++--
client/tools/rhn-virtualization/virtualization/support.py | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d7718a510656712a4c48c438ff151ea6e20f07d3
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu May 28 16:18:22 2009 -0400
502902 - If xend is not running instead of returning an empty list return an empty dict and let the registration and profile sync warn instead of failing
diff --git a/client/tools/rhn-virtualization/virtualization/poller.py b/client/tools/rhn-virtualization/virtualization/poller.py
index 08ed39f..e8d10c6 100644
--- a/client/tools/rhn-virtualization/virtualization/poller.py
+++ b/client/tools/rhn-virtualization/virtualization/poller.py
@@ -65,7 +65,7 @@ def poll_hypervisor():
'state' : '...' }, ... }
"""
if not libvirt:
- return []
+ return {}
try:
conn = libvirt.open(None)
@@ -75,7 +75,7 @@ def poll_hypervisor():
if not conn:
# No connection to hypervisor made
- return []
+ return {}
domainIDs = conn.listDomainsID()
diff --git a/client/tools/rhn-virtualization/virtualization/support.py b/client/tools/rhn-virtualization/virtualization/support.py
index abd3a01..d449bee 100755
--- a/client/tools/rhn-virtualization/virtualization/support.py
+++ b/client/tools/rhn-virtualization/virtualization/support.py
@@ -68,6 +68,10 @@ def refresh():
# Now, crawl each of the domains on this host.
domains = poller.poll_hypervisor()
+ if not len(domains):
+ # Either there were no domains or xend might not be running
+ # dont proceed further.
+ return
domain_list = domains.values()
domain_uuids = domains.keys()
15 years, 1 month
java/code
by Devan Goodwin
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/MethodsSetupAction.java | 6 +++++-
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodsSetupActionTest.java | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 5979dbe8187724115acd47d6564e6662a8a5638b
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Thu May 28 16:55:43 2009 -0300
Unit test fix.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/MethodsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/MethodsSetupAction.java
index 585ffed..3f503ec 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/MethodsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/MethodsSetupAction.java
@@ -42,6 +42,10 @@ public class MethodsSetupAction extends BaseSetListAction {
public RhnSetDecl getSetDecl() {
return RhnSetDecl.METHODS_IN_ORG;
}
-
+
+ /** {@inheritDoc} */
+ protected boolean preClearSet() {
+ return false;
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodsSetupActionTest.java
index 42a8500..262bcf0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodsSetupActionTest.java
@@ -35,6 +35,7 @@ public class MethodsSetupActionTest extends RhnBaseTestCase {
sah.setupClampListBounds();
sah.getRequest().setupAddParameter("newset", (String)null);
sah.getRequest().setupAddParameter("returnvisit", (String) null);
+ sah.getRequest().setupAddParameter("submitted", "false");
sah.executeAction();
// Remove if not a List SetupAction
15 years, 1 month
Branch 'VADER' - java/code
by John Matthews
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 63 ++++++++++
java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml | 24 +++
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 5
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 13 ++
4 files changed, 103 insertions(+), 2 deletions(-)
New commits:
commit e140b3721dc03b0a802c418c0b06dc6ac9e80e08
Author: John Matthews <jmatthew(a)redhat.com>
Date: Thu May 28 15:03:46 2009 -0400
490960 - ErrataSearch limit returned results to current or trusted orgs
diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
index 7d71db7..0d6733a 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
@@ -987,5 +987,68 @@ public class ErrataFactory extends HibernateFactory {
}
+ /**
+ * Returns a list of ErrataOverview of Errata that match the given Package
+ * ids.
+ * @param pids Package ids whose Errata are being sought.
+ * @param org Organization to match results with
+ * @return a list of ErrataOverview of Errata that match the given Package
+ * ids.
+ */
+ public static List<ErrataOverview> searchByPackageIdsWithOrg(List pids, Org org) {
+ List<Long> orgIds = new ArrayList<Long>();
+ orgIds.add(org.getId());
+ for (Org o : org.getTrustedOrgs()) {
+ orgIds.add(o.getId());
+ }
+ Map params = new HashMap();
+ params.put("pids", pids);
+ params.put("org_ids", orgIds);
+ if (log.isDebugEnabled()) {
+ log.debug("pids = " + pids);
+ log.debug("org_ids = " + orgIds);
+ }
+ List results = singleton.listObjectsByNamedQuery(
+ "PublishedErrata.searchByPackageIdsWithOrg", params);
+ if (log.isDebugEnabled()) {
+ log.debug("Query 'PublishedErrata.searchByPackageIdsWithOrg' returned " +
+ results.size() + " entries");
+ }
+ List<ErrataOverview> errata = new ArrayList<ErrataOverview>();
+ Long lastId = null;
+ ErrataOverview eo = null;
+ for (Object result : results) {
+ Object[] values = (Object[]) result;
+ // e.id, e.advisory, e.advisoryName, e.advisoryType, e.synopsis, e.updateDate
+ Long curId = (Long)values[0];
+
+ if (!curId.equals(lastId)) {
+ eo = new ErrataOverview();
+ }
+ eo.setId((Long)values[0]);
+ eo.setAdvisory((String)values[1]);
+ eo.setAdvisoryName((String)values[2]);
+ eo.setAdvisoryType((String)values[3]);
+ eo.setAdvisorySynopsis((String)values[4]);
+ eo.setUpdateDate((Date)values[5]);
+ eo.setIssueDate((Date)values[6]);
+ eo.addPackageName((String)values[7]);
+ if (!curId.equals(lastId)) {
+ errata.add(eo);
+ lastId = curId;
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("curId = " + curId + ", lastId = " + lastId);
+ log.debug("ErrataOverview formed: " + eo.getAdvisoryName() + " for " +
+ eo.getPackageNames());
+ }
+ }
+
+ return errata;
+ }
+
+
+
+
}
diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
index f8c8a77..d2f19a4 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
@@ -149,6 +149,30 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<return-scalar column="name" type="string" />
</sql-query>
+ <sql-query name="PublishedErrata.searchByPackageIdsWithOrg">
+ <![CDATA[select distinct e.id, e.advisory, e.advisory_name as advisoryName, e.advisory_type as advisoryType, e.synopsis as advisorySynopsis,
+ e.update_date as updateDate, e.issue_date as issueDate, pn.name
+ from rhnErrata e,
+ rhnErrataPackage ep,
+ rhnPackage p,
+ rhnPackageName pn
+ where e.id = ep.errata_id
+ and p.id = ep.package_id
+ and p.name_id = pn.id
+ and ep.package_id IN (:pids)
+ and e.org_id IN (:org_ids)
+ order by e.id]]>
+ <return-scalar column="id" type="long" />
+ <return-scalar column="advisory" type="string" />
+ <return-scalar column="advisoryName" type="string" />
+ <return-scalar column="advisoryType" type="string" />
+ <return-scalar column="advisorySynopsis" type="string" />
+ <return-scalar column="updateDate" type="timestamp" />
+ <return-scalar column="issueDate" type="timestamp" />
+ <return-scalar column="name" type="string" />
+ </sql-query>
+
+
<sql-query name="PublishedErrata.lookupFromSet">
<