web/modules/rhn/RHN/DB/Server.pm | 125 ----------------
web/modules/rhn/RHN/DB/ServerPackage.pm | 130 ----------------
web/modules/rhn/RHN/Kickstart/Template.pm | 92 ------------
web/modules/rhn/RHN/Message.pm | 53 ------
web/modules/rhn/RHN/ServerPackage.pm | 45 -----
web/modules/sniglets/Sniglets/ListView/Dobby.pm | 58 -------
web/modules/sniglets/Sniglets/Proxy.pm | 117 ---------------
web/modules/sniglets/Sniglets/Satellite.pm | 184 ------------------------
web/modules/sniglets/Sniglets/Servers.pm | 64 --------
web/modules/sniglets/Sniglets/Users.pm | 45 -----
web/spacewalk-web.spec | 2
11 files changed, 915 deletions(-)
New commits:
commit dc0b7001f9fad5efd2ce69848c9be94af6a7ce8e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:57:39 2009 +0100
No xmlrpc in Sniglets::Users anymore, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Users.pm
b/web/modules/sniglets/Sniglets/Users.pm
index ae41897..6401b0a 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -99,14 +99,6 @@ sub tnc_accepted_cb {
$pxt->redirect("/rhn/YourRhn.do");
}
-sub register_xmlrpc {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_xmlrpc('rhn_login', \&rhn_login_xmlrpc);
- $pxt->register_xmlrpc('rhn_logout', \&rhn_logout_xmlrpc);
-}
-
# secures *all* intraserver links and all links to specified exterior servers
sub secure_links_if_logged_in {
my $pxt = shift;
@@ -525,43 +517,6 @@ sub rhn_logout_cb {
}
-sub rhn_login_xmlrpc {
- my $pxt = shift;
- my $params = shift;
- # sadly, this was necessary. we've broken the "old" (closed) protocols
-
- if (ref $params ne 'HASH') {
- $pxt->rpc_fault('old_client');
- }
-
- my ($username, $password) = ($params->{username}, $params->{password});
-
- if ($pxt->session->uid) {
- warn "User already logged in";
- return $pxt->user->id;
- }
-
- my $user = RHN::User->check_login($username, $password);
-
- if ($user and !($user->is_disabled())) {
- $pxt->session->uid($user->id);
- $pxt->touch_session;
- $pxt->session->serialize;
- }
- else {
- $pxt->rpc_fault("invalid_login");
- }
-
- return $user ? $pxt->session->key : undef;
-}
-
-sub rhn_logout_xmlrpc {
- my $pxt = shift;
- my $session = shift;
-
- $pxt->clear_session;
-}
-
sub admin_user_edit_cb {
my $pxt = shift;
commit 8796503a351716afc73fb2cbc32444735e27b2ca
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:55:39 2009 +0100
Removal of server_outdated_package_list_xmlrpc made outdated_package_overview not
needed, removing.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 3c03a0e..ac0d273 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -1902,131 +1902,6 @@ EOS
}
-sub outdated_package_overview {
- my $self = shift;
- my %params = @_;
-
- my ($lower, $upper, $total_ref, $all) = map { $params{"-" . $_} } qw/lower
upper total_rows all/;
-
- $lower ||= 1;
- $upper ||= 100000;
-
- $$total_ref = 0;
-
- my $dbh = RHN::DB->connect;
-
- my $query = <<EOQ;
-SELECT
- pn.id || '|' || lookup_evr(full_list.evr.epoch, full_list.evr.version,
full_list.evr.release) ID_COMBO,
- full_list.server_id,
- pn.id,
- lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release),
- pn.name ||'-'|| full_list.evr.version || '-' ||
full_list.evr.release || DECODE(full_list.evr.epoch, NULL, '', ':' ||
full_list.evr.epoch),
- full_list.errata_id,
- full_list.errata_advisory,
- full_list.evr.epoch,
- full_list.evr.version,
- full_list.evr.release,
- E.advisory_type
-FROM rhnErrata E,
- (
- SELECT SOP.package_name_id name_id, MAX(pe.evr) evr, SOP.server_id server_id,
SOP.errata_id errata_id, SOP.errata_advisory errata_advisory
- FROM
- rhnPackageEVR PE,
- rhnServerOutdatedPackages SOP
- WHERE SOP.server_id = ?
- AND SOP.package_evr_id = PE.id
- GROUP BY SOP.package_name_id, SOP.server_id, SOP.errata_id, SOP.errata_advisory
- ) full_list,
- rhnPackageName PN
-WHERE
- full_list.name_id = PN.id
- AND full_list.errata_id = E.id (+)
-ORDER BY UPPER(PN.name)
-EOQ
-
- my $sth = $dbh->prepare($query);
-
- $sth->execute($self->id);
-
- my %latest;
-
- while (my @row = $sth->fetchrow) {
-
- my @eids;
- my @eadvs;
- my @etypes;
-
- push @eids, $row[5] if $row[5];
- push @eadvs, $row[6] if $row[6];
- push @etypes, $row[10] if $row[10];
-
- if (not exists $latest{$row[2]}) {
- $latest{$row[2]} = \@row;
- }
- else {
- my $cmp = RHN::Package->vercmp($row[7],
- $row[8],
- $row[9],
- $latest{$row[2]}->[7],
- $latest{$row[2]}->[8],
- $latest{$row[2]}->[9]);
-
- push @eids, @{$latest{$row[2]}->[5]};
- push @eadvs, @{$latest{$row[2]}->[6]};
-
- $latest{$row[2]} = \@row
- if $cmp >= 0;
- }
- $latest{$row[2]}->[5] = \@eids;
- $latest{$row[2]}->[6] = \@eadvs;
- $latest{$row[2]}->[7] = \@etypes;
- }
-
- my @ret;
- my $i = 1;
-
- foreach my $nid (sort { $latest{$a}->[4] cmp $latest{$b}->[4] } keys %latest) {
- $$total_ref = $i;
- if ($all or ($i >= $lower and $i <= $upper)) {
- push @ret, [ @{$latest{$nid}}[0 .. 7] ];
- }
- $i++;
- }
-
- $sth = $dbh->prepare(<<EOS);
-SELECT SPN.name || '-' || SPE.evr.as_vre_simple()
- FROM rhnPackageName SPN,
- rhnPackageEVR SPE,
- rhnPackageEVR PE,
- rhnServerPackage SP
- WHERE SP.server_id = ?
- AND SP.name_id = ?
- AND PE.id = ?
- AND SPE.id = SP.evr_id
- AND SPN.id = SP.name_id
- AND SP.evr_id != PE.id
- AND SPE.evr < PE.evr
-ORDER BY UPPER(SPN.name), SPE.evr DESC
-EOS
-
- foreach my $row (@ret) {
- my $nid = $row->[2];
- my $eid = $row->[3];
-
- $sth->execute($self->id, $nid, $eid);
-
- my @evr;
- while (my ($installed_package_vre) = $sth->fetchrow) {
- push @evr, $installed_package_vre;
- }
-
- $row->[8] = join(", ", @evr);
- }
-
- return @ret;
-}
-
sub package_groups {
my $self = shift;
commit 1979a2b6fbefe04c7416c66bfdbf3bc6622470b8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:54:05 2009 +0100
No xmlrpc in Sniglets::Servers anymore, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 5d74233..787e411 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -120,15 +120,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:osa-ping' => \&osa_ping_cb);
}
-sub register_xmlrpc {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_xmlrpc('server_needed_packages',
\&server_outdated_package_list_xmlrpc);
- $pxt->register_xmlrpc('server_schedule_errata_update',
\&server_schedule_errata_update_xmlrpc);
- $pxt->register_xmlrpc('server_schedule_package_update',
\&server_schedule_package_update_xmlrpc);
-}
-
sub osa_ping_cb {
my $pxt = shift;
my $sid = $pxt->param('sid');
@@ -985,61 +976,6 @@ sub handle_system_entitlement_change {
return;
}
-sub server_outdated_package_list_xmlrpc {
- my $pxt = shift;
- my $params = shift;
-
- my ($token, $sid) = @{$params}{qw/token server_id/};
- $pxt->user->verify_system_access($sid) or die "No permissions to
server";
-
- my $server = RHN::Server->lookup(-id => $sid);
-
- my $unused;
- my @rows = $server->outdated_package_overview(-lower => 0, -upper => 10000,
-total_rows => \$unused);
-
- my @ret = map { { (nvre => $_->[4], advisory => $_->[6] || '',
errata_id => $_->[5], name_id => $_->[2], evr_id => $_->[3]) } } @rows;
-
- return \@ret;
-}
-
-sub server_schedule_package_update_xmlrpc {
- my $pxt = shift;
- my $params = shift;
- my ($token, $sid, $name_id, $evr_id) = @{$params}{qw/token server_id name_id evr_id/};
-
- $pxt->user->verify_system_access($sid) or die "No permissions to
server";
- my $server = RHN::Server->lookup(-id => $sid);
-
- my $package_id = RHN::Package->guestimate_package_id(-server_id => $sid, -name_id
=> $name_id, -evr_id => $evr_id);
-
- my $earliest_date = RHN::Date->now->long_date;
- my $action_id = RHN::Scheduler->schedule_package_install(-org_id =>
$pxt->user->org_id,
- -user_id => $pxt->user->id,
- -earliest => $earliest_date,
- -package_id => $package_id,
- -server_id => $server->id);
-
- return $action_id;
-}
-
-sub server_schedule_errata_update_xmlrpc {
- my $pxt = shift;
- my $params = shift;
- my ($token, $sid, $eid) = @{$params}{qw/token server_id errata_id/};
-
- $pxt->user->verify_system_access($sid) or die "No permissions to
server";
- my $server = RHN::Server->lookup(-id => $sid);
-
- my $earliest_date = RHN::Date->now->long_date;
- my ($action_id) = RHN::Scheduler->schedule_errata_updates_for_system(-org_id =>
$pxt->user->org_id,
- -user_id => $pxt->user->id,
- -earliest => $earliest_date,
- -errata_ids => [ $eid ],
- -server_id => $server->id);
-
- return $action_id;
-}
-
sub server_network_details {
my $pxt = shift;
my %params = @_;
commit e2726bd7babb34719f24f12ce61f47703ec24672
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:47:00 2009 +0100
Package Sniglets::Satellite is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Satellite.pm
b/web/modules/sniglets/Sniglets/Satellite.pm
deleted file mode 100644
index 9fe72f8..0000000
--- a/web/modules/sniglets/Sniglets/Satellite.pm
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-
-package Sniglets::Satellite;
-
-use RHN::Exception;
-use MIME::Lite;
-use MIME::Base64;
-use RHN::Mail;
-use PXT::Config;
-
-sub register_xmlrpc {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_xmlrpc('satellite.send_debug_data', \&send_debug_data);
- $pxt->register_xmlrpc('satellite.server_set_base_channel',
\&server_set_base_channel);
- $pxt->register_xmlrpc('satellite.server_clear_groups',
\&server_clear_groups);
- $pxt->register_xmlrpc('satellite.server_clear_channels',
\&server_clear_channels);
- $pxt->register_xmlrpc('satellite.server_join_groups',
\&server_join_groups);
- $pxt->register_xmlrpc('satellite.server_subscribe_channels',
\&server_subscribe_channels);
-}
-
-
-
-sub server_join_groups {
- my $pxt = shift;
- my $system_id = shift;
- my @server_groups = @{+shift};
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- my $E = $@;
- if ($E) {
- warn "lookup_cert: $E";
-
- $pxt->rpc_fault('invalid_certificate');
- }
-
- my %server_groups = map { $_ => 1 } @server_groups;
- my @group_ids = map { $_->[1] } grep { $_->[0] == 0 and exists
$server_groups{$_->[2]} } $server->visible_group_list_for_server();
-
- RHN::Server->add_servers_to_groups([$server->id], \@group_ids);
-
- return [];
-}
-
-sub server_clear_groups {
- my $pxt = shift;
- my $system_id = shift;
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- my $E = $@;
- if ($E) {
- warn "lookup_cert: $E";
-
- $pxt->rpc_fault('invalid_certificate');
- }
-
- my @group_ids = map { $_->[1] } grep { $_->[0] == 1 }
$server->visible_group_list_for_server();
-
- RHN::Server->remove_servers_from_groups([$server->id], \@group_ids);
-
- return [];
-}
-
-sub server_set_base_channel {
- my $pxt = shift;
- my $system_id = shift;
- my $channel_label = shift;
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- my $E = $@;
- if ($E) {
- warn "lookup_cert: $E";
-
- $pxt->rpc_fault('invalid_certificate');
- }
-
- my $channel_id = RHN::Channel->channel_id_by_label($channel_label);
-
- return [ 'Error', "No such base channel '$channel_label'" ]
- unless defined $channel_id;
-
- $server->change_base_channel($channel_id);
-
- return [];
-}
-
-sub server_subscribe_channels {
- my $pxt = shift;
- my $system_id = shift;
- my @channel_labels = @{+shift};
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- my $E = $@;
- if ($E) {
- warn "lookup_cert: $E";
-
- $pxt->rpc_fault('invalid_certificate');
- }
-
- my @channel_ids = map { RHN::Channel->channel_id_by_label($_) } @channel_labels;
-
- my @errors;
- for my $i (0 .. $#channel_labels) {
- push @errors, [ 'Error', "No such channel
'$channel_labels[$i]'" ]
- unless defined $channel_ids[$i];
- }
-
- $server->subscribe_to_channel($_) for grep { defined $_ } @channel_ids;
-
- return @errors;
-}
-
-sub server_clear_channels {
- my $pxt = shift;
- my $system_id = shift;
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- my $E = $@;
- if ($E) {
- warn "lookup_cert: $E";
-
- $pxt->rpc_fault('invalid_certificate');
- }
-
- $server->unsubscribe_from_channel($_) for $server->server_channel_ids;
-
- return [];
-}
-
-sub send_debug_data {
- my $pxt = shift;
- my $debug_file = MIME::Base64::decode_base64(shift);
-
- my $to = PXT::Config->get('traceback_mail');
- my $mime = MIME::Lite->new(From => PXT::Config->get('product_name') .
" <rhn-admin\(a)rhn.redhat.com>",
- To => $to,
- Subject => PXT::Config->get('product_name') . " Debug
Dump",
- Type => "application/octet-stream",
- Data => $debug_file,
- Encoding => "base64",
- Filename => "satellite-debug.tar.bz2");
-
- RHN::Mail->send_raw($mime->as_string);
-
- return 1;
-}
-
-1;
commit 1e8cca108b6562879d7c0a13153150fa82834fa5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:44:25 2009 +0100
Package Sniglets::Proxy is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Proxy.pm
b/web/modules/sniglets/Sniglets/Proxy.pm
deleted file mode 100644
index f486e98..0000000
--- a/web/modules/sniglets/Sniglets/Proxy.pm
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-### THIS SHOULD ALL BE DEPRECATED SOMEDAY, EXCEPT THERE MIGHT BE OLD PROXIES OUT THERE
:(
-
-use strict;
-
-package Sniglets::Proxy;
-
-use RHN::Exception;
-use MIME::Lite;
-use MIME::Base64;
-use RHN::Mail;
-
-sub register_xmlrpc {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_xmlrpc('proxy.activate_proxy', \&activate_proxy_xmlrpc);
- $pxt->register_xmlrpc('proxy.send_debug_data', \&send_debug_data);
-}
-
-sub activate_proxy_xmlrpc {
- my $pxt = shift;
- my $system_id = shift;
- my $version = shift;
-
- my $transaction = RHN::DB->connect();
- $transaction->nest_transactions();
-
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- if ($@) {
- $pxt->rpc_fault('proxy_invalid_systemid');
- }
-
- eval {
- unless ($server->has_entitlement('enterprise_entitled')) {
- $transaction = $server->entitle_server('enterprise_entitled');
- }
- $transaction->commit;
- };
-
- my $E = $@;
- if ($E) {
- $transaction->nested_rollback();
-
- if (ref $E and catchable($E) and
$E->is_rhn_exception('servergroup_max_members')) {
- $pxt->rpc_fault("proxy_no_enterprise_entitlements");
- }
-
- # couldn't handle it; ISE and report
- throw $E;
- }
-
- eval {
- $server->activate_proxy(version => $version);
- };
-
- $E = $@;
- if ($E) {
- $transaction->nested_rollback();
-
- if (ref $E and catchable($E)) {
- if ($E->is_rhn_exception('channel_family_no_subscriptions')) {
- $pxt->rpc_fault('proxy_no_channel_entitlements');
- }
- elsif ($E->is_rhn_exception('proxy_no_proxy_child_channel')) {
- $pxt->rpc_fault('proxy_no_proxy_child_channel');
- }
- }
-
- # couldn't handle it; ISE and report
- throw $E;
- }
-
- $transaction->nested_commit();
-
- return 1;
-}
-
-sub send_debug_data {
- my $pxt = shift;
- my $debug_file = MIME::Base64::decode_base64(shift);
-
- my $to = PXT::Config->get('traceback_mail');
-
- my $mime = MIME::Lite->new(From => PXT::Config->get('product_name') .
" <rhn-admin\(a)rhn.redhat.com>",
- To => $to,
- Subject => "RHN Proxy Debug Dump",
- Type => "application/octet-stream",
- Data => $debug_file,
- Encoding => "base64",
- Filename => "proxy-debug.tar.bz2");
-
- RHN::Mail->send_raw($mime->as_string);
-
- return 1;
-}
-
-1;
commit f6e4f448384c5a8c5db3dd1696949b5431fbf983
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:41:30 2009 +0100
Package Sniglets::ListView::Dobby is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/ListView/Dobby.pm
b/web/modules/sniglets/Sniglets/ListView/Dobby.pm
deleted file mode 100644
index f1c5080..0000000
--- a/web/modules/sniglets/Sniglets/ListView/Dobby.pm
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-
-package Sniglets::ListView::Dobby;
-
-use Sniglets::ListView::List;
-use RHN::Exception qw/throw/;
-use RHN::Token;
-use RHN::DataSource::Dobby;
-
-use Data::Dumper;
-
-our @ISA = qw/Sniglets::ListView::List/;
-
-my %mode_data;
-sub mode_data { return \%mode_data }
-
-_register_modes();
-
-sub trap {
- return "rhn:dev_dobby_cb";
-}
-
-sub _register_modes {
- Sniglets::ListView::List->add_mode(-mode => "tablespace_overview",
- -datasource => RHN::DataSource::Dobby->new,
- -provider => \&tablespace_overview_provider);
-}
-
-sub tablespace_overview_provider {
- my $self = shift;
- my $pxt = shift;
-
- my %ret = $self->default_provider($pxt);
-
- my $data = $ret{data};
- foreach my $row (@{$data}) {
- $row->{PERCENT_USED} = sprintf("%.02f%%", $row->{PERCENT_USED} *
100);
- }
-
- return %ret;
-}
-
-1;
commit d4ca9239438baa973bdbabd2c06cbbec6dd7c762
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:37:45 2009 +0100
Removal of RHN::ServerPackage makes RHN::DB::ServerPackage unused, removing as dead
code.
diff --git a/web/modules/rhn/RHN/DB/ServerPackage.pm
b/web/modules/rhn/RHN/DB/ServerPackage.pm
deleted file mode 100644
index 73ed4a9..0000000
--- a/web/modules/rhn/RHN/DB/ServerPackage.pm
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-# represents packages on servers. we only know nvre about these things, apparently...
-
-use strict;
-
-package RHN::DB::ServerPackage;
-
-use RHN::DB;
-use Carp;
-
-# given a server id, spit back the entire list of packages on a server...
-sub package_list_by_server {
- my $class = shift;
-
-}
-
-# given a server id and package group, spit back the list of packages on a server in a
package group...
-sub package_list_by_group_by_server {
- my $class = shift;
- my %params = @_;
-
- my ($sid, $gupper, $glower) =
- map { $params{"-" . $_} } qw/sid gupper glower/;
-
- my $server = RHN::Server->lookup(-id => $sid);
- my $groups = $server->package_groups;
-
- my @pkgs;
-
- foreach my $upper (sort { lc $a cmp lc $b } keys %{$groups}) {
- next unless $gupper eq $upper;
-
- if ($glower) {
- push @pkgs, sort { lc $a cmp lc $b } @{$groups->{$gupper}->{$glower}};
- }
- else {
- push @pkgs, sort { lc $a cmp lc $b } map { @{$groups->{$gupper}->{$_}} } keys
%{$groups->{$gupper}};
- }
- }
-
- return @pkgs;
-}
-
-# arguments:
-# -org_id => $pxt->user->org_id, -lower => $lower,
-# -upper => $upper, -total_rows => \$total_rows,
-# -sid => $sid
-sub package_list_by_server_overview {
- my $class = shift;
- my %params = @_;
-
- my ($org_id, $lower, $upper, $total_ref, $sid, $gupper, $glower, $like) =
- map { $params{"-" . $_} } qw/org_id lower upper total_rows sid gupper
glower like/;
-
- $lower ||= 1;
- $upper ||= 100000;
-
- my $dbh = RHN::DB->connect;
-
- my @result;
-
- my $i = 1;
- $$total_ref = 0;
-
- if (!$gupper) {
-
-
- my $and_clause = '';
- if ($like) {
- $and_clause = 'AND SP_NAME.name LIKE ?';
- }
-
- my $query = <<EOQ;
- SELECT SP_NAME.name, SP_EVR.evr.as_vre_simple() NVRE, SP.name_id || '|' ||
SP.evr_id
- FROM rhnPackageEvr SP_EVR, rhnPackageName SP_NAME, rhnServerPackage SP
- WHERE SP.server_id = ?
- AND SP.name_id = SP_NAME.id
- AND SP.evr_id = SP_EVR.id
- $and_clause
-ORDER BY UPPER(SP_NAME.name), SP_EVR.evr DESC
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute($sid, $like ? "%$like%" : ());
-
-
- while (my @data = $sth->fetchrow) {
- $$total_ref = $i;
- if ($i >= $lower and $i <= $upper) {
- push @result, [ @data ];
- }
- $i++;
- }
- $sth->finish;
- } else {
-
- # hrm. theoretically, this could be a large number of packages,
- # which means a decent sized data structure. Could optimize here probably.
- my @temp_results = RHN::DB::ServerPackage->package_list_by_group_by_server(-sid
=> $sid, -gupper => $gupper, -glower => $glower);
- my @temp_results2 = sort { (lc $a->[1]) cmp (lc $b->[1]) } @temp_results;
-
- #warn "(hopefully xsorted) Packages in group $gupper".($glower ? "
($glower)" : "").":
".Data::Dumper->Dump([(@temp_results2)]);
- foreach my $data (@temp_results2) {
- $$total_ref = $i;
- if ($i >= $lower and $i <= $upper) {
-# warn "total == $$total_ref, lower == $lower, upper == $upper, i == $i";
- push @result, $data;
- }
- $i++;
- }
- }
-
- return @result;
-}
-
-1;
commit 13ce9e28af42934fd49fb185f476b7d5b247e13a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:36:24 2009 +0100
Package RHN::ServerPackage is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/ServerPackage.pm b/web/modules/rhn/RHN/ServerPackage.pm
deleted file mode 100644
index f526520..0000000
--- a/web/modules/rhn/RHN/ServerPackage.pm
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-
-# represents packages on servers. we only know nvre about these things, apparently...
-
-use strict;
-
-package RHN::ServerPackage;
-
-use RHN::DB::ServerPackage;
-
-# given a server id, spit back the entire list of packages on a server...
-sub package_list_by_server {
- my $class = shift;
-
- return RHN::DB::ServerPackage->package_list_by_server(@_);
-}
-
-# given a server id and package group, spit back the list of packages on a server in a
package group...
-sub package_list_by_group_by_server {
- my $class = shift;
-
- return RHN::DB::ServerPackage->package_list_by_group_by_server(@_);
-}
-
-sub package_list_by_server_overview {
- my $class = shift;
-
- return RHN::DB::ServerPackage->package_list_by_server_overview(@_);
-}
-
-1;
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 268a754..90a7280 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -222,7 +222,6 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/ServerGroup.pm
%{perl_vendorlib}/RHN/ServerMessage.pm
%{perl_vendorlib}/RHN/ServerNotes.pm
-%{perl_vendorlib}/RHN/ServerPackage.pm
%{perl_vendorlib}/RHN/Session.pm
%{perl_vendorlib}/RHN/Set.pm
%{perl_vendorlib}/RHN/SimpleStruct.pm
commit ea6ea88735ada62aeb2f5075276c20eb8a048126
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:35:07 2009 +0100
Package RHN::Message is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/Message.pm b/web/modules/rhn/RHN/Message.pm
deleted file mode 100644
index 59ba72d..0000000
--- a/web/modules/rhn/RHN/Message.pm
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-package RHN::Message;
-
-use strict;
-use RHN::ServerMessage;
-use RHN::TextMessage;
-use RHN::Utils;
-use RHN::DB::Message;
-
-our @ISA = qw/RHN::DB::Message/;
-
-sub get_user_messages {
- my $class = shift;
- my @attr = @_;
-
- my $messages = RHN::DB::Message->user_messages(@attr);
- my @messages = ( );
-
- if (ref $messages and @{$messages} > 0) {
- @messages = RHN::Utils->parameterize($messages, qw/id type priority status
server_id server_event body created modified/)
- }
-
- return [ @messages ];
-}
-
-sub lookup {
- my $class = shift;
- my $message_id = shift;
-
- my $msg = RHN::DB::Message::TextMessage->lookup_message($message_id);
-
- return $msg if defined $msg;
-
- $msg = RHN::DB::Message::ServerMessage->lookup_message($message_id);
-
- return $msg;
-}
-
-1;
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 7af3df9..268a754 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -199,7 +199,6 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/Kickstart/
%{perl_vendorlib}/RHN/Mail.pm
%{perl_vendorlib}/RHN/Manifest.pm
-%{perl_vendorlib}/RHN/Message.pm
%{perl_vendorlib}/RHN/MonitoringConfigMacro.pm
%{perl_vendorlib}/RHN/Org.pm
%{perl_vendorlib}/RHN/Package.pm
commit 1249b776313600bef304b21ce27f131b627fcf52
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:34:05 2009 +0100
Package RHN::Kickstart::Template is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/Kickstart/Template.pm
b/web/modules/rhn/RHN/Kickstart/Template.pm
deleted file mode 100644
index a624f35..0000000
--- a/web/modules/rhn/RHN/Kickstart/Template.pm
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-package RHN::Kickstart::Template;
-
-use PXT::Config;
-use RHN::Kickstart;
-use RHN::Kickstart::Commands;
-use RHN::Kickstart::Partitions;
-use RHN::KSTree;
-
-use Data::Dumper;
-
-sub get_template_ks {
- my $class = shift;
- my $org_id = shift;
- my $install_type = shift || 'rhel_2.1';
-
- die "No org id" unless $org_id;
-
- my %commands = (-install => '',
- -text => '',
- -network => [ qw/--bootproto dhcp/ ],
- -url => [ qw(--url
http://rhn.webdev.redhat.com/kickstart/dist/<dist>/) ],
- -auth => [ qw(--enablemd5 --enableshadow) ],
- -bootloader => [ qw(--location mbr) ],
- -lang => 'en_US',
- -langsupport => [ qw(--default en_US en_US) ],
- -keyboard => 'us',
- -mouse => 'none',
- -zerombr => 'yes',
- -clearpart => [ qw/--all/ ],
- -firewall => [ qw/--disabled/ ],
- -rootpw => '',
- -timezone => [ 'America/New_York' ],
- -skipx => '',
- -reboot => '',
- );
-
- if ($install_type eq 'rhel_4') {
- $commands{-partitions} = new RHN::Kickstart::Partitions( [ qw(/boot --fstype=ext3
--size=200) ],
- [ qw(swap --size=2000) ],
- [ qw(pv.01 --size=1000 --grow) ],
- );
- $commands{-volgroups} = new RHN::Kickstart::Volgroups( [ qw(myvg pv.01) ] );
- $commands{-logvols} = new RHN::Kickstart::Logvols( [ qw(/ --vgname=myvg
--name=rootvol --size=1000 --grow) ] );
- }
- else {
- $commands{-partitions} = new RHN::Kickstart::Partitions( [ qw(/boot --fstype=ext3
--size=200) ],
- [qw(swap --size=1000 --grow --maxsize=2000) ],
- [ qw(/ --fstype=ext3 --size=700 --grow) ]
- );
- }
-
- my @packages = ('@ Base');
-
- my $ks = new RHN::Kickstart(-name => 'New Kickstart profile',
- -label => 'new_kickstart_profile',
- -commands => \%commands,
- -org_id => $org_id);
-
- $ks->packages(@packages);
-
- my $post = q!
-# MOTD
-echo >> /etc/motd
-echo "RHN kickstart on $(date +'%Y-%m-%d')" >> /etc/motd
-echo >> /etc/motd
-!;
-
- $ks->post($post);
-
- my $host = PXT::Config->get('kickstart_host') ||
PXT::Config->get('base_domain');
- $ks->change_url_host($host);
-
- return $ks;
-}
-
-1;