diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-06 16:28:34 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-06 16:28:34 -0400 |
| commit | 0f1db545f1a3c8b016cd7bcf21813019262b9b7a (patch) | |
| tree | 94ed975f7ee6e3fdcdde2fd14849196dcece34b8 | |
| parent | 35e0ae794f6cd5fda47c4795da34f9f57f52614f (diff) | |
| download | nova-0f1db545f1a3c8b016cd7bcf21813019262b9b7a.tar.gz nova-0f1db545f1a3c8b016cd7bcf21813019262b9b7a.tar.xz nova-0f1db545f1a3c8b016cd7bcf21813019262b9b7a.zip | |
reverting xenapi change
| -rw-r--r-- | nova/image/glance.py | 1 | ||||
| -rw-r--r-- | nova/image/s3.py | 1 | ||||
| -rw-r--r-- | nova/tests/api/openstack/fakes.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_xenapi.py | 2 |
4 files changed, 1 insertions, 4 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index b73a95276..25af8baa1 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -30,7 +30,6 @@ from nova import exception from nova import flags from nova import log as logging from nova import utils -from nova.image import service LOG = logging.getLogger('nova.image.glance') diff --git a/nova/image/s3.py b/nova/image/s3.py index 1e74dd433..343555887 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -34,7 +34,6 @@ from nova import flags from nova import image from nova import log as logging from nova import utils -from nova.image import service from nova.api.ec2 import ec2utils diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py index 9faeeaa8a..c1b5f884c 100644 --- a/nova/tests/api/openstack/fakes.py +++ b/nova/tests/api/openstack/fakes.py @@ -40,7 +40,6 @@ from nova.api.openstack import limits from nova.auth.manager import User, Project import nova.image.fake from nova.image import glance -from nova.image import service from nova.tests import fake_flags from nova.tests.glance import stubs as glance_stubs diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 27a8a979d..45dad3516 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -745,7 +745,7 @@ class XenAPIMigrateInstance(test.TestCase): fake_utils.stub_out_utils_execute(self.stubs) stubs.stub_out_migration_methods(self.stubs) stubs.stubout_get_this_vm_uuid(self.stubs) - #glance_stubs.stubout_glance_client(self.stubs) + glance_stubs.stubout_glance_client(self.stubs) def test_migrate_disk_and_power_off(self): instance = db.instance_create(self.context, self.values) |