From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Sun, 14 Jul 2013 22:22:16 +0000 (-0700)
Subject: Small bugfixes for LinuxNPing RM
X-Git-Tag: nepi-3.0.0~75
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4b497eaaac24e494a1ff056199e63f8cd2138627;p=nepi.git

Small bugfixes for LinuxNPing RM
---

diff --git a/src/nepi/resources/linux/nping.py b/src/nepi/resources/linux/nping.py
index f85f5830..e0d64525 100644
--- a/src/nepi/resources/linux/nping.py
+++ b/src/nepi/resources/linux/nping.py
@@ -24,11 +24,6 @@ from nepi.util.timefuncs import tnow
 
 import os
 
-nping_sources = dict({
-    "i686": "http://nmap.org/dist/nping-0.6.25-1.i386.rpm",
-    "amd64": "http://nmap.org/dist/nping-0.6.25-1.x86_64.rpm",
-    })
-
 @clsinit_copy
 class LinuxNPing(LinuxApplication):
     _rtype = "LinuxNPing"
@@ -219,7 +214,7 @@ class LinuxNPing(LinuxApplication):
                 " )"
                 " && %s && sudo alien -i nping.rpm ) " % install_alien)
 
-        return ("( nping || %s )" % install)
+        return ("( nping --version || %s )" % install)
 
     def valid_connection(self, guid):
         # TODO: Validate!
diff --git a/src/nepi/resources/linux/ping.py b/src/nepi/resources/linux/ping.py
index 10c396ff..34476586 100644
--- a/src/nepi/resources/linux/ping.py
+++ b/src/nepi/resources/linux/ping.py
@@ -33,6 +33,7 @@ class LinuxPing(LinuxApplication):
         count = Attribute("count",
             "Sets ping -c option. Determines the number of ECHO_REQUEST "
             "packates to send before stopping.",
+            type = Types.Integer,
             flags = Flags.ExecReadOnly)
 
         mark = Attribute("mark",