x/vmware-nsx
Code Issues Proposed changes

Migrate to oslo.concurrency

Browse Source 
neutron.openstack.common.lockutils have been removed by the following patch:
https://review.openstack.org/#/c/139717/

Change to oslo_concurrency instead.

Change-Id: I70515217f6a4c54a3d9777a51b3f3d2070550f0f
This commit is contained in:
Kobi Samoray 2015-01-20 11:34:59 +02:00
parent bc4ca8d51f
commit 1c80ba47d1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -9,6 +9,7 @@ netaddr>=0.7.12
SQLAlchemy>=0.9.7,<=0.9.99 SQLAlchemy>=0.9.7,<=0.9.99
six>=1.7.0 six>=1.7.0
stevedore>=1.1.0 # Apache-2.0 stevedore>=1.1.0 # Apache-2.0
oslo.concurrency>=0.3.0,!=0.4.0
oslo.config>=1.4.0 # Apache-2.0 oslo.config>=1.4.0 # Apache-2.0
oslo.db>=1.1.0 # Apache-2.0 oslo.db>=1.1.0 # Apache-2.0
oslo.i18n>=1.0.0 # Apache-2.0 oslo.i18n>=1.0.0 # Apache-2.0

2
vmware_nsx/neutron/plugins/vmware/plugins/base.py
View File

@ -18,6 +18,7 @@ import uuid
from oslo.config import cfg from oslo.config import cfg
from oslo.db import exception as db_exc from oslo.db import exception as db_exc
from oslo.utils import excutils from oslo.utils import excutils
from oslo_concurrency import lockutils
from sqlalchemy import exc as sql_exc from sqlalchemy import exc as sql_exc
from sqlalchemy.orm import exc as sa_exc from sqlalchemy.orm import exc as sa_exc
import webob.exc import webob.exc
@ -52,7 +53,6 @@ from neutron.extensions import portsecurity as psec
from neutron.extensions import providernet as pnet from neutron.extensions import providernet as pnet
from neutron.extensions import securitygroup as ext_sg from neutron.extensions import securitygroup as ext_sg
from neutron.i18n import _LE, _LI, _LW from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import lockutils
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as plugin_const from neutron.plugins.common import constants as plugin_const
from neutron.plugins.vmware.api_client import exception as api_exc from neutron.plugins.vmware.api_client import exception as api_exc