From 5d5fc10455b2f57321e2933f61b909af2ec73407 Mon Sep 17 00:00:00 2001 From: Dino Simeon Madarang Date: Thu, 28 Jan 2016 15:51:22 +0000 Subject: pkt_gen: Add IxNet support for GRE frames Add option to generate GRE frames for testing GRE decapsulation tests. Recent changes: * Fix merge conflict * Updated userguides * Complete set of fields and working decap * Move GRE ixnet calls to if statement to reuse inner frame settings Change-Id: I0cf9243953a72a464ae4701a858e76aecbdb8528 JIRA: VSPERF-191 Signed-off-by: Dino Simeon Madarang Reviewed-by: Maryam Tahhan Reviewed-by: Billy O Mahony Reviewed-by: Martin Klozik Reviewed-by: Al Morton Reviewed-by: Brian Castelli --- testcases/testcase.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'testcases') diff --git a/testcases/testcase.py b/testcases/testcase.py index 0c64a34f..6fa1092e 100644 --- a/testcases/testcase.py +++ b/testcases/testcase.py @@ -65,15 +65,17 @@ class TestCase(object): self._frame_mod = cfg.get('Frame Modification', None) self._performance_test = performance_test - tunnel_type = None + self._tunnel_type = None self._tunnel_operation = None if self.deployment == 'op2p': self._tunnel_operation = cfg['Tunnel Operation'] if 'Tunnel Type' in cfg: - tunnel_type = cfg['Tunnel Type'] - tunnel_type = get_test_param('tunnel_type', tunnel_type) + self._tunnel_type = cfg['Tunnel Type'] + self._tunnel_type = get_test_param('tunnel_type', + self._tunnel_type) + # identify guest loopback method, so it can be added into reports self.guest_loopback = [] @@ -113,7 +115,7 @@ class TestCase(object): self._traffic.update({'traffic_type': traffic_type, 'flow_type': cfg.get('Flow Type', 'port'), 'bidir': bidirectional, - 'tunnel_type': tunnel_type, + 'tunnel_type': self._tunnel_type, 'multistream': int(multistream), 'stream_type': stream_type, 'pre_installed_flows' : pre_installed_flows, @@ -154,9 +156,10 @@ class TestCase(object): S.getValue('TRAFFICGEN_PORT2_IP')}) if self._tunnel_operation == "decapsulation": - self._traffic['l2'] = S.getValue('VXLAN_FRAME_L2') - self._traffic['l3'] = S.getValue('VXLAN_FRAME_L3') - self._traffic['l4'] = S.getValue('VXLAN_FRAME_L4') + self._traffic['l2'] = S.getValue(self._tunnel_type.upper() + '_FRAME_L2') + self._traffic['l3'] = S.getValue(self._tunnel_type.upper() + '_FRAME_L3') + self._traffic['l4'] = S.getValue(self._tunnel_type.upper() + '_FRAME_L4') + self._logger.debug("Controllers:") loader = Loader() -- cgit 1.2.3-korg