openstack
/
neutron
Code Issues Proposed changes

Merge "Add l3_agent_mode configuration in tempest"

This commit is contained in:
Zuul 2018-03-16 06:56:12 +00:00 committed by Gerrit Code Review
parent 4da778fec9 7eeec2a0c9
commit c8570c10bf
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/tests/contrib/gate_hook.sh
View File

@ -140,6 +140,9 @@ case $VENV in
if [[ "$FLAVOR" = "dvrskip" ]]; then
load_conf_hook disable_dvr
fi
if [[ "$VENV" =~ "dsvm-scenario-ovs" ]]; then
load_conf_hook dvr
fi
;;
"rally")

9
neutron/tests/contrib/hooks/dvr Normal file
View File

@ -0,0 +1,9 @@
[[test-config|$TEMPEST_CONFIG]]
[neutron_plugin_options]
l3_agent_mode = dvr_snat
[[post-config|/$NEUTRON_L3_CONF]]
[DEFAULT]
agent_mode = dvr_snat

4
neutron/tests/tempest/config.py
View File

@ -38,6 +38,10 @@ NeutronPluginOptions = [
help='The availability zone for all agents in the deployment. '
'Configure this only when the single value is used by '
'all agents in the deployment.'),
cfg.StrOpt('l3_agent_mode',
help='The agent mode for L3 agents in the deployment. '
'Configure this only when the single value is used by '
'all agents in the deployment.'),
]
# TODO(amuller): Redo configuration options registration as part of the planned