openstack/python-openstackclient
Code Issues Proposed changes

Merge "Use FakeVolume in server test cases."

Browse Source
This commit is contained in:
Jenkins 2015-12-09 04:14:56 +00:00 committed by Gerrit Code Review
commit ccbffb2ef9
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstackclient/tests/compute/v2/fakes.py
View File

@ -76,8 +76,6 @@ QUOTA = {
QUOTA_columns = tuple(sorted(QUOTA)) QUOTA_columns = tuple(sorted(QUOTA))
QUOTA_data = tuple(QUOTA[x] for x in sorted(QUOTA)) QUOTA_data = tuple(QUOTA[x] for x in sorted(QUOTA))
block_device_mapping = 'vda=' + volume_fakes.volume_name + ':::0'
service_host = 'host_test' service_host = 'host_test'
service_binary = 'compute_test' service_binary = 'compute_test'
service_status = 'enabled' service_status = 'enabled'

19
openstackclient/tests/compute/v2/test_server.py
View File

@ -13,7 +13,6 @@
# under the License. # under the License.
# #
import copy
import mock import mock
import testtools import testtools
@ -22,7 +21,6 @@ from openstackclient.common import exceptions
from openstackclient.common import utils as common_utils from openstackclient.common import utils as common_utils
from openstackclient.compute.v2 import server from openstackclient.compute.v2 import server
from openstackclient.tests.compute.v2 import fakes as compute_fakes from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import fakes
from openstackclient.tests.image.v2 import fakes as image_fakes from openstackclient.tests.image.v2 import fakes as image_fakes
from openstackclient.tests import utils from openstackclient.tests import utils
from openstackclient.tests.volume.v2 import fakes as volume_fakes from openstackclient.tests.volume.v2 import fakes as volume_fakes
@ -113,12 +111,9 @@ class TestServerCreate(TestServer):
self.flavor = compute_fakes.FakeFlavor.create_one_flavor() self.flavor = compute_fakes.FakeFlavor.create_one_flavor()
self.flavors_mock.get.return_value = self.flavor self.flavors_mock.get.return_value = self.flavor
self.volume = fakes.FakeResource( self.volume = volume_fakes.FakeVolume.create_one_volume()
None,
copy.deepcopy(volume_fakes.VOLUME),
loaded=True,
)
self.volumes_mock.get.return_value = self.volume self.volumes_mock.get.return_value = self.volume
self.block_device_mapping = 'vda=' + self.volume.name + ':::0'
# Get the command object to test # Get the command object to test
self.cmd = server.CreateServer(self.app, None) self.cmd = server.CreateServer(self.app, None)
@ -369,13 +364,13 @@ class TestServerCreate(TestServer):
arglist = [ arglist = [
'--image', 'image1', '--image', 'image1',
'--flavor', self.flavor.id, '--flavor', self.flavor.id,
'--block-device-mapping', compute_fakes.block_device_mapping, '--block-device-mapping', self.block_device_mapping,
self.new_server.name, self.new_server.name,
] ]
verifylist = [ verifylist = [
('image', 'image1'), ('image', 'image1'),
('flavor', self.flavor.id), ('flavor', self.flavor.id),
('block_device_mapping', [compute_fakes.block_device_mapping]), ('block_device_mapping', [self.block_device_mapping]),
('config_drive', False), ('config_drive', False),
('server_name', self.new_server.name), ('server_name', self.new_server.name),
] ]
@ -385,9 +380,9 @@ class TestServerCreate(TestServer):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
real_volume_mapping = ( real_volume_mapping = (
(compute_fakes.block_device_mapping.split('=', 1)[1]).replace( (self.block_device_mapping.split('=', 1)[1]).replace(
volume_fakes.volume_name, self.volume.name,
volume_fakes.volume_id)) self.volume.id))
# Set expected values # Set expected values
kwargs = dict( kwargs = dict(