gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r28512 - in gnunet-planetlab/gplmt: . gplmt


From: gnunet
Subject: [GNUnet-SVN] r28512 - in gnunet-planetlab/gplmt: . gplmt
Date: Mon, 12 Aug 2013 01:15:29 +0200

Author: otarabai
Date: 2013-08-12 01:15:29 +0200 (Mon, 12 Aug 2013)
New Revision: 28512

Modified:
   gnunet-planetlab/gplmt/gplmt.conf
   gnunet-planetlab/gplmt/gplmt.py
   gnunet-planetlab/gplmt/gplmt/Configuration.py
   gnunet-planetlab/gplmt/gplmt/Tasks.py
Log:
Add userdir configuration


Modified: gnunet-planetlab/gplmt/gplmt/Configuration.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Configuration.py       2013-08-11 22:33:46 UTC 
(rev 28511)
+++ gnunet-planetlab/gplmt/gplmt/Configuration.py       2013-08-11 23:15:29 UTC 
(rev 28512)
@@ -45,6 +45,7 @@
         self.gplmt_notifications = ""
         self.gplmt_taskfile = None
         self.gplmt_nodesfile = None
+        self.gplmt_userdir = ""
         self.pl_slicename = ""
         self.pl_api_url = ""
         self.pl_username = None
@@ -129,6 +130,10 @@
                 self.gplmt_notifications = config.get("gplmt", "notification")
             except ConfigParser.NoOptionError as e:
                 pass
+            try: 
+                self.gplmt_userdir = config.get("gplmt", "userdir")
+            except ConfigParser.NoOptionError as e:
+                pass
         except ConfigParser.NoSectionError:
             pass                
 
@@ -216,4 +221,4 @@
         
 if __name__ == "__main__":
     print "Nothing to do here!"
-    sys.exit(1)
\ No newline at end of file
+    sys.exit(1)

Modified: gnunet-planetlab/gplmt/gplmt/Tasks.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Tasks.py       2013-08-11 22:33:46 UTC (rev 
28511)
+++ gnunet-planetlab/gplmt/gplmt/Tasks.py       2013-08-11 23:15:29 UTC (rev 
28512)
@@ -188,8 +188,12 @@
                 t.stop_on_fail = False        
         if ((child.tag == "source") and (child.text != None)):
             t.src = child.text
+            if ('' != g_configuration.gplmt_userdir and Operation.put == 
t.type):
+                t.src = os.path.join(g_configuration.gplmt_userdir, 
os.path.basename(t.src))
         if ((child.tag == "destination") and (child.text != None)):
-            t.dest = child.text                
+            t.dest = child.text
+            if ('' != g_configuration.gplmt_userdir and Operation.get == 
t.type):
+                t.dest = os.path.join(g_configuration.gplmt_userdir, 
os.path.basename(t.dest))
 
     if (False == t.check()):
         print "Parsed invalid task with id " + str (t.id) + " name '" + t.name 
+ "'"
@@ -268,11 +272,13 @@
     
 
 class Tasklist:
-    def __init__(self, filename, logger, startid, 
+    def __init__(self, filename, logger, startid, configuration,
                  name="<Undefined>", log_dir=""):
         assert (None != logger)
         global glogger
         glogger = logger
+        global g_configuration;
+        g_configuration = configuration
         self.logger = logger
         self.filename = filename
         self.l = list ()
@@ -338,7 +344,7 @@
         
         return True        
     def copy (self):
-        t = Tasklist (self.filename, self.logger, -1)
+        t = Tasklist (self.filename, self.logger, -1, g_configuration)
         # Create a copy of the task list as described in 
         # http://docs.python.org/library/copy.html
         t.filename = self.filename

Modified: gnunet-planetlab/gplmt/gplmt.conf
===================================================================
--- gnunet-planetlab/gplmt/gplmt.conf   2013-08-11 22:33:46 UTC (rev 28511)
+++ gnunet-planetlab/gplmt/gplmt.conf   2013-08-11 23:15:29 UTC (rev 28512)
@@ -7,6 +7,8 @@
 tasks = contrib/tasklists/check_node.xml
 # Number of parallel workers, use 0 for unlimited
 #max_parallelism = 100
+# If set, the userdir directory will be used for get/put operations
+#userdir = /home/gplmt/
 
 [planetlab]
 slice = tumple_gnunet

Modified: gnunet-planetlab/gplmt/gplmt.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt.py     2013-08-11 22:33:46 UTC (rev 28511)
+++ gnunet-planetlab/gplmt/gplmt.py     2013-08-11 23:15:29 UTC (rev 28512)
@@ -146,11 +146,11 @@
         # Load gplmt_taskfile file
         if (None != command):
             print "Loading single command : " + str (command)
-            tasklist = Tasklist.Tasklist (configuration.gplmt_taskfile, 
main.gplmt_logger, startid);
+            tasklist = Tasklist.Tasklist (configuration.gplmt_taskfile, 
main.gplmt_logger, startid, configuration);
             tasklist.load_singletask(command, main.gplmt_logger)
         elif (configuration.gplmt_taskfile):      
             print "Loading task file : " + configuration.gplmt_taskfile        
  
-            tasklist = Tasklist.Tasklist (configuration.gplmt_taskfile, 
main.gplmt_logger, startid);
+            tasklist = Tasklist.Tasklist (configuration.gplmt_taskfile, 
main.gplmt_logger, startid, configuration);
             if (tasklist.load() == False):
                 sys.exit(2)  
         else:




reply via email to

[Prev in Thread] Current Thread [Next in Thread]