From 7e2853b78a4475946f3d366066b3359dfc79d7ac Mon Sep 17 00:00:00 2001 From: Christian Trautman Date: Tue, 14 Jun 2016 08:59:36 -0400 Subject: linux_bridge_guest: Modify packet structure for linux bridge tests Change packet structure for pvp/pvvp tests that use the linux bridge as the loopback to include the tgen mac address instead of the guest nic mac addresses in layer 2. This change is due to the old way not working with Xena traffic generators. Ixia works with both the old and new way. * Verified to work with Xena * Verified to work with Ixia JIRA: VSPERF-307 Change-Id: Ieca0c58610797d9d5c726ba9f21227e255958092 Signed-off-by: Christian Trautman --- testcases/testcase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testcases/testcase.py b/testcases/testcase.py index d76858d5..9441632b 100644 --- a/testcases/testcase.py +++ b/testcases/testcase.py @@ -152,8 +152,8 @@ class TestCase(object): # OVS Vanilla requires guest VM MAC address and IPs to work if 'linux_bridge' in self.guest_loopback: - self._traffic['l2'].update({'srcmac': S.getValue('GUEST_NET2_MAC')[0], - 'dstmac': S.getValue('GUEST_NET1_MAC')[0]}) + self._traffic['l2'].update({'srcmac': S.getValue('VANILLA_TGEN_PORT1_MAC'), + 'dstmac': S.getValue('VANILLA_TGEN_PORT2_MAC')}) self._traffic['l3'].update({'srcip': S.getValue('VANILLA_TGEN_PORT1_IP'), 'dstip': S.getValue('VANILLA_TGEN_PORT2_IP')}) -- cgit 1.2.3-korg