load_gen: Supporting loading of load_gen via loader.

[vswitchperf.git] / core / traffic_controller_rfc2889.py

diff --git a/core/traffic_controller_rfc2889.py b/core/traffic_controller_rfc2889.py
index 210d5f5..01aaa72 100644 (file)
--- a/core/traffic_controller_rfc2889.py
+++ b/core/traffic_controller_rfc2889.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Spirent Communications, Intel Corporation.
+# Copyright 2016-2017 Spirent Communications, Intel Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -42,6 +42,9 @@ class TrafficControllerRFC2889(TrafficController, IResults):
         self._logger.debug('send_traffic with ' +
                            str(self._traffic_gen_class))
 
+        # update type with detailed traffic value
+        self._type = traffic['traffic_type']
+
         for packet_size in self._packet_sizes:
             # Merge framesize with the default traffic definition
             if 'l2' in traffic:
@@ -50,13 +53,13 @@ class TrafficControllerRFC2889(TrafficController, IResults):
             else:
                 traffic['l2'] = {'framesize': packet_size}
 
-            if traffic['traffic_type'] == 'caching':
+            if traffic['traffic_type'] == 'rfc2889_caching':
                 result = self._traffic_gen_class.send_rfc2889_caching(
-                    traffic, trials=self._trials, duration=self._duration)
-            elif traffic['traffic_type'] == 'congestion':
-                result = self._traffic_gen_class.send_rfc2889_congestion(
-                    traffic, duration=self._duration)
-            else:
+                    traffic, tests=self._trials, duration=self._duration)
+            elif traffic['traffic_type'] == 'rfc2889_learning':
+                result = self._traffic_gen_class.send_rfc2889_learning(
+                    traffic, tests=self._trials, duration=self._duration)
+            elif traffic['traffic_type'] == 'rfc2889_forwarding':
                 result = self._traffic_gen_class.send_rfc2889_forwarding(
                     traffic, tests=self._trials, duration=self._duration)
 
@@ -71,6 +74,9 @@ class TrafficControllerRFC2889(TrafficController, IResults):
         self._logger.debug('send_traffic_async with ' +
                            str(self._traffic_gen_class))
 
+        # update type with detailed traffic value
+        self._type = traffic['traffic_type']
+
         for packet_size in self._packet_sizes:
             traffic['l2'] = {'framesize': packet_size}
             self._traffic_gen_class.start_rfc2889_forwarding(