nitos omf6 ping updated

[nepi.git] / src / nepi / resources / linux / node.py

diff --git a/src/nepi/resources/linux/node.py b/src/nepi/resources/linux/node.py
index 14aab1a..8c5a6c5 100644 (file)
--- a/src/nepi/resources/linux/node.py
+++ b/src/nepi/resources/linux/node.py
@@ -369,11 +369,11 @@ class LinuxNode(ResourceManager):
         if not self.get("ip"):
             try:
                 ip = sshfuncs.gethostbyname(self.get("hostname"))
+                self.set("ip", ip)
             except:
-                msg = "DNS can not resolve hostname %s" % self.get("hostname") 
-                self.debug(msg)
+                msg = "Local DNS can not resolve hostname %s" % self.get("hostname") 
+                self.error(msg)
 
-            self.set("ip", ip)
 
         super(LinuxNode, self).do_provision()
 
@@ -423,6 +423,7 @@ class LinuxNode(ResourceManager):
         
         if self.get("username") != 'root':
             cmd = ("sudo -S killall tcpdump || /bin/true ; " +
+                "sudo -S kill -9 $(ps aux | grep '[.]nepi' | awk '{print $2}') || /bin/true ; " +
                 "sudo -S killall -u %s || /bin/true ; " % self.get("username"))
         else:
             if self.state >= ResourceState.READY:
@@ -439,14 +440,14 @@ class LinuxNode(ResourceManager):
                     kill_pids = ' '.join(dict(kill_pids).keys())
 
                     cmd = ("killall tcpdump || /bin/true ; " +
-                        "kill $(ps aux | grep '[n]epi' | awk '{print $2}') || /bin/true ; " +
+                        "kill $(ps aux | grep '[.]nepi' | awk '{print $2}') || /bin/true ; " +
                         "kill %s || /bin/true ; " % kill_pids)
                 else:
                     cmd = ("killall tcpdump || /bin/true ; " +
-                        "kill $(ps aux | grep '[n]epi' | awk '{print $2}') || /bin/true ; ")
+                        "kill $(ps aux | grep '[.]nepi' | awk '{print $2}') || /bin/true ; ")
             else:
                 cmd = ("killall tcpdump || /bin/true ; " +
-                    "kill $(ps aux | grep '[n]epi' | awk '{print $2}') || /bin/true ; ")
+                    "kill $(ps aux | grep '[.]nepi' | awk '{print $2}') || /bin/true ; ")
 
         (out, err), proc = self.execute(cmd, retry = 1, with_lock = True)