use print() - import print_function - should be fine for both py2 and py3

[nepi.git] / src / nepi / resources / linux / ccn / ccnpeek.py

diff --git a/src/nepi/resources/linux/ccn/ccnpeek.py b/src/nepi/resources/linux/ccn/ccnpeek.py
index b1deeca..f36b059 100644 (file)
--- a/src/nepi/resources/linux/ccn/ccnpeek.py
+++ b/src/nepi/resources/linux/ccn/ccnpeek.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,15 +17,14 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 from nepi.execution.attribute import Attribute, Flags, Types
-from nepi.execution.resource import clsinit_copy, ResourceState, \
-    reschedule_delay
+from nepi.execution.resource import clsinit_copy, ResourceState
 from nepi.resources.linux.ccn.ccnapplication import LinuxCCNApplication
 
 import os
 
 @clsinit_copy
 class LinuxCCNPeek(LinuxCCNApplication):
-    _rtype = "LinuxCCNPeek"
+    _rtype = "linux::CCNPeek"
 
     @classmethod
     def _register_attributes(cls):
@@ -43,7 +41,7 @@ class LinuxCCNPeek(LinuxCCNApplication):
     def do_deploy(self):
         if not self.ccnd or self.ccnd.state < ResourceState.READY:
             self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state )
-            self.ec.schedule(reschedule_delay, self.deploy)
+            self.ec.schedule(self.reschedule_delay, self.deploy)
         else:
             command = self.get("command")
             if not command: