Fixing wrong license

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

diff --git a/src/nepi/resources/linux/ccn/ccncat.py b/src/nepi/resources/linux/ccn/ccncat.py
index c721c33..0874773 100644 (file)
--- a/src/nepi/resources/linux/ccn/ccncat.py
+++ b/src/nepi/resources/linux/ccn/ccncat.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 LinuxCCNCat(LinuxCCNApplication):
-    _rtype = "LinuxCCNCat"
+    _rtype = "linux::CCNCat"
 
     @classmethod
     def _register_attributes(cls):
@@ -34,7 +32,12 @@ class LinuxCCNCat(LinuxCCNApplication):
             "Content name for the content to peek",
             flags = Flags.Design)
 
+        pipeline = Attribute("pipeline",
+            "CCNCat pipeline",
+            flags = Flags.Design)
+
         cls._register_attribute(content_name)
+        cls._register_attribute(pipeline)
 
     def __init__(self, ec, guid):
         super(LinuxCCNCat, self).__init__(ec, guid)
@@ -43,12 +46,15 @@ class LinuxCCNCat(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:
                 command = "ccncat %s" % self.get("contentName")
-                self.set("command", command) 
+            if self.get("pipeline"):
+                command += " -p %s " % self.get("pipeline")
+
+            self.set("command", command) 
 
             self.info("Deploying command '%s' " % command)