diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2018-03-27 16:02:16 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-03-27 16:02:16 +0200 |
| commit | eef25fb48735a5db9613bf00b47f6cf4703b815d (patch) | |
| tree | a435ddc708338951dfa81d36189437f0b7dee80a | |
| parent | 3e5a3aa56ab3652d43d845dac4abde1e1a2644e9 (diff) | |
| parent | 69e8cfaf01a4d7ca5a58971d516cadf672016f77 (diff) | |
| download | rumba-eef25fb48735a5db9613bf00b47f6cf4703b815d.tar.gz rumba-eef25fb48735a5db9613bf00b47f6cf4703b815d.zip | |
Merge branch 'master' into testing
| -rw-r--r-- | rumba/prototypes/irati.py | 4 | ||||
| -rw-r--r-- | rumba/storyboard.py | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py index 0807e10..b951d58 100644 --- a/rumba/prototypes/irati.py +++ b/rumba/prototypes/irati.py @@ -266,8 +266,8 @@ class Experiment(mod.Experiment): if len(self.dif_ordering) > 0: for adm in \ irati_templates.da_map_base["applicationToDIFMappings"]: - adm["difName"] = "%s" % (self.dif_ordering[-1],) - else: + adm["difName"] = "%s" % (self.dif_ordering[-1].name,) + else: # not yet supported irati_templates.da_map_base["applicationToDIFMappings"] = [] for apm in app_mappings: irati_templates.da_map_base["applicationToDIFMappings"]\ diff --git a/rumba/storyboard.py b/rumba/storyboard.py index 978df85..0dc4fba 100644 --- a/rumba/storyboard.py +++ b/rumba/storyboard.py @@ -708,16 +708,22 @@ class StoryBoard(SBEntity): 'Cannot fetch logs.' % local_dir) for node in self.server_nodes: + dst_dir = os.path.join(local_dir, node.name) + if not os.path.isdir(dst_dir): + os.mkdir(dst_dir) logs_list = node.execute_command('ls /tmp/*_server.log') logs_list = [x for x in logs_list.split('\n') if x != ''] logger.debug('Log list is:\n%s', logs_list) - node.fetch_files(logs_list, local_dir) + node.fetch_files(logs_list, dst_dir) for node in self.client_nodes: + dst_dir = os.path.join(local_dir, node.name) + if not os.path.isdir(dst_dir): + os.mkdir(dst_dir) logs_list = node.execute_command('ls /tmp/*.rumba.log ' '|| echo ""') logs_list = [x for x in logs_list.split('\n') if x != ''] logger.debug('Log list is:\n%s', logs_list) - node.fetch_files(logs_list, local_dir) + node.fetch_files(logs_list, dst_dir) def set_link_state(self, t, dif, state): if self.experiment is None: |