From 69d99bc89812a544f50bf6fe147060ed8ee1f40c Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 7 Jun 2011 03:06:15 +0000
Subject: [PATCH] change the way of getting node type

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

diff --git a/xCAT-server/lib/xcat/monitoring/monitorctrl.pm b/xCAT-server/lib/xcat/monitoring/monitorctrl.pm
index 0dd1915dc..71d4e5444 100644
--- a/xCAT-server/lib/xcat/monitoring/monitorctrl.pm
+++ b/xCAT-server/lib/xcat/monitoring/monitorctrl.pm
@@ -15,6 +15,7 @@ use xCAT_plugin::notification;
 use xCAT_monitoring::montbhandler;
 use Sys::Hostname;
 use xCAT::GlobalDef;
+use xCAT::DBobjUtils;
 
 #the list stores the names of the monitoring plug-in and the file name and module names.
 #the names are stored in the "name" column of the monitoring table. 
@@ -965,9 +966,10 @@ sub getMonHierarchy {
 
       my $row3=$temp_hash3{$node};
       my $nodetype=""; #default
-      if (defined($row3) && ($row3)) {
-        if ($row3->{nodetype}) { $nodetype=$row3->{nodetype}; }
-      }
+      #if (defined($row3) && ($row3)) {
+      #  if ($row3->{nodetype}) { $nodetype=$row3->{nodetype}; }
+      #}
+      $nodetype=xCAT::DBobjUtils->getnodetype($node);
 
       my $monserver;
       my $monmaster;
@@ -1066,9 +1068,10 @@ sub getMonServerWithInfo {
     my $tmp3= $tabdata->{$node}->[0];
 
     my $nodetype=""; #default
-    if (defined($tmp3) && ($tmp3)) {
-      if ($tmp3->{nodetype}) { $nodetype=$tmp3->{nodetype}; }
-    }
+    #if (defined($tmp3) && ($tmp3)) {
+    #  if ($tmp3->{nodetype}) { $nodetype=$tmp3->{nodetype}; }
+    #}
+    $nodetype=xCAT::DBobjUtils->getnodetype($node);
 
     my $pairs=$pPairHash->{$node};
 
@@ -1136,9 +1139,10 @@ sub getMonServer {
 
       my $tmp3=$tabdata3->{$node}->[0];
       my $nodetype=""; #default
-      if (defined($tmp3) && ($tmp3)) {
-	if ($tmp3->{nodetype}) { $nodetype=$tmp3->{nodetype}; }
-      }
+      #if (defined($tmp3) && ($tmp3)) {
+      # if ($tmp3->{nodetype}) { $nodetype=$tmp3->{nodetype}; }
+      #}
+      $nodetype=xCAT::DBobjUtils->getnodetype($node);
 
       my $pairs=$pPairHash->{$node};