arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For the places that open site table to read attributes, change to call xCAT::Utils->get_site_attribute instead

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12895 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2012-05-23 06:09:35 +00:00
parent ec7513710f
commit 0624c69117
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
xCAT-server/lib/xcat/plugins/toolscenter.pm
View File

@ -61,12 +61,13 @@ sub preprocess_request
return [$req];
}
my $stab = xCAT::Table->new('site');
my $sent;
($sent) = $stab->getAttribs({key => 'sharedtftp'}, 'value');
unless ( $sent
and defined($sent->{value})
and ($sent->{value} =~ /no/i or $sent->{value} =~ /0/))
#my $stab = xCAT::Table->new('site');
#my $sent;
#($sent) = $stab->getAttribs({key => 'sharedtftp'}, 'value');
my @entries = xCAT::Utils->get_site_attribute("defserialport");
my $t_entry = $entries[0];
unless ( defined($t_entry)
and ($t_entry =~ /no/i or $t_entry =~ /0/))
{
#unless requesting no sharedtftp, don't make hierarchical call
@ -137,21 +138,23 @@ sub mknetboot
my @args = @{$req->{arg}};
my @nodes = @{$req->{node}};
my $ostab = xCAT::Table->new('nodetype');
my $sitetab = xCAT::Table->new('site');
#my $sitetab = xCAT::Table->new('site');
my $installroot = xCAT::Utils->getInstallDir();
my $tftpdir = xCAT::Utils->getTftpDir();
my $xcatiport;
if ($sitetab)
{
(my $ref) = $sitetab->getAttribs({key => 'xcatiport'}, 'value');
if ($ref and $ref->{value})
#if ($sitetab)
#{
#(my $ref) = $sitetab->getAttribs({key => 'xcatiport'}, 'value');
my @entries = xCAT::Utils->get_site_attribute("xcatiport");
my $t_entry = $entries[0];
if ( defined($t_entry) )
{
$xcatiport = $ref->{value};
$xcatiport = $t_entry;
}
}
#}
my %oents = %{$ostab->getNodesAttribs(\@nodes,[qw(os arch profile)])};
my $restab = xCAT::Table->new('noderes');
my $bptab = xCAT::Table->new('bootparams',-create=>1);