From 14afeedb9e110e07e23dc00d9da4010c4acc37d8 Mon Sep 17 00:00:00 2001
From: zhaoertao <zhaoertao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 14 Aug 2012 11:48:59 +0000
Subject: [PATCH] fix subroutine moving issue in xCAT-server/sbin/

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13503 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/sbin/pcp_collect      | 4 +++-
 xCAT-server/sbin/xcat_traphandler | 3 ++-
 xCAT-server/sbin/xcatd            | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/sbin/pcp_collect b/xCAT-server/sbin/pcp_collect
index 6eb25da60..b443148c3 100755
--- a/xCAT-server/sbin/pcp_collect
+++ b/xCAT-server/sbin/pcp_collect
@@ -10,6 +10,8 @@ use xCAT::NodeRange;
 use Sys::Hostname;
 use Socket;
 use xCAT::Utils;
+use xCAT::TableUtils;
+use xCAT::NetworkUtils;
 use xCAT::GlobalDef;
 use xCAT_monitoring::monitorctrl;
 use xCAT::MsgUtils;
@@ -23,7 +25,7 @@ sub  performance
 	  
            my $noderef=xCAT_monitoring::monitorctrl->getMonHierarchy();
            #identification of this node
-           my @hostinfo=xCAT::Utils->determinehostname();
+           my @hostinfo=xCAT::NetworkUtils->determinehostname();
            #print "hosT:@hostinfo\n";
            my $isSV=xCAT::Utils->isServiceNode();
            #print "is sv is:$isSV \n";
diff --git a/xCAT-server/sbin/xcat_traphandler b/xCAT-server/sbin/xcat_traphandler
index d3037b7c4..49d281e19 100755
--- a/xCAT-server/sbin/xcat_traphandler
+++ b/xCAT-server/sbin/xcat_traphandler
@@ -8,6 +8,7 @@ use lib "$::XCATROOT/lib/perl";
 use Sys::Syslog;
 use xCAT::Table;
 use xCAT::Utils;
+use xCAT::TableUtils;
 use xCAT::NetworkUtils;
 use xCAT_plugin::ipmi;
 use xCAT_monitoring::monitorctrl;
@@ -333,7 +334,7 @@ if ($DB) {
     };
   my @a=();
   push(@a, $event);
-  xCAT::Utils->logEventsToDatabase(\@a); 
+  xCAT::TableUtils->logEventsToDatabase(\@a); 
 }
 
 #run user defined commands if needed.
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index fa5c7aef0..e6b9507f9 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -307,7 +307,7 @@ if ($inet6support) {
         close($conn);
         next;
     }
-    my $tftpdir = xCAT::Utils->getTftpDir();
+    my $tftpdir = xCAT::TableUtils->getTftpDir();
     eval {
       alarm(2);
       print $conn "ready\n";
@@ -528,7 +528,7 @@ sleep 0.05;
           $req->{'_xcat_clienthost'}=gethostbyaddr($client,AF_INET);
           $req->{'_xcat_clientip'}=inet_ntoa($client);
           $req->{'_xcat_clientport'}=$sport;
-          if (defined($cmd_handlers{"findme"}) and xCAT::Utils->nodeonmynet(inet_ntoa($client))) { #only discover from ips that appear to be on a managed network
+          if (defined($cmd_handlers{"findme"}) and xCAT::NetworkUtils->nodeonmynet(inet_ntoa($client))) { #only discover from ips that appear to be on a managed network
             xCAT::MsgUtils->message("S","xcatd: Processing discovery request from ".$req->{'_xcat_clientip'});
             $req->{cacheonly}->[0] = 1;
             plugin_command($req,undef,\&build_response);