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

fixes for snmp v3 monitoring

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@17015 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2013-07-24 07:37:32 +00:00
parent ac3c7fe28c
commit bd4d78da84
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/blade.pm
View File

@ -1738,7 +1738,7 @@ sub rscan_stanza {
$objname =~ tr/A-Z/a-z/;
} else {
$objname = $data[1];
}
}
$result .= "$objname:\n\tobjtype=node\n";
foreach ( @rscan_attribs ) {
@ -4471,7 +4471,7 @@ sub clicmds {
my $reset;
foreach (keys %handled) {
if (/^snmpcfg/) { $result = snmpcfg($t,$handled{$_},$user,$pass,$mm); }
if (/^snmpcfg/) { $result = snmpcfg($t,$handled{$_},$user,$pass,$mm,$node); }
elsif (/^sshcfg$/) { $result = sshcfg($t,$handled{$_},$user,$mm); }
elsif (/^network$/) { $result = network($t,$handled{$_},$mpa,$mm,$node,$nodeid); }
elsif (/^initnetwork$/) { $result = network($t,$handled{$_},$mpa,$mm,$node,$nodeid,1); $reset=1; }
@ -4981,6 +4981,7 @@ sub snmpcfg {
my $uid = shift;
my $pass = shift;
my $mm = shift;
my $node = shift;
if ($value !~ /^enable|disable$/i) {
return([1,"Invalid argument '$value' (enable|disable)"]);
@ -5018,10 +5019,11 @@ sub snmpcfg {
}
my $cmd;
my $ipfn = xCAT::Utils->my_ip_facing($node);
if ($mptype =~ /^[a]?mm$/) {
$cmd= "users -$id -ap sha -at write -ppw $pass -pp $pp -T system:$mm";
} elsif ($mptype eq "cmm"){
$cmd= "users -n $uid -ap sha -at set -ppw $pass -pp $pp -T system:$mm";
$cmd= "users -n $uid -ap sha -at set -ppw $pass -pp $pp -T system:$mm -i $ipfn";
}
@data = $t->cmd($cmd);