summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/component_factory.py5
-rw-r--r--core/traffic_controller_rfc2544.py3
2 files changed, 5 insertions, 3 deletions
diff --git a/core/component_factory.py b/core/component_factory.py
index eb963d6f..c101f5d2 100644
--- a/core/component_factory.py
+++ b/core/component_factory.py
@@ -38,14 +38,13 @@ def create_traffic(traffic_type, trafficgen_class):
traffic_types: 'rfc2544_throughput'
- :param traffic_type: Name of traffic type
+ :param traffic_type: Name of traffic type
:param trafficgen_class: Reference to traffic generator class to be used.
:return: A new ITrafficController
"""
- #TODO - full mapping from all traffic_types to
- #correct controller class
return TrafficControllerRFC2544(trafficgen_class)
+
def create_vswitch(deployment_scenario, vswitch_class):
"""Return a new IVSwitchController for the deployment_scenario.
diff --git a/core/traffic_controller_rfc2544.py b/core/traffic_controller_rfc2544.py
index bcea9568..aae3ef81 100644
--- a/core/traffic_controller_rfc2544.py
+++ b/core/traffic_controller_rfc2544.py
@@ -86,6 +86,9 @@ class TrafficControllerRFC2544(ITrafficController, IResults):
result = self._traffic_gen_class.send_rfc2544_back2back(
traffic, trials=int(self._trials),
duration=int(get_test_param('rfc2544_duration', 20)))
+ elif traffic['traffic_type'] == 'continuous':
+ result = self._traffic_gen_class.send_cont_traffic(
+ traffic, time=int(get_test_param('rfc2544_duration', 30)))
else:
result = self._traffic_gen_class.send_rfc2544_throughput(
traffic, trials=int(self._trials),