web/modules/rhn/RHN/DB/Server.pm | 9 -- web/modules/rhn/RHN/DB/Server/NetInterface.pm | 86 -------------------------- web/modules/sniglets/Sniglets/Servers.pm | 62 ------------------ 3 files changed, 157 deletions(-)
New commits: commit e30b3100f597d78b622842962b179b56fbe30e90 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Oct 24 11:07:54 2011 +0200
code cleanup - package RHN::DB::Server::NetInterface is not used anymore
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm index 1eef958..22269cb 100644 --- a/web/modules/rhn/RHN/DB/Server.pm +++ b/web/modules/rhn/RHN/DB/Server.pm @@ -25,7 +25,6 @@ use RHN::DB::Server::CdDevice; use RHN::DB::Server::HwDevice; use RHN::DB::Server::StorageDevice; use RHN::DB::Server::NetInfo; -use RHN::DB::Server::NetInterface; use RHN::DB::TableClass;
use RHN::DataSource::Errata; diff --git a/web/modules/rhn/RHN/DB/Server/NetInterface.pm b/web/modules/rhn/RHN/DB/Server/NetInterface.pm deleted file mode 100644 index 238b75c..0000000 --- a/web/modules/rhn/RHN/DB/Server/NetInterface.pm +++ /dev/null @@ -1,86 +0,0 @@ -# -# Copyright (c) 2008--2010 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::DB::Server::NetInterface; - -use RHN::DB; -use Carp; -use RHN::DB::TableClass; - -# Corresponds to an entry in the rhnServerNetInterface table... - -my @net_interface_fields = qw/SERVER_ID NAME IP_ADDR NETMASK BROADCAST HW_ADDR MODULE/; - -my $n = new RHN::DB::TableClass("rhnServerNetInterface", "N", "", @net_interface_fields); - -# create a blank net info object -sub _blank_net_interface { - my $class = shift; - - my $self = bless {}, $class; - - return $self; -} - -# returns an array of net info objects given a server id -sub lookup_net_interface_by_server { - my $class = shift; - my $server_id = shift; - - my $dbh = RHN::DB->connect; - - my $query; - my $sth; - - $query = $n->select_query("N.SERVER_ID = ?"); - $sth = $dbh->prepare($query); - $sth->execute($server_id); - - my @ret; - my $count = 0; - - while (my @columns = $sth->fetchrow) { - if ($columns[0]) { - $ret[$count] = $class->_blank_net_interface; - $ret[$count]->{"__".$_."__"} = shift @columns foreach $n->method_names; - } - $count++; - } - - $sth->finish; - return @ret; -} - -# build some read-only accessors -foreach my $field ($n->method_names) { - my $sub = q { - sub RHN::DB::Server::NetInterface::[[field]] { - my $self = shift; - return $self->{__[[field]]__}; - } - }; - - $sub =~ s/[[field]]/$field/g; - eval $sub; - - if ($@) { - die $@; - } -} - - -return 1;
commit 43a21e5912d3d843dcadae2dba574b07dfee9f2f Author: Miroslav Suchý msuchy@redhat.com Date: Mon Oct 24 11:06:33 2011 +0200
code cleanup - function get_net_interfaces is not used anymore
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm index 36e5283..1eef958 100644 --- a/web/modules/rhn/RHN/DB/Server.pm +++ b/web/modules/rhn/RHN/DB/Server.pm @@ -1383,14 +1383,6 @@ sub get_net_infos { return @net_infos; }
-# returns an array of all the net info objects related to a server -sub get_net_interfaces { - my $self = shift; - - my @net_interfaces = RHN::DB::Server::NetInterface->lookup_net_interface_by_server($self->id); - return @net_interfaces; -} -
# # build some accessors
commit 77ab04a1efa346456ad65bf394883c0c12f8c4de Author: Miroslav Suchý msuchy@redhat.com Date: Mon Oct 24 11:05:47 2011 +0200
code cleanup - function server_network_interfaces is not used anymore
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm index 270b9fa..155a69b 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -690,64 +690,6 @@ sub server_network_details { return $ret; }
- -sub server_network_interfaces { - my $pxt = shift; - my %params = @_; - my $ret = ''; - my $current; - - my $server = $pxt->pnotes('server'); - - throw "No server." unless $server; - - my @net_interfaces = $server->get_net_interfaces; - - my %subst; - - if (not @net_interfaces) { - return ''; - } - - PXT::Debug->log(7, "got net_interfaces..."); - - my $block = $params{__block__}; - $block =~ m/<rhn-interface-data>(.*?)</rhn-interface-data>/gism; - my $device_data_block = $1; - - - my $unknown = '<span class="no-details">(unknown)</span>'; - my $html = ''; - my $counter = 1; - foreach my $interface (@net_interfaces) { - - my %subst; - if ($counter % 2) { - $subst{row_class} = 'list-row-odd'; - } - else { - $subst{row_class} = 'list-row-even'; - } - - - $subst{interface_name} = $interface->name; # NOT NULL - $subst{interface_ip_addr} = defined $interface->ip_addr ? PXT::Utils->escapeHTML($interface->ip_addr) : $unknown; - $subst{interface_netmask} = defined $interface->netmask ? PXT::Utils->escapeHTML($interface->netmask) : $unknown; - $subst{interface_broadcast} = defined $interface->broadcast ? PXT::Utils->escapeHTML($interface->broadcast) : $unknown; - $subst{interface_hw_addr} = defined $interface->hw_addr ? PXT::Utils->escapeHTML($interface->hw_addr) : $unknown; - $subst{interface_module} = defined $interface->module ? PXT::Utils->escapeHTML($interface->module) : $unknown; - - $html .= PXT::Utils->perform_substitutions($device_data_block, %subst); - $counter++; - } - - PXT::Debug->log(7, "html: $html"); - - $block =~ s{<rhn-interface-data>.*?</rhn-interface-data>}{$html}ism; - - return $block; -} - # must happen *after* server_hardware_profile... so use tags # correctly! sub server_device {
commit bed645fe345850a2654968d764cb7847162371a1 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Oct 24 11:04:27 2011 +0200
code cleanup - tag rhn-server-network-interfaces is not used anywhere
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm index 1407073..270b9fa 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -61,10 +61,6 @@ sub register_tags {
# has to run after server_details $pxt->register_tag('rhn-server-network-details' => &server_network_details, 2); - # slightly different than the rhn-server-network-details, this gives access to - # more detailed info about the network interfaces, as opposed to just hostname/ipaddy - $pxt->register_tag('rhn-server-network-interfaces' => &server_network_interfaces, 2); -
$pxt->register_tag('rhn-server-history-event-details' => &server_history_event_details);
spacewalk-commits@lists.fedorahosted.org