openstack
/
nova
Code Issues Proposed changes

api: Remove unnecessary default parameter 

This was always set by callers and appears to be here purely to avoid
updating tests. Update the tests and ease comprehension of the function.

Change-Id: Ib22b64ca499ffdb1a32d21f52240e80676ae1165
This commit is contained in:
Stephen Finucane 2018-04-25 16:23:48 +01:00
parent 1b77604be1
commit bea2ab0379
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/api.py
View File

@ -862,7 +862,7 @@ class API(base.Base):
max_count, base_options, boot_meta, security_groups,
block_device_mapping, shutdown_terminate,
instance_group, check_server_group_quota, filter_properties,
key_pair, tags, trusted_certs, supports_multiattach=False,
key_pair, tags, trusted_certs, supports_multiattach,
network_metadata=None):
# Check quotas
num_instances = compute_utils.check_num_instances_quota(

19
nova/tests/unit/compute/test_compute_api.py
View File

@ -4504,7 +4504,7 @@ class _ComputeAPIUnitTestMixIn(object):
boot_meta, security_groups, block_device_mapping,
shutdown_terminate, instance_group,
check_server_group_quota, filter_properties,
None, objects.TagList(), trusted_certs)
None, objects.TagList(), trusted_certs, False)
do_test()
@ -4573,7 +4573,8 @@ class _ComputeAPIUnitTestMixIn(object):
{}, None,
None, None, None, {}, None,
fake_keypair,
objects.TagList(), None)
objects.TagList(), None,
False)
self.assertEqual(
'test',
mock_instance.return_value.keypairs.objects[0].name)
@ -4583,7 +4584,7 @@ class _ComputeAPIUnitTestMixIn(object):
{}, None,
None, None, None, {}, None,
None, objects.TagList(),
None)
None, False)
self.assertEqual(
0,
len(mock_instance.return_value.keypairs.objects))
@ -4661,7 +4662,8 @@ class _ComputeAPIUnitTestMixIn(object):
min_count, max_count, base_options, boot_meta,
security_groups, block_device_mappings, shutdown_terminate,
instance_group, check_server_group_quota,
filter_properties, None, instance_tags, trusted_certs)
filter_properties, None, instance_tags, trusted_certs,
False)
for rs, br, im in instances_to_build:
self.assertIsInstance(br.instance, objects.Instance)
@ -4742,7 +4744,8 @@ class _ComputeAPIUnitTestMixIn(object):
min_count, max_count, base_options, boot_meta,
security_groups, block_device_mapping, shutdown_terminate,
instance_group, check_server_group_quota,
filter_properties, None, objects.TagList(), trusted_certs))
filter_properties, None, objects.TagList(), trusted_certs,
False))
rs, br, im = instances_to_build[0]
self.assertTrue(uuidutils.is_uuid_like(br.instance.uuid))
self.assertEqual(br.instance_uuid, im.instance_uuid)
@ -4840,7 +4843,7 @@ class _ComputeAPIUnitTestMixIn(object):
boot_meta, security_groups, block_device_mapping,
shutdown_terminate, instance_group,
check_server_group_quota, filter_properties,
None, tags, trusted_certs)
None, tags, trusted_certs, False)
# First instance, build_req, mapping is created and destroyed
self.assertTrue(build_req_mocks[0].create.called)
self.assertTrue(build_req_mocks[0].destroy.called)
@ -4943,7 +4946,7 @@ class _ComputeAPIUnitTestMixIn(object):
boot_meta, security_groups, block_device_mapping,
shutdown_terminate, instance_group,
check_server_group_quota, filter_properties,
None, tags, trusted_certs)
None, tags, trusted_certs, False)
# First instance, build_req, mapping is created and destroyed
self.assertTrue(build_req_mocks[0].create.called)
self.assertTrue(build_req_mocks[0].destroy.called)
@ -4976,7 +4979,7 @@ class _ComputeAPIUnitTestMixIn(object):
mock.MagicMock(), None, None,
[], None, None, None, None,
None, objects.TagList(),
None)
None, False)
secgroups = mock_secgroup.populate_security_groups.return_value
mock_objects.RequestSpec.from_components.assert_called_once_with(
mock.ANY, mock.ANY, mock.ANY, mock.ANY, mock.ANY, mock.ANY,