From bd4d78da84f0026807b54118408096e197fc6855 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 24 Jul 2013 07:37:32 +0000
Subject: [PATCH] fixes for snmp v3 monitoring

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@17015 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/blade.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index cfe420e8f..596b9a7f7 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -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);