From 9b590e2282714e3b5aae26c3ac2d8c857b1ddb82 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Fri, 2 Oct 2015 02:18:09 +0100 Subject: Enable PVP and PVVP deployments for Vanilla OVS Support for PVP and PVVP scenerios using Vanilla OVS was added. VMs are configured to forward traffic between virtual interfaces by standard linux capabilities. Traffic generator script was updated to accept MAC and IP address configuration to allow VM forwarding configuration. VSPERF-66, VSPERF-70 Change-Id: Ia70ab6be547b39928a1eae319faba779d4e29284 Signed-off-by: Martin Klozik Signed-off-by: Dino Simeon Madarang Reviewed-by: Maryam Tahhan Reviewed-by: Brian Castelli Reviewed-by: Gene Snider Reviewed-by: Al Morton Reviewed-by: Tv Rao --- core/traffic_controller_rfc2544.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'core/traffic_controller_rfc2544.py') diff --git a/core/traffic_controller_rfc2544.py b/core/traffic_controller_rfc2544.py index fa4a9c35..5659569f 100644 --- a/core/traffic_controller_rfc2544.py +++ b/core/traffic_controller_rfc2544.py @@ -49,7 +49,7 @@ class TrafficControllerRFC2544(ITrafficController, IResults): packet_sizes_cli = get_test_param('pkt_sizes') if packet_sizes_cli: self._packet_sizes = [int(x.strip()) - for x in packet_sizes_cli.split(',')] + for x in packet_sizes_cli.split(',')] else: self._packet_sizes = settings.getValue('TRAFFICGEN_PKT_SIZES') @@ -91,7 +91,13 @@ class TrafficControllerRFC2544(ITrafficController, IResults): str(self._traffic_gen_class)) for packet_size in self._packet_sizes: - traffic['l2'] = {'framesize': packet_size} + # Merge framesize with the default traffic definition + if 'l2' in traffic: + traffic['l2'] = dict(traffic['l2'], + **{'framesize': packet_size}) + else: + traffic['l2'] = {'framesize': packet_size} + if traffic['traffic_type'] == 'back2back': result = self._traffic_gen_class.send_rfc2544_back2back( traffic, trials=self._trials, -- cgit 1.2.3-korg