From 7108fcb713dcc6852790c504876f816d707a6dfc Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Tue, 8 Nov 2016 02:39:59 -0500
Subject: [PATCH] if no ip definition get ip from getipaddr function

---
 xCAT-probe/subcmds/discovery | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/xCAT-probe/subcmds/discovery b/xCAT-probe/subcmds/discovery
index 5a4a1cd82..e60cbae1e 100755
--- a/xCAT-probe/subcmds/discovery
+++ b/xCAT-probe/subcmds/discovery
@@ -844,11 +844,18 @@ sub get_node_ip {
 
     foreach my $node (keys %nodeipcheck) {
         $ip_net = xCAT::NetworkUtils->getipaddr($node);
+        my $isonmynet = xCAT::NetworkUtils->nodeonmynet($node);
         if ($nodeipcheck{$node}{"ip"} and $ip_net and ($nodeipcheck{$node}{"ip"} ne $ip_net)) {
             $nodeipcheck{$node}{"error"} = "IP $nodeipcheck{$node}{\"ip\"} definition for $node is not correct";
             $nodeipcheck{$node}{"ip"} = $ip_net;
+        } elsif (!$nodeipcheck{$node}{"ip"} and $ip_net) {
+            $nodeipcheck{$node}{"ip"} = $ip_net;
+        } 
+        if ($ip_net and !$isonmynet) {
+            $nodeipcheck{$node}{"error"} = "IP for $node is not on any network this server attached.";
+        } elsif (!$isonmynet) {
+            $nodeipcheck{$node}{"error"} = "Can not get IP for $node.";
         }
-        $nodeipcheck{$node}{"error"} = "IP for $node is not on any network this server attached, please run 'makehosts' and 'makedns -n'." unless (xCAT::NetworkUtils->nodeonmynet($node));
     }
 
     return %nodeipcheck;