From 84281c555bb40e9d54078ee0dc1e1c5b5d77a1a7 Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 4 Aug 2008 15:55:40 +0000
Subject: [PATCH] minor fix in monitoring

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1982 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/monitoring/snmpmon.pm |  6 ++++++
 xCAT-server/sbin/xcat_traphandler          | 23 ++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/xCAT-server/lib/xcat/monitoring/snmpmon.pm b/xCAT-server/lib/xcat/monitoring/snmpmon.pm
index 52812db54..9a611d71d 100644
--- a/xCAT-server/lib/xcat/monitoring/snmpmon.pm
+++ b/xCAT-server/lib/xcat/monitoring/snmpmon.pm
@@ -412,6 +412,7 @@ sub configBMC {
     print "XCATBYPASS=Y rspconfig $noderange alert=dis\n";
     my $result = `XCATBYPASS=Y rspconfig $noderange alert=dis 2>&1`;
     if ($?) {
+       $ret_val=1;
        xCAT::MsgUtils->message('S', "[mon]: Changeing SNMP PEF policy for IPMI nodes $noderange:\n  $result\n");
        $ret_text .= "Changeing SNMP PEF policy for IPMI nodes $noderange:\n  $result\n";
     } 
@@ -419,6 +420,7 @@ sub configBMC {
     print "XCATBYPASS=Y rspconfig $noderange alert=en\n";
     my $result = `XCATBYPASS=Y rspconfig $noderange alert=en 2>&1`;
     if ($?) {
+       $ret_val=1;
        xCAT::MsgUtils->message('S', "[mon]: Changeing SNMP PEF policy for IPMI nodes $noderange:\n  $result\n");
        $ret_text .= "Changeing SNMP PEF policy for IPMI nodes $noderange:\n  $result\n";
     } 
@@ -438,6 +440,7 @@ sub configBMC {
         print "XCATBYPASS=Y rspconfig $nr2 snmpdest=$ptmp->[1]\n";
         my $result2 = `XCATBYPASS=Y rspconfig $nr2 snmpdest=$ptmp->[1] 2>&1`;
         if ($?) {
+          $ret_val=1;
           xCAT::MsgUtils->message('S', "[mon]: Changing SNMP destination for IPMI nodes $nr2:\n  $result2\n");
 	  $ret_text .= "Changing SNMP destination for IPMI nodes $nr2:\n  $result2\n";
         }
@@ -543,6 +546,7 @@ sub configMPA {
     print "XCATBYPASS=Y rspconfig $noderange alert=dis\n";
     my $result = `XCATBYPASS=Y rspconfig $noderange alert=dis 2>&1`;
     if ($?) {
+       $ret_val=1;
        xCAT::MsgUtils->message('S', "[mon]: Changeing SNMP remote alert profile for Blade Center MM $noderange:\n  $result\n");
        $ret_text .= "Changeing SNMP remote alert profile for Blade Center MM $noderange:\n  $result\n";
     }
@@ -550,6 +554,7 @@ sub configMPA {
     print "XCATBYPASS=Y rspconfig $noderange alert=en\n";
     my $result = `XCATBYPASS=Y rspconfig $noderange alert=en 2>&1`;
     if ($?) {
+       $ret_val=1;
        xCAT::MsgUtils->message('S', "[mon]: Changeing SNMP remote alert profile for Blade Center MM $noderange:\n  $result\n");
        $ret_text .= "Changeing SNMP remote alert profile for Blade Center MM $noderange:\n  $result\n";
     }
@@ -569,6 +574,7 @@ sub configMPA {
         print "XCATBYPASS=Y rspconfig $nr2 snmpdest=$ptmp->[1]\n";
         my $result2 = `XCATBYPASS=Y rspconfig $nr2 snmpdest=$ptmp->[1] 2>&1`;
         if ($?) {
+          $ret_val=1;
           xCAT::MsgUtils->message('S', "[mon]: Changing SNMP destination for Blade Center MM $nr2:\n  $result2\n");
           $ret_text .= "Changing SNMP destination for Blade Center MM $nr2:\n  $result2\n";  
         }
diff --git a/xCAT-server/sbin/xcat_traphandler b/xCAT-server/sbin/xcat_traphandler
index 07e1c5482..65779904a 100755
--- a/xCAT-server/sbin/xcat_traphandler
+++ b/xCAT-server/sbin/xcat_traphandler
@@ -337,21 +337,14 @@ sub getMoreInfo {
   #get the position
   my $table1=xCAT::Table->new("nodepos", -create =>1);
   if ($table1) {
-    my $ref1 = $table1->getNodeAttribs($node, ['rack', 'u', 'chassis', 'slot',  'room']);
-    $pos .= "  Room: ";
-    if (($ref1) && ($ref1->{room})) { $pos .= $ref1->{room}; }
-    $pos .= "\n";
-    $pos .= "  Rack: ";
-    if(($ref1) && ($ref1->{rack})) { $pos .= $ref1->{rack};}
-    $pos .= "\n";
-    $pos .= "  Unit: ";
-    if(($ref1) && ($ref1->{u})) { $pos .= $ref1->{u}; }
-    $pos .= "\n";
-    $pos .= "  Chassis: ";
-    if(($ref1) && ($ref1->{chassis})) { $pos .= $ref1->{chassis};}
-    $pos .= "\n";
-    $pos .= "  Slot: ";
-    if(($ref1) && ($ref1->{slot})) { $pos .= $ref1->{slot};}
+    my $ref1 = $table1->getNodeAttribs($node, ['rack', 'u', 'chassis', 'slot',  'room', 'comments']);
+    if (($ref1) && ($ref1->{room})) { $pos .= "  Room: " . $ref1->{room}. "\n"; }
+    if(($ref1) && ($ref1->{rack})) { $pos .= "  Rack: ". $ref1->{rack}. "\n";}
+    if(($ref1) && ($ref1->{u})) { $pos .= "  Unit: " . $ref1->{u} . "\n"; }
+    if(($ref1) && ($ref1->{chassis})) { $pos .= "  Chassis: " . $ref1->{chassis} . "\n";}
+    if(($ref1) && ($ref1->{slot})) { $pos .=  "  Slot: " . $ref1->{slot} . "\n";}
+    if(($ref1) && ($ref1->{comments})) { $pos .=  "  Comments: " . $ref1->{comments} . "\n";}
+
     $pos .= "\n";
 
     $table1->close();