From: Martin Klozik <martinx.klozik@intel.com>
Date: Thu, 30 Mar 2017 13:50:28 +0000 (+0100)
Subject: ixia: VLAN support without l3/l4 headers
X-Git-Tag: opnfv-5.0.RC1~52^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bf226ce86459ddb1467c292c66f3468bbb361264;p=vswitchperf.git

ixia: VLAN support without l3/l4 headers

Remove dependency of VLAN headers on L3 and L4 protocols.

JIRA: VSPERF-499

Change-Id: Ic16dbbf2b503be7dd48a7bf55e45795bbb9f7e67
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
Reviewed-by: Trevor Cooper <trevor.cooper@intel.com>
---

diff --git a/tools/functions.py b/tools/functions.py
index da43edca..e8bc31da 100644
--- a/tools/functions.py
+++ b/tools/functions.py
@@ -146,10 +146,6 @@ def check_traffic(traffic):
     """Check traffic definition and correct it if possible.
     """
     # check if requested networking layers make sense
-    if traffic['vlan']['enabled']:
-        if not (traffic['l3']['enabled'] and traffic['l4']['enabled']):
-            raise RuntimeError('TRAFFIC misconfiguration: both l3 and l4 must '
-                               'be enabled if vlan is enabled.')
     if traffic['l4']['enabled']:
         if not traffic['l3']['enabled']:
             raise RuntimeError('TRAFFIC misconfiguration: l3 must be enabled '