openstack
/
heat
Code Issues Proposed changes

Ignore nova limits set to '-1' 

In case nova server has quotas turned off, e.g. when it uses
NoopQuotaDriver, nova-api returns '-1' for corresponding resources which
obviously means 'INFINITY'. In this case we should not check resource
template for any limits and should pass resource creation as-is.

Change-Id: Idaf485719e384f3a613031c7ff272d55798e6e77
Closes-Bug: #1310710
Co-Authored-By: Dmitry Borodaenko <dborodaenko@mirantis.com>
This commit is contained in:
Vladimir Kuklin 2014-04-21 21:42:14 +04:00 committed by Dmitry Borodaenko
parent 27557c9abd
commit 937ac5a089
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
heat/engine/resources/server.py
View File

@ -856,6 +856,15 @@ class Server(stack_user.StackUser):
if new_metadata is None:
self.metadata = self.parsed_template('Metadata')
@staticmethod
def _check_maximum(count, maximum, msg):
'''
Check a count against a maximum, unless maximum is -1 which indicates
that there is no limit
'''
if maximum != -1 and count > maximum:
raise exception.StackValidationFailed(message=msg)
def validate(self):
'''
Validate any of the provided params
@ -934,28 +943,28 @@ class Server(stack_user.StackUser):
# than the maximum number allowed in the provider's absolute
# limits
if metadata is not None:
if len(metadata) > limits['maxServerMeta']:
msg = _('Instance metadata must not contain greater than %s '
'entries. This is the maximum number allowed by your '
'service provider') % limits['maxServerMeta']
raise exception.StackValidationFailed(message=msg)
msg = _('Instance metadata must not contain greater than %s '
'entries. This is the maximum number allowed by your '
'service provider') % limits['maxServerMeta']
self._check_maximum(len(metadata),
limits['maxServerMeta'], msg)
# verify the number of personality files and the size of each
# personality file against the provider's absolute limits
if personality is not None:
if len(personality) > limits['maxPersonality']:
msg = _("The personality property may not contain "
"greater than %s entries.") % limits['maxPersonality']
raise exception.StackValidationFailed(message=msg)
msg = _("The personality property may not contain "
"greater than %s entries.") % limits['maxPersonality']
self._check_maximum(len(personality),
limits['maxPersonality'], msg)
for path, contents in personality.items():
if len(bytes(contents)) > limits['maxPersonalitySize']:
msg = (_("The contents of personality file \"%(path)s\" "
"is larger than the maximum allowed personality "
"file size (%(max_size)s bytes).") %
{'path': path,
'max_size': limits['maxPersonalitySize']})
raise exception.StackValidationFailed(message=msg)
msg = (_("The contents of personality file \"%(path)s\" "
"is larger than the maximum allowed personality "
"file size (%(max_size)s bytes).") %
{'path': path,
'max_size': limits['maxPersonalitySize']})
self._check_maximum(len(bytes(contents)),
limits['maxPersonalitySize'], msg)
def handle_delete(self):
'''

9
heat/tests/test_server.py
View File

@ -711,6 +711,15 @@ class ServersTest(HeatTestCase):
disk_config=None, reservation_id=None,
files={}, admin_pass='foo')
def test_check_maximum(self):
msg = 'test_check_maximum'
self.assertIsNone(servers.Server._check_maximum(1, 1, msg))
self.assertIsNone(servers.Server._check_maximum(1000, -1, msg))
error = self.assertRaises(exception.StackValidationFailed,
servers.Server._check_maximum,
2, 1, msg)
self.assertEqual(msg, str(error))
def test_server_validate(self):
stack_name = 'srv_val'
(t, stack) = self._setup_test_stack(stack_name)