openstack
/
deb-tempest
Code Issues Proposed changes

Merge "Set default value of 'dvr_extra_resources' option to False"

This commit is contained in:
Jenkins 2017-04-05 20:22:55 +00:00 committed by Gerrit Code Review
parent 5a70bd15f2 61d42c7615
commit 4ef513006d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tempest/api/network/admin/test_l3_agent_scheduler.py
View File

@ -68,6 +68,8 @@ class L3AgentSchedulerTestJSON(base.BaseAdminNetworkTest):
raise exceptions.InvalidConfiguration(msg)
cls.router = cls.create_router()
# TODO(ylobankov): Delete this 'if' block once 'dvr_extra_resources'
# option is deleted. Currently this option is deprecated for removal.
if CONF.network.dvr_extra_resources:
# NOTE(armax): If DVR is an available extension, and the created
# router is indeed a distributed one, more resources need to be
@ -97,6 +99,8 @@ class L3AgentSchedulerTestJSON(base.BaseAdminNetworkTest):
cls.router['id'],
external_gateway_info=external_gateway_info)
# TODO(ylobankov): Delete this cleanup block once 'dvr_extra_resources'
# option is deleted. Currently this option is deprecated for removal.
@classmethod
def resource_cleanup(cls):
if cls.is_dvr_router:

3
tempest/config.py
View File

@ -613,9 +613,8 @@ NetworkGroup = [
default=False,
help="The environment does not support network separation "
"between tenants."),
# TODO(ylobankov): Delete this option once the Liberty release is EOL.
cfg.BoolOpt('dvr_extra_resources',
default=True,
default=False,
help="Whether or not to create internal network, subnet, "
"port and add network interface to distributed router "
"in L3 agent scheduler test. Extra resources need to be "