summaryrefslogtreecommitdiffstats
path: root/testcases/testcase.py
diff options
context:
space:
mode:
authorDino Simeon Madarang <dino.simeonx.madarang@intel.com>2016-01-28 15:51:22 +0000
committerMaryam Tahhan <maryam.tahhan@intel.com>2016-02-03 10:17:33 +0000
commit5d5fc10455b2f57321e2933f61b909af2ec73407 (patch)
tree440818ff2007466b22411fce0cf81380596eb225 /testcases/testcase.py
parent26d5dcc91e9bbf92a28892382094022997d07b5a (diff)
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 <dino.simeonx.madarang@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Billy O Mahony <billy.o.mahony@intel.com> Reviewed-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Diffstat (limited to 'testcases/testcase.py')
-rw-r--r--testcases/testcase.py17
1 files changed, 10 insertions, 7 deletions
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()