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

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13504 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/activedirectory.pm | 2 +-
 xCAT-server/lib/xcat/plugins/lsslp.pm           | 4 ++--
 xCAT-server/lib/xcat/plugins/mknb.pm            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/activedirectory.pm b/xCAT-server/lib/xcat/plugins/activedirectory.pm
index cb06a5166..68c326c5b 100644
--- a/xCAT-server/lib/xcat/plugins/activedirectory.pm
+++ b/xCAT-server/lib/xcat/plugins/activedirectory.pm
@@ -46,7 +46,7 @@ sub process_request {
     #my $server = $sitetab->getAttribs({key=>'directoryserver'},['value']);
     #my $realm = $sitetab->getAttribs({key=>'realm'},['value']);
     my @directoryservers =  xCAT::TableUtils->get_site_attribute("directoryserver");
-    my @realms = xCAT::Utils->get_site_attribute("realm");
+    my @realms = xCAT::TableUtils->get_site_attribute("realm");
     my $tmp1 = $realms[0];
     my $server;
     my $realm;
diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
index ee0c7b754..b0bf820de 100644
--- a/xCAT-server/lib/xcat/plugins/lsslp.pm
+++ b/xCAT-server/lib/xcat/plugins/lsslp.pm
@@ -853,7 +853,7 @@ sub get_host_from_url {
         for my $net ( keys %$nets) {
             my ($n,$m) = split /\//,$net;
             if ( #xCAT::NetworkUtils::isInSameSubnet($n, $tip, $m, 1) and
-                 xCAT::Utils::isPingable($tip) and (length(inet_aton($tip)) == 4)) {
+                 xCAT::NetworkUtils::isPingable($tip) and (length(inet_aton($tip)) == 4)) {
                 push @validip, $tip;
             }
         }
@@ -1668,7 +1668,7 @@ sub filtersamevlan {
             my $ip = ${$oldhash->{$name}}{ip};
             for my $net ( keys %$validnets){
                 my ($n,$m) = split /\//,$net;
-                if ( xCAT::Utils::isInSameSubnet( $n, $ip, $m, 1)) {#and xCAT::Utils::isPingable( $ip)) {
+                if ( xCAT::NetworkUtils::isInSameSubnet( $n, $ip, $m, 1)) {#and xCAT::NetworkUtils::isPingable( $ip)) {
                     $newhash->{$name} = $oldhash->{$name};
                 }
             }
diff --git a/xCAT-server/lib/xcat/plugins/mknb.pm b/xCAT-server/lib/xcat/plugins/mknb.pm
index 2b13b37e2..41a1f00c4 100644
--- a/xCAT-server/lib/xcat/plugins/mknb.pm
+++ b/xCAT-server/lib/xcat/plugins/mknb.pm
@@ -142,7 +142,7 @@ sub process_request {
    }
    system ("rm -rf $tempdir");
    my $hexnets = xCAT::NetworkUtils->my_hexnets();
-   my $normnets = xCAT::Utils->my_nets();
+   my $normnets = xCAT::NetworkUtils->my_nets();
    my $consolecmdline;
    if (defined($serialport) and $serialspeed) {
        $consolecmdline = "console=tty0 console=ttyS$serialport,$serialspeed";