aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rumba/prototypes/irati.py4
-rw-r--r--rumba/storyboard.py10
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: