Modified FailureManager to abort only when critical resources fail

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

diff --git a/src/nepi/resources/linux/nping.py b/src/nepi/resources/linux/nping.py
index f85f583..ec874bc 100644 (file)
--- a/src/nepi/resources/linux/nping.py
+++ b/src/nepi/resources/linux/nping.py
@@ -18,17 +18,12 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 from nepi.execution.attribute import Attribute, Flags, Types
-from nepi.execution.resource import clsinit_copy 
+from nepi.execution.resource import clsinit_copy, failtrap
 from nepi.resources.linux.application import LinuxApplication
 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"
@@ -138,6 +133,7 @@ class LinuxNPing(LinuxApplication):
         self._home = "nping-%s" % self.guid
         self._sudo_kill = True
 
+    @failtrap
     def deploy(self):
         if not self.get("command"):
             self.set("command", self._start_command)
@@ -219,7 +215,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!