openstack/neutron
Code Issues Proposed changes

Merge "Fullstack connectivity: test interface scenario added."

Browse Source
This commit is contained in:
Jenkins 2016-04-12 05:06:21 +00:00 committed by Gerrit Code Review
commit 5621e166c9
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/tests/base.py
View File

@ -123,7 +123,10 @@ def setup_test_logging(config_opts, log_dir, log_file_path_template):
def sanitize_log_path(path):
# Sanitize the string so that its log path is shell friendly
return path.replace(' ', '-').replace('(', '_').replace(')', '_')
replace_map = {' ': '-', '(': '_', ')': '_'}
for s, r in six.iteritems(replace_map):
path = path.replace(s, r)
return path
class AttributeDict(dict):

14
neutron/tests/fullstack/test_connectivity.py
View File

@ -81,12 +81,14 @@ class TestOvsConnectivitySameNetwork(BaseConnectivitySameNetworkTest):
('VLANs', {'network_type': 'vlan',
'l2_pop': False})]
interface_scenarios = [
('openflow-cli', {'of_interface': 'ovs-ofctl',
'ovsdb_interface': 'vsctl'}),
('openflow-native', {'of_interface': 'native',
'ovsdb_interface': 'vsctl'}),
('ovsdb-native', {'of_interface': 'ovs-ofctl',
'ovsdb_interface': 'native'})]
('openflow-cli_ovsdb-cli', {'of_interface': 'ovs-ofctl',
'ovsdb_interface': 'vsctl'}),
('openflow-native_ovsdb-cli', {'of_interface': 'native',
'ovsdb_interface': 'vsctl'}),
('openflow-cli_ovsdb-native', {'of_interface': 'ovs-ofctl',
'ovsdb_interface': 'native'}),
('openflow-native_ovsdb-native', {'of_interface': 'native',
'ovsdb_interface': 'native'})]
scenarios = testscenarios.multiply_scenarios(
network_scenarios, interface_scenarios)