x/python-ganttclient
Code Issues Proposed changes

removing local image service

Browse Source
This commit is contained in:
Brian Waldon
2011-06-07 13:32:06 -04:00
parent e82d70ae46
commit 0fb759e39e
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/fake_flags.py
View File

@@ -32,7 +32,7 @@ flags.DECLARE('fake_network', 'nova.network.manager')
FLAGS['network_size'].SetDefault(8) FLAGS['network_size'].SetDefault(8)
FLAGS['num_networks'].SetDefault(2) FLAGS['num_networks'].SetDefault(2)
FLAGS['fake_network'].SetDefault(True) FLAGS['fake_network'].SetDefault(True)
FLAGS['image_service'].SetDefault('nova.image.local.LocalImageService') FLAGS['image_service'].SetDefault('nova.image.fake.FakeImageService')
flags.DECLARE('num_shelves', 'nova.volume.driver') flags.DECLARE('num_shelves', 'nova.volume.driver')
flags.DECLARE('blades_per_shelf', 'nova.volume.driver') flags.DECLARE('blades_per_shelf', 'nova.volume.driver')
flags.DECLARE('iscsi_num_targets', 'nova.volume.driver') flags.DECLARE('iscsi_num_targets', 'nova.volume.driver')

30
nova/tests/test_cloud.py
View File

@@ -35,7 +35,7 @@ from nova import utils
from nova.auth import manager from nova.auth import manager
from nova.api.ec2 import cloud from nova.api.ec2 import cloud
from nova.api.ec2 import ec2utils from nova.api.ec2 import ec2utils
from nova.image import local from nova.image import fake
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
@@ -69,8 +69,8 @@ class CloudTestCase(test.TestCase):
return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1, return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1,
'type': 'machine', 'image_state': 'available'}} 'type': 'machine', 'image_state': 'available'}}
self.stubs.Set(local.LocalImageService, 'show', fake_show) self.stubs.Set(fake._FakeImageService, 'show', fake_show)
self.stubs.Set(local.LocalImageService, 'show_by_name', fake_show) self.stubs.Set(fake._FakeImageService, 'show_by_name', fake_show)
# NOTE(vish): set up a manual wait so rpc.cast has a chance to finish # NOTE(vish): set up a manual wait so rpc.cast has a chance to finish
rpc_cast = rpc.cast rpc_cast = rpc.cast
@@ -291,7 +291,7 @@ class CloudTestCase(test.TestCase):
def fake_show_none(meh, context, id): def fake_show_none(meh, context, id):
raise exception.ImageNotFound(image_id='bad_image_id') raise exception.ImageNotFound(image_id='bad_image_id')
self.stubs.Set(local.LocalImageService, 'detail', fake_detail) self.stubs.Set(fake._FakeImageService, 'detail', fake_detail)
# list all # list all
result1 = describe_images(self.context) result1 = describe_images(self.context)
result1 = result1['imagesSet'][0] result1 = result1['imagesSet'][0]
@@ -305,8 +305,8 @@ class CloudTestCase(test.TestCase):
self.assertEqual(2, len(result3['imagesSet'])) self.assertEqual(2, len(result3['imagesSet']))
# provide an non-existing image_id # provide an non-existing image_id
self.stubs.UnsetAll() self.stubs.UnsetAll()
self.stubs.Set(local.LocalImageService, 'show', fake_show_none) self.stubs.Set(fake._FakeImageService, 'show', fake_show_none)
self.stubs.Set(local.LocalImageService, 'show_by_name', fake_show_none) self.stubs.Set(fake._FakeImageService, 'show_by_name', fake_show_none)
self.assertRaises(exception.ImageNotFound, describe_images, self.assertRaises(exception.ImageNotFound, describe_images,
self.context, ['ami-fake']) self.context, ['ami-fake'])
@@ -317,8 +317,8 @@ class CloudTestCase(test.TestCase):
return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1, return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1,
'type': 'machine'}, 'is_public': True} 'type': 'machine'}, 'is_public': True}
self.stubs.Set(local.LocalImageService, 'show', fake_show) self.stubs.Set(fake._FakeImageService, 'show', fake_show)
self.stubs.Set(local.LocalImageService, 'show_by_name', fake_show) self.stubs.Set(fake._FakeImageService, 'show_by_name', fake_show)
result = describe_image_attribute(self.context, 'ami-00000001', result = describe_image_attribute(self.context, 'ami-00000001',
'launchPermission') 'launchPermission')
self.assertEqual([{'group': 'all'}], result['launchPermission']) self.assertEqual([{'group': 'all'}], result['launchPermission'])
@@ -333,9 +333,9 @@ class CloudTestCase(test.TestCase):
def fake_update(meh, context, image_id, metadata, data=None): def fake_update(meh, context, image_id, metadata, data=None):
return metadata return metadata
self.stubs.Set(local.LocalImageService, 'show', fake_show) self.stubs.Set(fake._FakeImageService, 'show', fake_show)
self.stubs.Set(local.LocalImageService, 'show_by_name', fake_show) self.stubs.Set(fake._FakeImageService, 'show_by_name', fake_show)
self.stubs.Set(local.LocalImageService, 'update', fake_update) self.stubs.Set(fake._FakeImageService, 'update', fake_update)
result = modify_image_attribute(self.context, 'ami-00000001', result = modify_image_attribute(self.context, 'ami-00000001',
'launchPermission', 'add', 'launchPermission', 'add',
user_group=['all']) user_group=['all'])
@@ -347,7 +347,7 @@ class CloudTestCase(test.TestCase):
def fake_delete(self, context, id): def fake_delete(self, context, id):
return None return None
self.stubs.Set(local.LocalImageService, 'delete', fake_delete) self.stubs.Set(fake._FakeImageService, 'delete', fake_delete)
# valid image # valid image
result = deregister_image(self.context, 'ami-00000001') result = deregister_image(self.context, 'ami-00000001')
self.assertEqual(result['imageId'], 'ami-00000001') self.assertEqual(result['imageId'], 'ami-00000001')
@@ -357,7 +357,7 @@ class CloudTestCase(test.TestCase):
def fake_detail_empty(self, context): def fake_detail_empty(self, context):
return [] return []
self.stubs.Set(local.LocalImageService, 'detail', fake_detail_empty) self.stubs.Set(fake._FakeImageService, 'detail', fake_detail_empty)
self.assertRaises(exception.ImageNotFound, deregister_image, self.assertRaises(exception.ImageNotFound, deregister_image,
self.context, 'ami-bad001') self.context, 'ami-bad001')
@@ -468,7 +468,7 @@ class CloudTestCase(test.TestCase):
'type': 'machine'}} 'type': 'machine'}}
self.stubs.UnsetAll() self.stubs.UnsetAll()
self.stubs.Set(local.LocalImageService, 'show', fake_show_no_state) self.stubs.Set(fake._FakeImageService, 'show', fake_show_no_state)
self.assertRaises(exception.ApiError, run_instances, self.assertRaises(exception.ApiError, run_instances,
self.context, **kwargs) self.context, **kwargs)
@@ -483,7 +483,7 @@ class CloudTestCase(test.TestCase):
'type': 'machine', 'image_state': 'decrypting'}} 'type': 'machine', 'image_state': 'decrypting'}}
self.stubs.UnsetAll() self.stubs.UnsetAll()
self.stubs.Set(local.LocalImageService, 'show', fake_show_decrypt) self.stubs.Set(fake._FakeImageService, 'show', fake_show_decrypt)
self.assertRaises(exception.ApiError, run_instances, self.assertRaises(exception.ApiError, run_instances,
self.context, **kwargs) self.context, **kwargs)

14
nova/tests/test_compute.py
View File

@@ -22,21 +22,21 @@ Tests For Compute
import mox import mox
import stubout import stubout
from nova.auth import manager
from nova import compute from nova import compute
from nova.compute import instance_types
from nova.compute import manager as compute_manager
from nova.compute import power_state
from nova import context from nova import context
from nova import db from nova import db
from nova.db.sqlalchemy import models
from nova import exception from nova import exception
from nova import flags from nova import flags
import nova.image.fake
from nova import log as logging from nova import log as logging
from nova import rpc from nova import rpc
from nova import test from nova import test
from nova import utils from nova import utils
from nova.auth import manager
from nova.compute import instance_types
from nova.compute import manager as compute_manager
from nova.compute import power_state
from nova.db.sqlalchemy import models
from nova.image import local
LOG = logging.getLogger('nova.tests.compute') LOG = logging.getLogger('nova.tests.compute')
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
@@ -73,7 +73,7 @@ class ComputeTestCase(test.TestCase):
def fake_show(meh, context, id): def fake_show(meh, context, id):
return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1}} return {'id': 1, 'properties': {'kernel_id': 1, 'ramdisk_id': 1}}
self.stubs.Set(local.LocalImageService, 'show', fake_show) self.stubs.Set(nova.image.fake._FakeImageService, 'show', fake_show)
def tearDown(self): def tearDown(self):
self.manager.delete_user(self.user) self.manager.delete_user(self.user)