diff options
Diffstat (limited to 'testcases/testcase.py')
| -rw-r--r-- | testcases/testcase.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/testcases/testcase.py b/testcases/testcase.py index f5b35782..77d5992d 100644 --- a/testcases/testcase.py +++ b/testcases/testcase.py @@ -14,7 +14,6 @@ """TestCase base class """ -import time import csv import os import logging @@ -66,7 +65,8 @@ class TestCase(object): loader.get_vnf_class()) vswitch_ctl = component_factory.create_vswitch( self._deployment, - loader.get_vswitch_class()) + loader.get_vswitch_class(), + self._bidir) collector_ctl = component_factory.create_collector( self._collector, loader.get_collector_class()) @@ -75,21 +75,22 @@ class TestCase(object): self._logger.debug("Setup:") collector_ctl.log_cpu_stats() with vswitch_ctl: - if vnf_ctl: - vnf_ctl.start() + with vnf_ctl: traffic = {'traffic_type': self._traffic_type, 'bidir': self._bidir, 'multistream': self._multistream} + vswitch = vswitch_ctl.get_vswitch() if self._frame_mod == "vlan": - flow = {'table':'2', 'priority':'1000', 'metadata':'2', 'actions': ['push_vlan:0x8100','goto_table:3']} + flow = {'table':'2', 'priority':'1000', 'metadata':'2', + 'actions': ['push_vlan:0x8100', 'goto_table:3']} vswitch.add_flow('br0', flow) - flow = {'table':'2', 'priority':'1000', 'metadata':'1', 'actions': ['push_vlan:0x8100','goto_table:3']} + flow = {'table':'2', 'priority':'1000', 'metadata':'1', + 'actions': ['push_vlan:0x8100', 'goto_table:3']} vswitch.add_flow('br0', flow) - with traffic_ctl: - traffic_ctl.send_traffic(traffic) - + with traffic_ctl: + traffic_ctl.send_traffic(traffic) self._logger.debug("Traffic Results:") traffic_ctl.print_results() |