diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-20 20:51:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-20 20:51:45 +0000 |
| commit | 1bb4e5e17ddf693b2ef3b8b7bed42de918c3b77a (patch) | |
| tree | 0a9736e0be71841d7acb55a40c46cee8b73cf5b6 | |
| parent | 0cf54ebc81adef0566aed8d35049f6e912e5b9f6 (diff) | |
| parent | c9d282d421ee94ba7f5e133796afa3813a05d4d9 (diff) | |
| download | nova-1bb4e5e17ddf693b2ef3b8b7bed42de918c3b77a.tar.gz nova-1bb4e5e17ddf693b2ef3b8b7bed42de918c3b77a.tar.xz nova-1bb4e5e17ddf693b2ef3b8b7bed42de918c3b77a.zip | |
Merge "cfg should be imported from oslo.config"
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py b/nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py index 462e4375c..f7413cad9 100644 --- a/nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py +++ b/nova/tests/api/openstack/compute/contrib/test_attach_interfaces.py @@ -13,12 +13,13 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg + from nova.api.openstack.compute.contrib import attach_interfaces from nova.compute import api as compute_api from nova import context from nova import exception from nova.network import api as network_api -from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova import test |