openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Add neutron-qos parameter"

This commit is contained in:
Jenkins 2016-05-12 09:24:42 +00:00 committed by Gerrit Code Review
parent a71510f648 eb3827e659
commit c338ff1cef
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuelweb_test/models/fuel_web_client.py
View File

@ -558,7 +558,7 @@ class FuelWebClient29(object):
elif option == 'assign_to_all_nodes':
section = 'public_network_assignment'
elif option in {'neutron_l3_ha', 'neutron_dvr',
'neutron_l2_pop'}:
'neutron_l2_pop', 'neutron_qos'}:
section = 'neutron_advanced_configuration'
elif option in {'dns_list'}:
section = 'external_dns'

4
system_test/actions/base.py
View File

@ -348,7 +348,9 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions):
"neutron_dvr": self.env_config['network'].get(
'neutron-dvr', False),
"neutron_l2_pop": self.env_config['network'].get(
'neutron-l2-pop', False)
'neutron-l2-pop', False),
"neutron_qos": self.env_config['network'].get(
'neutron-qos', False),
}
self.cluster_id = self.fuel_web.create_cluster(