Update for Neutron's migration to oslo_utils

Neutron has migrated off of oslo-incubator to oslo_utils, breaking our
dependency on neutron.openstack.common. This adds a requirements.txt
with required things and updates imports.  Also, fixes potential
NameErrors on use of unimported translators.

Change-Id: I2e4f83973188aab6e6ff7dcbe99f6c22589360b5
This commit is contained in:
Adam Gandelman 2015-06-26 12:44:06 -07:00
parent 432cf9ff57
commit dba598eb2f
5 changed files with 10 additions and 8 deletions

View File

@ -26,10 +26,8 @@ from sqlalchemy.orm import validates
from neutron.db import model_base
from neutron.db import models_v2
try:
from oslo_utils import timeutils
except ImportError:
from neutron.openstack.common import timeutils
from oslo_utils import timeutils
def validate_port_number(port):

View File

@ -25,6 +25,7 @@ from neutron.common.config import cfg
from neutron.common import exceptions as q_exc
from neutron.db import models_v2 as qmodels
from neutron.db import l3_db
from neutron.i18n import _
from neutron import manager
from neutron.plugins.common import constants

View File

@ -16,13 +16,13 @@
import logging
from oslo.config import cfg
from oslo_config import cfg
from oslo_utils import uuidutils
from neutron.api.v2 import attributes
from neutron.common import exceptions as q_exc
from neutron.db.l3_db import DEVICE_OWNER_FLOATINGIP, FloatingIP
from neutron.openstack.common import uuidutils
from neutron.i18n import _
LOG = logging.getLogger(__name__)

View File

@ -25,8 +25,9 @@ from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.db import agents_db
from neutron.db import l3_db
from neutron.openstack.common import log as logging
from oslo_log import log as logging
from oslo.db import exception as db_exc
from neutron.i18n import _
from neutron.plugins.vmware.api_client import exception as api_exc
from neutron.plugins.vmware.common import nsx_utils
from neutron.plugins.vmware.common import sync as nsx_sync

2
requirements.txt Normal file
View File

@ -0,0 +1,2 @@
oslo.log>=1.2.0 # Apache-2.0
oslo.utils>=1.6.0 # Apache-2.0