traffic_model: don't report generation errors as parse errors

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/script/traffic_replay b/script/traffic_replay
index 6131ffad2e8d1efc4daee2b1d845f8079f2b5ed0..b25476cae4a4d6dbfcaa86c7e4fbf7b150605ad1 100755 (executable)
--- a/script/traffic_replay
+++ b/script/traffic_replay
@@ -243,23 +243,9 @@ def main():
 
     # ingest the model
     if model_file and not opts.generate_users_only:
+        model = traffic.TrafficModel()
         try:
-            model = traffic.TrafficModel()
-
-            try:
-                model.load(model_file)
-            except ValueError:
-                logger.error(("Could not parse %s. The model file "
-                              "should be generated by the "
-                              "traffic_learner script.") % model_file)
-                sys.exit()
-
-            logger.info(("Using the specified model file to "
-                         "generate conversations"))
-
-            conversations = model.generate_conversation_sequences(opts.scale_traffic,
-                                                                  opts.duration,
-                                                                  opts.replay_rate)
+            model.load(model_file)
         except ValueError:
             if debuglevel > 0:
                 import traceback
@@ -269,6 +255,14 @@ def main():
                           % model_file))
             sys.exit(1)
 
+        logger.info(("Using the specified model file to "
+                     "generate conversations"))
+
+        conversations = \
+            model.generate_conversation_sequences(
+                opts.scale_traffic,
+                opts.duration,
+                opts.replay_rate)
     else:
         conversations = []