From b4698dec048aaa7ae8ad0921fa0d1787a1f3b5b3 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 23 May 2012 05:30:19 +0000
Subject: [PATCH] For the places that open site table to read attributes,
 change to call xCAT::Utils->get_site_attribute instead

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12889 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/pxe.pm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm
index ec6a2bc98..b8109bc54 100644
--- a/xCAT-server/lib/xcat/plugins/pxe.pm
+++ b/xCAT-server/lib/xcat/plugins/pxe.pm
@@ -266,7 +266,7 @@ sub pass_along {
 sub preprocess_request {
    #Assume shared tftp directory for boring people, but for cool people, help sync up tftpdirectory contents when 
    #they specify no sharedtftp in site table
-   my $stab = xCAT::Table->new('site');
+   #my $stab = xCAT::Table->new('site');
    my $req = shift;
    my $callback1 = shift;
    my $command = $req->{command}->[0];
@@ -315,8 +315,10 @@ sub preprocess_request {
         return;
     }
 
-   my $sent = $stab->getAttribs({key=>'sharedtftp'},'value');
-   if ($sent and ($sent->{value} == 0 or $sent->{value} =~ /no/i)) {
+   #my $sent = $stab->getAttribs({key=>'sharedtftp'},'value');
+   my @entries =  xCAT::Utils->get_site_attribute("sharedtftp");
+   my $t_entry = $entries[0];
+   if ( defined($t_entry) and ($t_entry == 0 or $t_entry =~ /no/i)) {
       $req->{'_disparatetftp'}=[1];
       if ($req->{inittime}->[0]) {
           return [$req];
@@ -515,13 +517,15 @@ sub process_request {
   #dhcp stuff -- inittime is set when xcatd on sn is started
   unless (($args[0] eq 'stat') || ($inittime) || ($args[0] eq 'offline')) {
       my $do_dhcpsetup=1;
-      my $sitetab = xCAT::Table->new('site');
-      if ($sitetab) {
-          (my $ref) = $sitetab->getAttribs({key => 'dhcpsetup'}, 'value');
-          if ($ref) {
-             if ($ref->{value} =~ /0|n|N/) { $do_dhcpsetup=0; }
+      #my $sitetab = xCAT::Table->new('site');
+      #if ($sitetab) {
+          #(my $ref) = $sitetab->getAttribs({key => 'dhcpsetup'}, 'value');
+          my @entries =  xCAT::Utils->get_site_attribute("dhcpsetup");
+          my $t_entry = $entries[0];  
+          if ( defined($t_entry) ) {
+             if ($t_entry =~ /0|n|N/) { $do_dhcpsetup=0; }
           }
-      }
+      #}
       
       if ($do_dhcpsetup) {
         if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command