Branch b1_4

b=9477
exempt bad/incomplete nids from network ping test

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index 645c30e..6cd2f61 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -2082,7 +2082,7 @@ def doHost(lustreDB, hosts):
             if config.service:
                 tgt_select[config.service] = h
                 config.group = config.service
-                print "Startup the", config.group, "service on current node."
+                print "Configure the", config.group, "service on current node."
             break
     if not node_db:
         panic('No host entry found.')

diff --git a/lustre/utils/lmc b/lustre/utils/lmc
index f14733e..d0c19db 100755 (executable)
--- a/lustre/utils/lmc
+++ b/lustre/utils/lmc
@@ -669,7 +669,7 @@ def add_net(gen, lustre, options):
         sys.exit(2)
 
     real_net_type = net_type
-    if net_type == 'lnet':
+    if net_type == 'lnet' and string.find(nid,'@') > 0:
         real_net_type = string.split(nid,'@')[1]
 
     # testing network
@@ -677,7 +677,8 @@ def add_net(gen, lustre, options):
         if options.verbose:
             print "Skip the remote host networking test."
     elif (node_name != 'client') and (real_net_type == 'tcp'):
-        print "Testing network on", node_name
+        if options.verbose:
+            print "Testing network on", node_name
         target = string.split(nid,'@')[0]
         out = runcmd("ping -c 1 -w 10 %s" %target)
         if out != 0: