diff options
| author | Corey Bryant <corey.bryant@canonical.com> | 2015-03-16 12:19:05 -0400 |
|---|---|---|
| committer | Corey Bryant <corey.bryant@canonical.com> | 2015-03-16 17:05:49 -0400 |
| commit | 3501ec2cb773417f05004d8b5567d5755213dabe (patch) | |
| tree | aef1169b7bad11acb2fe92e9c9e1fab0af6ae121 | |
| parent | 86eef55dc065e9226cca63b0ea655d01279f3adf (diff) | |
| download | nova-3501ec2cb773417f05004d8b5567d5755213dabe.tar.gz | |
Drop use of oslo.utils in nova
Use units from nova.openstack.common instead of using units from
oslo.utils.
Fixes bug: 1432685
Change-Id: I5d66c5c10728024e4d3dd3ae5362217f76164ed1
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 31cdcb2442..fd15df6ce7 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -26,7 +26,6 @@ import string import uuid from oslo.config import cfg -from oslo.utils import units import six from nova import availability_zones @@ -68,6 +67,7 @@ from nova.openstack.common.gettextutils import _ from nova.openstack.common import log as logging from nova.openstack.common import strutils from nova.openstack.common import timeutils +from nova.openstack.common import units from nova.openstack.common import uuidutils import nova.policy from nova import quota diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 90205a93c6..e1297a94a3 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -31,7 +31,6 @@ import mock import mox from oslo.config import cfg from oslo import messaging -from oslo.utils import units import six from testtools import matchers as testtools_matchers @@ -69,6 +68,7 @@ from nova.openstack.common import importutils from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import timeutils +from nova.openstack.common import units from nova.openstack.common import uuidutils from nova import policy from nova import quota |