diff options
| author | Marco Capitani <m.capitani@nextworks.it> | 2017-07-28 11:04:53 +0200 |
|---|---|---|
| committer | Marco Capitani <m.capitani@nextworks.it> | 2017-07-28 11:04:53 +0200 |
| commit | 9733485acfc611cea59119a096e528357aa438a5 (patch) | |
| tree | 62926bef082bbcacf3ddfb3813c8c580dd73347b /rumba/testbeds/jfed.py | |
| parent | 815839bf3cac2fcfd2d25a69395055397d55a8bb (diff) | |
| parent | 7b43f02b415968371f1b5719232bd7741cb7f12f (diff) | |
| download | rumba-9733485acfc611cea59119a096e528357aa438a5.tar.gz rumba-9733485acfc611cea59119a096e528357aa438a5.zip | |
Merge branch 'master' into storyboard-impl
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 ad6b98a..8867dc6 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 |