x/vmware-nsx
Code Issues Proposed changes

Merge "Rename constant to a more appropriate name"

Browse Source
This commit is contained in:
Jenkins 2014-10-29 14:24:14 +00:00 committed by Gerrit Code Review
commit 7c773a4fa8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/plugins/ml2/drivers/helpers.py
View File

@ -20,8 +20,8 @@ from neutron.openstack.common import log
from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2 import driver_api as api
# Number of retries to find a valid segment candidate and allocate it # Number of attempts to find a valid segment candidate and allocate it
DB_MAX_RETRIES = 10 DB_MAX_ATTEMPTS = 10
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -107,8 +107,8 @@ class TypeDriverHelper(api.TypeDriver):
filter_by(allocated=False, **filters)) filter_by(allocated=False, **filters))
# Selected segment can be allocated before update by someone else, # Selected segment can be allocated before update by someone else,
# We retry until update success or DB_MAX_RETRIES retries # We retry until update success or DB_MAX_ATTEMPTS attempts
for attempt in range(1, DB_MAX_RETRIES + 1): for attempt in range(1, DB_MAX_ATTEMPTS + 1):
alloc = select.first() alloc = select.first()
if not alloc: if not alloc:
@ -139,5 +139,5 @@ class TypeDriverHelper(api.TypeDriver):
LOG.warning(_("Allocate %(type)s segment from pool failed " LOG.warning(_("Allocate %(type)s segment from pool failed "
"after %(number)s failed attempts"), "after %(number)s failed attempts"),
{"type": network_type, "number": DB_MAX_RETRIES}) {"type": network_type, "number": DB_MAX_ATTEMPTS})
raise exc.NoNetworkFoundInMaximumAllowedAttempts() raise exc.NoNetworkFoundInMaximumAllowedAttempts()