diff options
Diffstat (limited to 'nova/tests/test_metadata.py')
| -rw-r--r-- | nova/tests/test_metadata.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index a68ac40fd3..46cd40c3b9 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -28,15 +28,15 @@ import webob from nova.api.metadata import base from nova.api.metadata import handler from nova import block_device -from nova import config from nova import db from nova.db.sqlalchemy import api from nova import exception from nova.network import api as network_api +from nova.openstack.common import cfg from nova import test from nova.tests import fake_network -CONF = config.CONF +CONF = cfg.CONF USER_DATA_STRING = ("This is an encoded string") ENCODE_USER_DATA_STRING = base64.b64encode(USER_DATA_STRING) |