diff --git a/akanda/neutron/db/models_v2.py b/akanda/neutron/db/models_v2.py index fa50139..51d02ff 100644 --- a/akanda/neutron/db/models_v2.py +++ b/akanda/neutron/db/models_v2.py @@ -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): diff --git a/akanda/neutron/plugins/decorators.py b/akanda/neutron/plugins/decorators.py index 8c68c91..640fcf0 100644 --- a/akanda/neutron/plugins/decorators.py +++ b/akanda/neutron/plugins/decorators.py @@ -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 diff --git a/akanda/neutron/plugins/floatingip.py b/akanda/neutron/plugins/floatingip.py index 5c7b77f..bf2a435 100644 --- a/akanda/neutron/plugins/floatingip.py +++ b/akanda/neutron/plugins/floatingip.py @@ -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__) diff --git a/akanda/neutron/plugins/nsx_neutron_plugin.py b/akanda/neutron/plugins/nsx_neutron_plugin.py index a834808..06235e5 100644 --- a/akanda/neutron/plugins/nsx_neutron_plugin.py +++ b/akanda/neutron/plugins/nsx_neutron_plugin.py @@ -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 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..4a4bc27 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +oslo.log>=1.2.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0