From b11b8a8d08475705e99c7fe3031557fd7214ed80 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 18 May 2012 05:54:14 +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@12785 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/MacMap.pm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/perl-xCAT/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm
index 395739517..cfe643b47 100644
--- a/perl-xCAT/xCAT/MacMap.pm
+++ b/perl-xCAT/xCAT/MacMap.pm
@@ -165,9 +165,11 @@ sub rvlan {
     #  operation => "pvid=<vid> or vlan=<vid>" for now, addvlan= and delvlan= for tagged vlans, 'pvid', vlan, or stat without = checks current value
     my $self=shift;
     my $community = "public";
-    $self->{sitetab} = xCAT::Table->new('site');
-    my $tmp = $self->{sitetab}->getAttribs({key=>'snmpc'},'value');
-    if ($tmp and $tmp->{value}) { $community = $tmp->{value} }
+    #$self->{sitetab} = xCAT::Table->new('site');
+    #my $tmp = $self->{sitetab}->getAttribs({key=>'snmpc'},'value');
+    my @snmpcs =  xCAT::Utils->get_site_attribute("snmpc");
+    my $tmp = $snmpcs[0];
+    if ( defined($tmp) ) { $community = $tmp }
     my %args = @_;
     my $op=$args{operation};
     my $nodes=$args{nodes};
@@ -287,9 +289,12 @@ sub refresh_table {
   $self->{switchestab} = xCAT::Table->new('switches', -create => 1);
   my @switchentries=$self->{switchestab}->getAllNodeAttribs([qw(switch snmpversion username password privacy auth)]);
   my $community = "public";
-  $self->{sitetab} = xCAT::Table->new('site');
-  my $tmp = $self->{sitetab}->getAttribs({key=>'snmpc'},'value');
-  if ($tmp and $tmp->{value}) { $community = $tmp->{value} }
+  #$self->{sitetab} = xCAT::Table->new('site');
+  #my $tmp = $self->{sitetab}->getAttribs({key=>'snmpc'},'value');
+  #if ($tmp and $tmp->{value}) { $community = $tmp->{value} }
+  my @snmpcs =  xCAT::Utils->get_site_attribute("snmpc");
+  my $tmp = $snmpcs[0];
+  if ( defined($tmp) ) { $community = $tmp }
   else { #Would warn here.. 
   }
   $self->{switchparmhash}={};