diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-06-16 17:58:40 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-06-19 11:35:38 +0200 |
| commit | c76edec913dbdd847d6d5229d8b8cef090084cef (patch) | |
| tree | fc25bb188d954b8ea79e6270aab50236e389b355 /rumba/testbeds/jfed.py | |
| parent | 67288b3505dab7e9ea74fc87d139301e945b4a78 (diff) | |
| download | rumba-c76edec913dbdd847d6d5229d8b8cef090084cef.tar.gz rumba-c76edec913dbdd847d6d5229d8b8cef090084cef.zip | |
rumba: Better placement of files created by Rumba
Temporary files such as ssh_info, the rspecs, logs, ... are now
created in /tmp/rumba to avoid too many files being created and never
removed. The VM images and jFed CLI are kept in ~/.cache/rumba to
avoid redownloading every reboot.
Closes #18, #19
Diffstat (limited to 'rumba/testbeds/jfed.py')
| -rw-r--r-- | rumba/testbeds/jfed.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py index e158048..9c72ca7 100644 --- a/rumba/testbeds/jfed.py +++ b/rumba/testbeds/jfed.py @@ -51,9 +51,10 @@ class Testbed(mod.Testbed): self.cert_file = cert_file self.exp_hours = exp_hours self.if_id = dict() - self.rspec = self.exp_name + ".rspec" - self.manifest = self.exp_name + ".rrspec" - self.jfed_jar = "jfed_cli/experimenter-cli.jar" + self.rspec = os.path.join(mod.tmp_dir, self.exp_name + ".rspec") + self.manifest = os.path.join(mod.tmp_dir, self.exp_name + ".rrspec") + self.jfed_jar = os.path.join(mod.cache_dir, + 'jfed_cli/experimenter-cli.jar') if image is not None: self.image = "urn:publicid:IDN+" + authority + \ "+image+wall2-ilabt-iminds-be:" + image @@ -68,7 +69,8 @@ class Testbed(mod.Testbed): tar = tarfile.open(tarball) tar.extractall() tar.close() - logger.info("Extracted in current directory") + os.rename(os.path.join(os.getcwd(), 'jfed_cli'), + os.path.join(mod.cache_dir, 'jfed_cli')) os.remove(tarball) self.flags['no_vlan_offload'] = True |