openstack
/
python-openstackclient
Code Issues Proposed changes

Refactor qos spec unit test in volume v1 

Refactor qos spec unit test with FakeQos class
in volume v1.

Change-Id: Ia76bf41a911457282b293dfaf0af311b1a9194ce
This commit is contained in:
Huanxuan Ao 2016-10-04 22:55:49 +08:00
parent 62bf9e2609
commit ea7f28fb4a
2 changed files with 124 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openstackclient/tests/unit/volume/v1/fakes.py
View File

@ -305,6 +305,32 @@ class FakeQos(object):
loaded=True) loaded=True)
return qos return qos
@staticmethod
def create_one_qos_association(attrs=None):
"""Create a fake Qos specification association.
:param Dictionary attrs:
A dictionary with all attributes
:return:
A FakeResource object with id, name, association_type, etc.
"""
attrs = attrs or {}
# Set default attributes.
qos_association_info = {
"id": 'type-id-' + uuid.uuid4().hex,
"name": 'type-name-' + uuid.uuid4().hex,
"association_type": 'volume_type',
}
# Overwrite default attributes.
qos_association_info.update(attrs)
qos_association = fakes.FakeResource(
info=copy.deepcopy(qos_association_info),
loaded=True)
return qos_association
@staticmethod @staticmethod
def create_qoses(attrs=None, count=2): def create_qoses(attrs=None, count=2):
"""Create multiple fake Qos specifications. """Create multiple fake Qos specifications.

257
openstackclient/tests/unit/volume/v1/test_qos_specs.py
View File

@ -13,14 +13,12 @@
# under the License. # under the License.
# #
import copy
import mock import mock
from mock import call from mock import call
from osc_lib import exceptions from osc_lib import exceptions
from osc_lib import utils from osc_lib import utils
from openstackclient.tests.unit import fakes
from openstackclient.tests.unit.volume.v1 import fakes as volume_fakes from openstackclient.tests.unit.volume.v1 import fakes as volume_fakes
from openstackclient.volume.v1 import qos_specs from openstackclient.volume.v1 import qos_specs
@ -39,154 +37,124 @@ class TestQos(volume_fakes.TestVolumev1):
class TestQosAssociate(TestQos): class TestQosAssociate(TestQos):
volume_type = volume_fakes.FakeType.create_one_type()
qos_spec = volume_fakes.FakeQos.create_one_qos()
def setUp(self): def setUp(self):
super(TestQosAssociate, self).setUp() super(TestQosAssociate, self).setUp()
self.qos_mock.get.return_value = self.qos_spec
self.types_mock.get.return_value = self.volume_type
# Get the command object to test # Get the command object to test
self.cmd = qos_specs.AssociateQos(self.app, None) self.cmd = qos_specs.AssociateQos(self.app, None)
def test_qos_associate(self): def test_qos_associate(self):
self.qos_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.QOS),
loaded=True
)
self.types_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.TYPE),
loaded=True
)
arglist = [ arglist = [
volume_fakes.qos_id, self.qos_spec.id,
volume_fakes.type_id self.volume_type.id
] ]
verifylist = [ verifylist = [
('qos_spec', volume_fakes.qos_id), ('qos_spec', self.qos_spec.id),
('volume_type', volume_fakes.type_id) ('volume_type', self.volume_type.id)
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.qos_mock.associate.assert_called_with( self.qos_mock.associate.assert_called_with(
volume_fakes.qos_id, self.qos_spec.id,
volume_fakes.type_id self.volume_type.id
) )
self.assertIsNone(result) self.assertIsNone(result)
class TestQosCreate(TestQos): class TestQosCreate(TestQos):
new_qos_spec = volume_fakes.FakeQos.create_one_qos()
columns = ( columns = (
'consumer', 'consumer',
'id', 'id',
'name', 'name',
'specs'
) )
datalist = ( datalist = (
volume_fakes.qos_consumer, new_qos_spec.consumer,
volume_fakes.qos_id, new_qos_spec.id,
volume_fakes.qos_name new_qos_spec.name,
new_qos_spec.specs
) )
def setUp(self): def setUp(self):
super(TestQosCreate, self).setUp() super(TestQosCreate, self).setUp()
self.qos_mock.create.return_value = self.new_qos_spec
# Get the command object to test # Get the command object to test
self.cmd = qos_specs.CreateQos(self.app, None) self.cmd = qos_specs.CreateQos(self.app, None)
def test_qos_create_without_properties(self): def test_qos_create_without_properties(self):
self.qos_mock.create.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.QOS_DEFAULT_CONSUMER),
loaded=True
)
arglist = [ arglist = [
volume_fakes.qos_name, self.new_qos_spec.name,
] ]
verifylist = [ verifylist = [
('name', volume_fakes.qos_name), ('name', self.new_qos_spec.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.qos_mock.create.assert_called_with( self.qos_mock.create.assert_called_with(
volume_fakes.qos_name, self.new_qos_spec.name,
{'consumer': volume_fakes.qos_default_consumer} {'consumer': 'both'}
) )
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
datalist = ( self.assertEqual(self.datalist, data)
volume_fakes.qos_default_consumer,
volume_fakes.qos_id,
volume_fakes.qos_name
)
self.assertEqual(datalist, data)
def test_qos_create_with_consumer(self): def test_qos_create_with_consumer(self):
self.qos_mock.create.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.QOS),
loaded=True
)
arglist = [ arglist = [
volume_fakes.qos_name, '--consumer', self.new_qos_spec.consumer,
'--consumer', volume_fakes.qos_consumer self.new_qos_spec.name,
] ]
verifylist = [ verifylist = [
('name', volume_fakes.qos_name), ('consumer', self.new_qos_spec.consumer),
('consumer', volume_fakes.qos_consumer) ('name', self.new_qos_spec.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.qos_mock.create.assert_called_with( self.qos_mock.create.assert_called_with(
volume_fakes.qos_name, self.new_qos_spec.name,
{'consumer': volume_fakes.qos_consumer} {'consumer': self.new_qos_spec.consumer}
) )
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.datalist, data) self.assertEqual(self.datalist, data)
def test_qos_create_with_properties(self): def test_qos_create_with_properties(self):
self.qos_mock.create.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.QOS_WITH_SPECS),
loaded=True
)
arglist = [ arglist = [
volume_fakes.qos_name, '--consumer', self.new_qos_spec.consumer,
'--consumer', volume_fakes.qos_consumer,
'--property', 'foo=bar', '--property', 'foo=bar',
'--property', 'iops=9001' '--property', 'iops=9001',
self.new_qos_spec.name,
] ]
verifylist = [ verifylist = [
('name', volume_fakes.qos_name), ('consumer', self.new_qos_spec.consumer),
('consumer', volume_fakes.qos_consumer), ('property', self.new_qos_spec.specs),
('property', volume_fakes.qos_specs) ('name', self.new_qos_spec.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
specs = volume_fakes.qos_specs.copy() self.new_qos_spec.specs.update(
specs.update({'consumer': volume_fakes.qos_consumer}) {'consumer': self.new_qos_spec.consumer})
self.qos_mock.create.assert_called_with( self.qos_mock.create.assert_called_with(
volume_fakes.qos_name, self.new_qos_spec.name,
specs self.new_qos_spec.specs
) )
columns = self.columns + ( self.assertEqual(self.columns, columns)
'specs', self.assertEqual(self.datalist, data)
)
self.assertEqual(columns, columns)
datalist = self.datalist + (
volume_fakes.qos_specs,
)
self.assertEqual(datalist, data)
class TestQosDelete(TestQos): class TestQosDelete(TestQos):
@ -294,79 +262,62 @@ class TestQosDelete(TestQos):
class TestQosDisassociate(TestQos): class TestQosDisassociate(TestQos):
volume_type = volume_fakes.FakeType.create_one_type()
qos_spec = volume_fakes.FakeQos.create_one_qos()
def setUp(self): def setUp(self):
super(TestQosDisassociate, self).setUp() super(TestQosDisassociate, self).setUp()
self.qos_mock.get.return_value = self.qos_spec
self.types_mock.get.return_value = self.volume_type
# Get the command object to test # Get the command object to test
self.cmd = qos_specs.DisassociateQos(self.app, None) self.cmd = qos_specs.DisassociateQos(self.app, None)
def test_qos_disassociate_with_volume_type(self): def test_qos_disassociate_with_volume_type(self):
self.qos_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.QOS),
loaded=True
)
self.types_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.TYPE),
loaded=True
)
arglist = [ arglist = [
volume_fakes.qos_id, '--volume-type', self.volume_type.id,
'--volume-type', volume_fakes.type_id self.qos_spec.id,
] ]
verifylist = [ verifylist = [
('qos_spec', volume_fakes.qos_id), ('volume_type', self.volume_type.id),
('volume_type', volume_fakes.type_id) ('qos_spec', self.qos_spec.id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.qos_mock.disassociate.assert_called_with( self.qos_mock.disassociate.assert_called_with(
volume_fakes.qos_id, self.qos_spec.id,
volume_fakes.type_id self.volume_type.id
) )
self.assertIsNone(result) self.assertIsNone(result)
def test_qos_disassociate_with_all_volume_types(self): def test_qos_disassociate_with_all_volume_types(self):
self.qos_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.QOS),
loaded=True
)
arglist = [ arglist = [
volume_fakes.qos_id, '--all',
'--all' self.qos_spec.id,
] ]
verifylist = [ verifylist = [
('qos_spec', volume_fakes.qos_id) ('qos_spec', self.qos_spec.id)
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.qos_mock.disassociate_all.assert_called_with(volume_fakes.qos_id) self.qos_mock.disassociate_all.assert_called_with(self.qos_spec.id)
self.assertIsNone(result) self.assertIsNone(result)
class TestQosList(TestQos): class TestQosList(TestQos):
qos_spec = volume_fakes.FakeQos.create_one_qos()
qos_association = volume_fakes.FakeQos.create_one_qos_association()
def setUp(self): def setUp(self):
super(TestQosList, self).setUp() super(TestQosList, self).setUp()
self.qos_mock.get.return_value = fakes.FakeResource( self.qos_mock.list.return_value = [self.qos_spec]
None, self.qos_mock.get_associations.return_value = [self.qos_association]
copy.deepcopy(volume_fakes.QOS_WITH_ASSOCIATIONS),
loaded=True,
)
self.qos_mock.list.return_value = [self.qos_mock.get.return_value]
self.qos_mock.get_associations.return_value = [fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.qos_association),
loaded=True,
)]
# Get the command object to test # Get the command object to test
self.cmd = qos_specs.ListQos(self.app, None) self.cmd = qos_specs.ListQos(self.app, None)
@ -389,81 +340,72 @@ class TestQosList(TestQos):
) )
self.assertEqual(collist, columns) self.assertEqual(collist, columns)
datalist = (( datalist = ((
volume_fakes.qos_id, self.qos_spec.id,
volume_fakes.qos_name, self.qos_spec.name,
volume_fakes.qos_consumer, self.qos_spec.consumer,
volume_fakes.type_name, self.qos_association.name,
utils.format_dict(volume_fakes.qos_specs), utils.format_dict(self.qos_spec.specs),
), ) ), )
self.assertEqual(datalist, tuple(data)) self.assertEqual(datalist, tuple(data))
class TestQosSet(TestQos): class TestQosSet(TestQos):
qos_spec = volume_fakes.FakeQos.create_one_qos()
def setUp(self): def setUp(self):
super(TestQosSet, self).setUp() super(TestQosSet, self).setUp()
self.qos_mock.get.return_value = self.qos_spec
# Get the command object to test # Get the command object to test
self.cmd = qos_specs.SetQos(self.app, None) self.cmd = qos_specs.SetQos(self.app, None)
def test_qos_set_with_properties_with_id(self): def test_qos_set_with_properties_with_id(self):
self.qos_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.QOS_WITH_SPECS),
loaded=True
)
arglist = [ arglist = [
volume_fakes.qos_id,
'--property', 'foo=bar', '--property', 'foo=bar',
'--property', 'iops=9001' '--property', 'iops=9001',
self.qos_spec.id,
] ]
verifylist = [ verifylist = [
('qos_spec', volume_fakes.qos_id), ('property', self.qos_spec.specs),
('property', volume_fakes.qos_specs) ('qos_spec', self.qos_spec.id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.qos_mock.set_keys.assert_called_with( self.qos_mock.set_keys.assert_called_with(
volume_fakes.qos_id, self.qos_spec.id,
volume_fakes.qos_specs self.qos_spec.specs
) )
self.assertIsNone(result) self.assertIsNone(result)
class TestQosShow(TestQos): class TestQosShow(TestQos):
qos_spec = volume_fakes.FakeQos.create_one_qos()
qos_association = volume_fakes.FakeQos.create_one_qos_association()
def setUp(self): def setUp(self):
super(TestQosShow, self).setUp() super(TestQosShow, self).setUp()
self.qos_mock.get.return_value = self.qos_spec
self.qos_mock.get.return_value = fakes.FakeResource( self.qos_mock.get_associations.return_value = [self.qos_association]
None,
copy.deepcopy(volume_fakes.QOS_WITH_ASSOCIATIONS),
loaded=True,
)
self.qos_mock.get_associations.return_value = [fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.qos_association),
loaded=True,
)]
# Get the command object to test # Get the command object to test
self.cmd = qos_specs.ShowQos(self.app, None) self.cmd = qos_specs.ShowQos(self.app, None)
def test_qos_show(self): def test_qos_show(self):
arglist = [ arglist = [
volume_fakes.qos_id self.qos_spec.id
] ]
verifylist = [ verifylist = [
('qos_spec', volume_fakes.qos_id) ('qos_spec', self.qos_spec.id)
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.qos_mock.get.assert_called_with( self.qos_mock.get.assert_called_with(
volume_fakes.qos_id self.qos_spec.id
) )
collist = ( collist = (
@ -475,56 +417,53 @@ class TestQosShow(TestQos):
) )
self.assertEqual(collist, columns) self.assertEqual(collist, columns)
datalist = ( datalist = (
volume_fakes.type_name, self.qos_association.name,
volume_fakes.qos_consumer, self.qos_spec.consumer,
volume_fakes.qos_id, self.qos_spec.id,
volume_fakes.qos_name, self.qos_spec.name,
utils.format_dict(volume_fakes.qos_specs), utils.format_dict(self.qos_spec.specs),
) )
self.assertEqual(datalist, tuple(data)) self.assertEqual(datalist, tuple(data))
class TestQosUnset(TestQos): class TestQosUnset(TestQos):
qos_spec = volume_fakes.FakeQos.create_one_qos()
def setUp(self): def setUp(self):
super(TestQosUnset, self).setUp() super(TestQosUnset, self).setUp()
self.qos_mock.get.return_value = self.qos_spec
# Get the command object to test # Get the command object to test
self.cmd = qos_specs.UnsetQos(self.app, None) self.cmd = qos_specs.UnsetQos(self.app, None)
def test_qos_unset_with_properties(self): def test_qos_unset_with_properties(self):
self.qos_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(volume_fakes.QOS),
loaded=True
)
arglist = [ arglist = [
volume_fakes.qos_id,
'--property', 'iops', '--property', 'iops',
'--property', 'foo' '--property', 'foo',
self.qos_spec.id,
] ]
verifylist = [ verifylist = [
('qos_spec', volume_fakes.qos_id), ('property', ['iops', 'foo']),
('property', ['iops', 'foo']) ('qos_spec', self.qos_spec.id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.qos_mock.unset_keys.assert_called_with( self.qos_mock.unset_keys.assert_called_with(
volume_fakes.qos_id, self.qos_spec.id,
['iops', 'foo'] ['iops', 'foo']
) )
self.assertIsNone(result) self.assertIsNone(result)
def test_qos_unset_nothing(self): def test_qos_unset_nothing(self):
arglist = [ arglist = [
volume_fakes.qos_id, self.qos_spec.id,
] ]
verifylist = [ verifylist = [
('qos_spec', volume_fakes.qos_id), ('qos_spec', self.qos_spec.id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)