Adding PlanetLab resources

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

diff --git a/src/nepi/resources/linux/application.py b/src/nepi/resources/linux/application.py
index 882fb4c..f9edfc2 100644 (file)
--- a/src/nepi/resources/linux/application.py
+++ b/src/nepi/resources/linux/application.py
@@ -1,9 +1,28 @@
-from neco.execution.attribute import Attribute, Flags, Types
-from neco.execution.trace import Trace, TraceAttr
-from neco.execution.resource import ResourceManager, clsinit, ResourceState
-from neco.resources.linux.node import LinuxNode
-from neco.util import sshfuncs 
-from neco.util.timefuncs import strfnow, strfdiff
+"""
+    NEPI, a framework to manage network experiments
+    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.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+
+from nepi.execution.attribute import Attribute, Flags, Types
+from nepi.execution.trace import Trace, TraceAttr
+from nepi.execution.resource import ResourceManager, clsinit, ResourceState
+from nepi.resources.linux.node import LinuxNode
+from nepi.util import sshfuncs 
+from nepi.util.timefuncs import strfnow, strfdiff
 
 import logging
 import os
@@ -176,7 +195,7 @@ class LinuxApplication(ResourceManager):
 
         return out
             
-    def provision(self, filters = None):
+    def provision(self):
         # create home dir for application
         self.node.mkdir(self.app_home)
 
@@ -316,7 +335,7 @@ class LinuxApplication(ResourceManager):
         else:
             try:
                 command = self.get("command") or ""
-                self.info(" Deploying command '%s' " % command)
+                self.info("Deploying command '%s' " % command)
                 self.discover()
                 self.provision()
             except: