From 92c1e16522f39eef1a1ec09f361124701ad9f376 Mon Sep 17 00:00:00 2001
From: zhaoertao <zhaoertao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 9 Aug 2012 03:51:11 +0000
Subject: [PATCH] for item: clean up Utils.pm, the code in xCAT-rmc/plugin/

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13462 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-rmc/plugin/rmcmon.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xCAT-rmc/plugin/rmcmon.pm b/xCAT-rmc/plugin/rmcmon.pm
index d3c6c3875..8b9e61cba 100644
--- a/xCAT-rmc/plugin/rmcmon.pm
+++ b/xCAT-rmc/plugin/rmcmon.pm
@@ -334,7 +334,7 @@ sub stop {
 
  
     #the identification of this node
-    my @hostinfo=xCAT::Utils->determinehostname();
+    my @hostinfo=xCAT::NetworkUtils->determinehostname();
     my $isSV=xCAT::Utils->isServiceNode();
 
     my %iphash=();
@@ -431,7 +431,7 @@ sub config {
   
  
   #the identification of this node
-  my @hostinfo=xCAT::Utils->determinehostname();
+  my @hostinfo=xCAT::NetworkUtils->determinehostname();
   my $isSV=xCAT::Utils->isServiceNode();
   my %iphash=();
   foreach(@hostinfo) {$iphash{$_}=1;}
@@ -535,7 +535,7 @@ sub deconfig {
   }
  
   #the identification of this node
-  my @hostinfo=xCAT::Utils->determinehostname();
+  my @hostinfo=xCAT::NetworkUtils->determinehostname();
   my $isSV=xCAT::Utils->isServiceNode();
   my %iphash=();
   foreach(@hostinfo) {$iphash{$_}=1;}
@@ -637,7 +637,7 @@ sub startNodeStatusMon {
       return (1, "");	
   }
 
-  my @hostinfo=xCAT::Utils->determinehostname();
+  my @hostinfo=xCAT::NetworkUtils->determinehostname();
   my %iphash=();
   foreach(@hostinfo) {$iphash{$_}=1;}
   if (!$isSV) { $iphash{'noservicenode'}=1;}
@@ -936,7 +936,7 @@ sub getNodeInfo
   my $node=shift;
   my $flag=shift;
 
-  my @hostinfo=xCAT::Utils->determinehostname();
+  my @hostinfo=xCAT::NetworkUtils->determinehostname();
   my %iphash=();
   foreach(@hostinfo) {$iphash{$_}=1;}
 
@@ -1020,7 +1020,7 @@ sub addNodes {
   my $flag=shift;
   print "rmcmon.addNodes mon_nodes=@mon_nodes, flag=$flag\n";
 
-  my @hostinfo=xCAT::Utils->determinehostname();
+  my @hostinfo=xCAT::NetworkUtils->determinehostname();
   my %iphash=();
   foreach(@hostinfo) {$iphash{$_}=1;}
   my $localhostname=hostname();
@@ -1075,7 +1075,7 @@ sub addNodes {
         return (1, "Cannot get nodeid for $ms_host_name"); 
       }
      
-      $result= xCAT::Utils::toIP( $master );
+      $result= xCAT::NetworkUtils::toIP( $master );
       if ( @$result[0] != 0 ) {
         reportError("Cannot resolve $master", $callback);
         return (1, "Cannot resolve $master"); 
@@ -1175,7 +1175,7 @@ sub addNodes {
   #let updatenode command to handle the normal nodes as a bulk
   if (@normal_nodes>0) {
     my $nr=join(',',@normal_nodes);
-    my $install_root = xCAT::Utils->getInstallDir();
+    my $install_root = xCAT::TableUtils->getInstallDir();
 
     #get the fanout value
     my %settings=xCAT_monitoring::monitorctrl->getPluginSettings("rmcmon");