Merge "Xena_Flow_Fix: Fixes multistream of greater than 64k values"

[vswitchperf.git] / conf / integration / 01a_testcases_l34_vxlan.conf

diff --git a/conf/integration/01a_testcases_l34_vxlan.conf b/conf/integration/01a_testcases_l34_vxlan.conf
index 17c0d6f..b42a14d 100644 (file)
--- a/conf/integration/01a_testcases_l34_vxlan.conf
+++ b/conf/integration/01a_testcases_l34_vxlan.conf
@@ -1,4 +1,4 @@
-# Copyright 2017 Intel Corporation.
+# Copyright 2017-2018 Intel Corporation and Tieto.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -63,7 +63,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                  'cmds.close()'],
                 ['tools', 'exec_shell', "sudo $TOOLS['ovs-ofctl'] -O OpenFlow13 --bundle add-flows int_br0 /tmp/ovsofctl_cmds.txt"],
                 ['trafficgen', 'send_traffic', {}],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_P2P_FINIT
     },
@@ -93,7 +92,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                   'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0' }],
                 ['trafficgen', 'send_traffic', {}],
                 ['vswitch', 'dump_flows', 'int_br0'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_P2P_FINIT
     },
@@ -130,7 +128,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                 ['trafficgen', 'send_traffic', {}],
                 ['vswitch', 'dump_flows', 'int_br0'],
                 ['vnf', 'stop'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +                                                                                                                          STEP_VSWITCH_PVP_FINIT
     },
     {
@@ -172,7 +169,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                 ['vswitch', 'dump_flows', 'int_br0'],
                 ['vnf2', 'stop'],
                 ['vnf1', 'stop'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_PVVP_FINIT
     },
@@ -213,7 +209,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                 ['tools', 'exec_shell', "sudo $TOOLS['ovs-ofctl'] -O OpenFlow13 --bundle "
                                         "add-flows int_br0 /tmp/ovsofctl_cmds.txt"],
                 ['trafficgen', 'send_traffic', {}],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_P2P_FINIT
     },
@@ -249,7 +244,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                  'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
                 ['trafficgen', 'send_traffic', {}],
                 ['vswitch', 'dump_flows', 'int_br0'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_P2P_FINIT
     },
@@ -293,7 +287,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                 ['trafficgen', 'send_traffic', {}],
                 ['vswitch', 'dump_flows', 'int_br0'],
                 ['vnf', 'stop'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_PVP_FINIT
     },
@@ -344,7 +337,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                 ['vswitch', 'dump_flows', 'int_br0'],
                 ['vnf2', 'stop'],
                 ['vnf1', 'stop'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_PVVP_FINIT
     },
@@ -888,13 +880,13 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
             },
         },
         "TestSteps": [
-            ['vswitch', 'del_flow', 'br0', {'in_port': '1'}],
-            ['vswitch', 'add_flow', 'br0',
+            ['vswitch', 'del_flow', '$TUNNEL_INTEGRATION_BRIDGE', {'in_port': '1'}],
+            ['vswitch', 'add_flow', '$TUNNEL_INTEGRATION_BRIDGE',
              {'in_port': '1', 'dl_type': '0x800', 'nw_proto': '17',
               'nw_dst': '$TRAFFICGEN_PORT2_IP/8', 'actions': ['output:2'],
               'idle_timeout': '0'}],
-            ['vswitch', 'dump_flows', 'br0'],
-            ['vswitch', 'dump_flows', 'br-ext'],
+            ['vswitch', 'dump_flows', '$TUNNEL_INTEGRATION_BRIDGE'],
+            ['vswitch', 'dump_flows', '$TUNNEL_EXTERNAL_BRIDGE'],
         ],
     },
     {