From c76edec913dbdd847d6d5229d8b8cef090084cef Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Fri, 16 Jun 2017 17:58:40 +0200 Subject: 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 --- rumba/testbeds/jfed.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'rumba/testbeds/jfed.py') 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 -- cgit v1.2.3