From 1c80ba47d1d9652402e48f6babcb45f81459e749 Mon Sep 17 00:00:00 2001
From: Kobi Samoray <ksamoray@vmware.com>
Date: Tue, 20 Jan 2015 11:34:59 +0200
Subject: [PATCH] Migrate to oslo.concurrency

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
---
 requirements.txt                                  | 1 +
 vmware_nsx/neutron/plugins/vmware/plugins/base.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 19cf0d741a..8edb101bcc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,7 @@ netaddr>=0.7.12
 SQLAlchemy>=0.9.7,<=0.9.99
 six>=1.7.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.db>=1.1.0  # Apache-2.0
 oslo.i18n>=1.0.0  # Apache-2.0
diff --git a/vmware_nsx/neutron/plugins/vmware/plugins/base.py b/vmware_nsx/neutron/plugins/vmware/plugins/base.py
index 045eb857ae..34a1147658 100644
--- a/vmware_nsx/neutron/plugins/vmware/plugins/base.py
+++ b/vmware_nsx/neutron/plugins/vmware/plugins/base.py
@@ -18,6 +18,7 @@ import uuid
 from oslo.config import cfg
 from oslo.db import exception as db_exc
 from oslo.utils import excutils
+from oslo_concurrency import lockutils
 from sqlalchemy import exc as sql_exc
 from sqlalchemy.orm import exc as sa_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 securitygroup as ext_sg
 from neutron.i18n import _LE, _LI, _LW
-from neutron.openstack.common import lockutils
 from neutron.openstack.common import log as logging
 from neutron.plugins.common import constants as plugin_const
 from neutron.plugins.vmware.api_client import exception as api_exc