traffic: generate sparser descriptions of conversations

[garming/samba-autobuild/.git] / script / traffic_replay

diff --git a/script/traffic_replay b/script/traffic_replay
index 6fbbe4f44255b6c4b354375c28577026984b9c01..83b7041f63548074592aeb00970837bfe032ea88 100755 (executable)
--- a/script/traffic_replay
+++ b/script/traffic_replay
@@ -250,9 +250,9 @@ def main():
             logger.info(("Using the specified model file to "
                          "generate conversations"))
 
-            conversations = model.generate_conversations(opts.scale_traffic,
-                                                         opts.duration,
-                                                         opts.replay_rate)
+            conversations = model.generate_conversation_sequences(opts.scale_traffic,
+                                                                  opts.duration,
+                                                                  opts.replay_rate)
         except ValueError:
             logger.error(("Could not parse %s, which does not seem to be "
                           "a model generated by script/traffic_learner."
@@ -263,7 +263,7 @@ def main():
         conversations = []
 
     if debuglevel > 5:
-        for c in conversations:
+        for c in traffic.seq_to_conversations(conversations):
             for p in c.packets:
                 print("    ", p, file=sys.stderr)
 
@@ -350,7 +350,7 @@ def main():
 
         logger.info("Writing traffic summary")
         summaries = []
-        for c in conversations:
+        for c in traffic.seq_to_conversations(conversations):
             summaries += c.replay_as_summary_lines()
 
         summaries.sort()
@@ -359,7 +359,8 @@ def main():
 
         exit(0)
 
-    traffic.replay(conversations, host,
+    traffic.replay(traffic.seq_to_conversations(conversations),
+                   host,
                    lp=lp,
                    creds=creds,
                    accounts=accounts,