Merge branch 'tmp' into 'master'

rumba: Better placement of files created by Rumba

Closes #18 and #19

See merge request !60

1 files changed, 17 insertions, 4 deletions

diff --git a/rumba/model.py b/rumba/model.py
index affdcbf..f4f98d1 100644
--- a/rumba/model.py
+++ b/rumba/model.py
@@ -22,10 +22,25 @@
 import abc
 
 import rumba.log as log
-
+import os
+import stat
 
 logger = log.get_logger(__name__)
 
+tmp_dir = '/tmp/rumba'
+try:
+    os.mkdir(tmp_dir)
+    os.chmod(tmp_dir, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
+except OSError:
+    # Already there, nothing to do
+    pass
+
+cache_dir = os.path.join(os.path.expanduser("~"), '.cache/rumba/')
+try:
+    os.mkdir(cache_dir)
+except OSError:
+    # Already there, nothing to do
+    pass
 
 # Represents generic testbed info
 #
@@ -222,8 +237,6 @@ class Node:
         s += ", ".join(rl)
         s += " ]\n"
 
-        s += "  Policies: [ "
-
         return s
 
     def __hash__(self):
@@ -628,7 +641,7 @@ class Experiment:
                         break
 
     def dump_ssh_info(self):
-        f = open('ssh_info', 'w')
+        f = open(os.path.join(tmp_dir, 'ssh_info'), 'w')
         for node in self.nodes:
             f.write("%s;%s;%s;%s;%s\n" % (node.name,
                                           self.testbed.username,