openstack/python-openstackclient
Code Issues Proposed changes

Merge "Refactor TestVolumeCreate to use FakeVolume"

Browse Source
This commit is contained in:
Jenkins 2016-02-04 05:30:03 +00:00 committed by Gerrit Code Review
commit b861d21d14
1 changed files with 66 additions and 67 deletions

133
openstackclient/tests/volume/v2/test_volume.py

@ -16,6 +16,7 @@ import copy
from mock import call from mock import call
from openstackclient.common import utils
from openstackclient.tests import fakes from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes from openstackclient.tests.identity.v3 import fakes as identity_fakes
from openstackclient.tests.volume.v2 import fakes as volume_fakes from openstackclient.tests.volume.v2 import fakes as volume_fakes
@ -61,26 +62,24 @@ class TestVolumeCreate(TestVolume):
'status', 'status',
'type', 'type',
) )
datalist = (
volume_fakes.volume_attachments,
volume_fakes.volume_availability_zone,
volume_fakes.volume_description,
volume_fakes.volume_id,
volume_fakes.volume_name,
volume_fakes.volume_metadata_str,
volume_fakes.volume_size,
volume_fakes.volume_snapshot_id,
volume_fakes.volume_status,
volume_fakes.volume_type,
)
def setUp(self): def setUp(self):
super(TestVolumeCreate, self).setUp() super(TestVolumeCreate, self).setUp()
self.volumes_mock.create.return_value = fakes.FakeResource( self.new_volume = volume_fakes.FakeVolume.create_one_volume()
None, self.volumes_mock.create.return_value = self.new_volume
copy.deepcopy(volume_fakes.VOLUME),
loaded=True, self.datalist = (
self.new_volume.attachments,
self.new_volume.availability_zone,
self.new_volume.description,
self.new_volume.id,
self.new_volume.name,
utils.format_dict(self.new_volume.metadata),
self.new_volume.size,
self.new_volume.snapshot_id,
self.new_volume.status,
self.new_volume.volume_type,
) )
# Get the command object to test # Get the command object to test
@ -88,12 +87,12 @@ class TestVolumeCreate(TestVolume):
def test_volume_create_min_options(self): def test_volume_create_min_options(self):
arglist = [ arglist = [
'--size', str(volume_fakes.volume_size), '--size', str(self.new_volume.size),
volume_fakes.volume_name, self.new_volume.name,
] ]
verifylist = [ verifylist = [
('size', volume_fakes.volume_size), ('size', self.new_volume.size),
('name', volume_fakes.volume_name), ('name', self.new_volume.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -101,9 +100,9 @@ class TestVolumeCreate(TestVolume):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.volumes_mock.create.assert_called_with( self.volumes_mock.create.assert_called_with(
size=volume_fakes.volume_size, size=self.new_volume.size,
snapshot_id=None, snapshot_id=None,
name=volume_fakes.volume_name, name=self.new_volume.name,
description=None, description=None,
volume_type=None, volume_type=None,
user_id=None, user_id=None,
@ -119,18 +118,18 @@ class TestVolumeCreate(TestVolume):
def test_volume_create_options(self): def test_volume_create_options(self):
arglist = [ arglist = [
'--size', str(volume_fakes.volume_size), '--size', str(self.new_volume.size),
'--description', volume_fakes.volume_description, '--description', self.new_volume.description,
'--type', volume_fakes.volume_type, '--type', self.new_volume.volume_type,
'--availability-zone', volume_fakes.volume_availability_zone, '--availability-zone', self.new_volume.availability_zone,
volume_fakes.volume_name, self.new_volume.name,
] ]
verifylist = [ verifylist = [
('size', volume_fakes.volume_size), ('size', self.new_volume.size),
('description', volume_fakes.volume_description), ('description', self.new_volume.description),
('type', volume_fakes.volume_type), ('type', self.new_volume.volume_type),
('availability_zone', volume_fakes.volume_availability_zone), ('availability_zone', self.new_volume.availability_zone),
('name', volume_fakes.volume_name), ('name', self.new_volume.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -138,14 +137,14 @@ class TestVolumeCreate(TestVolume):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.volumes_mock.create.assert_called_with( self.volumes_mock.create.assert_called_with(
size=volume_fakes.volume_size, size=self.new_volume.size,
snapshot_id=None, snapshot_id=None,
name=volume_fakes.volume_name, name=self.new_volume.name,
description=volume_fakes.volume_description, description=self.new_volume.description,
volume_type=volume_fakes.volume_type, volume_type=self.new_volume.volume_type,
user_id=None, user_id=None,
project_id=None, project_id=None,
availability_zone=volume_fakes.volume_availability_zone, availability_zone=self.new_volume.availability_zone,
metadata=None, metadata=None,
imageRef=None, imageRef=None,
source_volid=None source_volid=None
@ -169,16 +168,16 @@ class TestVolumeCreate(TestVolume):
) )
arglist = [ arglist = [
'--size', str(volume_fakes.volume_size), '--size', str(self.new_volume.size),
'--project', identity_fakes.project_id, '--project', identity_fakes.project_id,
'--user', identity_fakes.user_id, '--user', identity_fakes.user_id,
volume_fakes.volume_name, self.new_volume.name,
] ]
verifylist = [ verifylist = [
('size', volume_fakes.volume_size), ('size', self.new_volume.size),
('project', identity_fakes.project_id), ('project', identity_fakes.project_id),
('user', identity_fakes.user_id), ('user', identity_fakes.user_id),
('name', volume_fakes.volume_name), ('name', self.new_volume.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -186,9 +185,9 @@ class TestVolumeCreate(TestVolume):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.volumes_mock.create.assert_called_with( self.volumes_mock.create.assert_called_with(
size=volume_fakes.volume_size, size=self.new_volume.size,
snapshot_id=None, snapshot_id=None,
name=volume_fakes.volume_name, name=self.new_volume.name,
description=None, description=None,
volume_type=None, volume_type=None,
user_id=identity_fakes.user_id, user_id=identity_fakes.user_id,
@ -217,16 +216,16 @@ class TestVolumeCreate(TestVolume):
) )
arglist = [ arglist = [
'--size', str(volume_fakes.volume_size), '--size', str(self.new_volume.size),
'--project', identity_fakes.project_name, '--project', identity_fakes.project_name,
'--user', identity_fakes.user_name, '--user', identity_fakes.user_name,
volume_fakes.volume_name, self.new_volume.name,
] ]
verifylist = [ verifylist = [
('size', volume_fakes.volume_size), ('size', self.new_volume.size),
('project', identity_fakes.project_name), ('project', identity_fakes.project_name),
('user', identity_fakes.user_name), ('user', identity_fakes.user_name),
('name', volume_fakes.volume_name), ('name', self.new_volume.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -234,9 +233,9 @@ class TestVolumeCreate(TestVolume):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.volumes_mock.create.assert_called_with( self.volumes_mock.create.assert_called_with(
size=volume_fakes.volume_size, size=self.new_volume.size,
snapshot_id=None, snapshot_id=None,
name=volume_fakes.volume_name, name=self.new_volume.name,
description=None, description=None,
volume_type=None, volume_type=None,
user_id=identity_fakes.user_id, user_id=identity_fakes.user_id,
@ -254,13 +253,13 @@ class TestVolumeCreate(TestVolume):
arglist = [ arglist = [
'--property', 'Alpha=a', '--property', 'Alpha=a',
'--property', 'Beta=b', '--property', 'Beta=b',
'--size', str(volume_fakes.volume_size), '--size', str(self.new_volume.size),
volume_fakes.volume_name, self.new_volume.name,
] ]
verifylist = [ verifylist = [
('property', {'Alpha': 'a', 'Beta': 'b'}), ('property', {'Alpha': 'a', 'Beta': 'b'}),
('size', volume_fakes.volume_size), ('size', self.new_volume.size),
('name', volume_fakes.volume_name), ('name', self.new_volume.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -268,9 +267,9 @@ class TestVolumeCreate(TestVolume):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.volumes_mock.create.assert_called_with( self.volumes_mock.create.assert_called_with(
size=volume_fakes.volume_size, size=self.new_volume.size,
snapshot_id=None, snapshot_id=None,
name=volume_fakes.volume_name, name=self.new_volume.name,
description=None, description=None,
volume_type=None, volume_type=None,
user_id=None, user_id=None,
@ -293,13 +292,13 @@ class TestVolumeCreate(TestVolume):
arglist = [ arglist = [
'--image', volume_fakes.image_id, '--image', volume_fakes.image_id,
'--size', str(volume_fakes.volume_size), '--size', str(self.new_volume.size),
volume_fakes.volume_name, self.new_volume.name,
] ]
verifylist = [ verifylist = [
('image', volume_fakes.image_id), ('image', volume_fakes.image_id),
('size', volume_fakes.volume_size), ('size', self.new_volume.size),
('name', volume_fakes.volume_name), ('name', self.new_volume.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -307,9 +306,9 @@ class TestVolumeCreate(TestVolume):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.volumes_mock.create.assert_called_with( self.volumes_mock.create.assert_called_with(
size=volume_fakes.volume_size, size=self.new_volume.size,
snapshot_id=None, snapshot_id=None,
name=volume_fakes.volume_name, name=self.new_volume.name,
description=None, description=None,
volume_type=None, volume_type=None,
user_id=None, user_id=None,
@ -332,13 +331,13 @@ class TestVolumeCreate(TestVolume):
arglist = [ arglist = [
'--image', volume_fakes.image_name, '--image', volume_fakes.image_name,
'--size', str(volume_fakes.volume_size), '--size', str(self.new_volume.size),
volume_fakes.volume_name, self.new_volume.name,
] ]
verifylist = [ verifylist = [
('image', volume_fakes.image_name), ('image', volume_fakes.image_name),
('size', volume_fakes.volume_size), ('size', self.new_volume.size),
('name', volume_fakes.volume_name), ('name', self.new_volume.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -346,9 +345,9 @@ class TestVolumeCreate(TestVolume):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.volumes_mock.create.assert_called_with( self.volumes_mock.create.assert_called_with(
size=volume_fakes.volume_size, size=self.new_volume.size,
snapshot_id=None, snapshot_id=None,
name=volume_fakes.volume_name, name=self.new_volume.name,
description=None, description=None,
volume_type=None, volume_type=None,
user_id=None, user_id=None,