openstack
/
heat
Code Issues Proposed changes

Use EntityNotFound instead of ServerNotFound 

This patch will use EntityNotFound instead of
ServerNotFound. And will remove ServerNotFound
exception class definition.

Change-Id: I5a5aba82d57056893d5d7e644448cbd3de632ea5
Closes-Bug: #1461343
This commit is contained in:
huangtianhua 2015-06-03 10:20:19 +08:00
parent 0ba3206b40
commit 232fe4ae02
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/common/exception.py
View File

@ -231,10 +231,6 @@ class EntityNotFound(HeatException):
msg_fmt = _("The %(entity)s (%(name)s) could not be found.") msg_fmt = _("The %(entity)s (%(name)s) could not be found.")
class ServerNotFound(HeatException):
msg_fmt = _("The server (%(server)s) could not be found.")
class VolumeNotFound(HeatException): class VolumeNotFound(HeatException):
msg_fmt = _("The Volume (%(volume)s) could not be found.") msg_fmt = _("The Volume (%(volume)s) could not be found.")

4
heat/engine/clients/os/nova.py
View File

@ -425,7 +425,7 @@ echo -e '%s\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
except exceptions.NotFound as ex: except exceptions.NotFound as ex:
LOG.warn(_LW('Server (%(server)s) not found: %(ex)s'), LOG.warn(_LW('Server (%(server)s) not found: %(ex)s'),
{'server': server, 'ex': ex}) {'server': server, 'ex': ex})
raise exception.ServerNotFound(server=server) raise exception.EntityNotFound(entity='Server', name=server)
def absolute_limits(self): def absolute_limits(self):
"""Return the absolute limits as a dictionary.""" """Return the absolute limits as a dictionary."""
@ -545,7 +545,7 @@ echo -e '%s\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
class ServerConstraint(constraints.BaseCustomConstraint): class ServerConstraint(constraints.BaseCustomConstraint):
expected_exceptions = (exception.ServerNotFound,) expected_exceptions = (exception.EntityNotFound,)
def validate_with_client(self, client, server): def validate_with_client(self, client, server):
client.client_plugin('nova').get_server(server) client.client_plugin('nova').get_server(server)

5
heat/tests/autoscaling/test_launch_config.py
View File

@ -132,10 +132,11 @@ class LaunchConfigurationTest(common.HeatTestCase):
rsrc = stack['LaunchConfig'] rsrc = stack['LaunchConfig']
self.patchobject(nova.NovaClientPlugin, 'get_server', self.patchobject(nova.NovaClientPlugin, 'get_server',
side_effect=exception.ServerNotFound(server='5678')) side_effect=exception.EntityNotFound(
entity='Server', name='5678'))
msg = ("Property error : " msg = ("Property error : "
"Resources.LaunchConfig.Properties.InstanceId: " "Resources.LaunchConfig.Properties.InstanceId: "
"Error validating value '5678': The server (5678) " "Error validating value '5678': The Server (5678) "
"could not be found.") "could not be found.")
exc = self.assertRaises(exception.StackValidationFailed, exc = self.assertRaises(exception.StackValidationFailed,
rsrc.validate) rsrc.validate)

6
heat/tests/autoscaling/test_scaling_group.py
View File

@ -183,8 +183,8 @@ class TestAutoScalingGroupValidation(common.HeatTestCase):
mock_server.security_groups = [{u'name': u'hth_test'}] mock_server.security_groups = [{u'name': u'hth_test'}]
if not_found: if not_found:
self.patchobject(nova.NovaClientPlugin, 'get_server', self.patchobject(nova.NovaClientPlugin, 'get_server',
side_effect=exception.ServerNotFound( side_effect=exception.EntityNotFound(
server='5678')) entity='Server', name='5678'))
else: else:
self.patchobject(nova.NovaClientPlugin, 'get_server', self.patchobject(nova.NovaClientPlugin, 'get_server',
return_value=mock_server) return_value=mock_server)
@ -222,7 +222,7 @@ class TestAutoScalingGroupValidation(common.HeatTestCase):
self.m.ReplayAll() self.m.ReplayAll()
msg = ("Property error : " msg = ("Property error : "
"Resources.WebServerGroup.Properties.InstanceId: " "Resources.WebServerGroup.Properties.InstanceId: "
"Error validating value '5678': The server (5678) could " "Error validating value '5678': The Server (5678) could "
"not be found.") "not be found.")
exc = self.assertRaises(exception.StackValidationFailed, exc = self.assertRaises(exception.StackValidationFailed,
rsrc.validate) rsrc.validate)

6
heat/tests/test_nova_client.py
View File

@ -103,7 +103,7 @@ class NovaClientPluginTests(NovaClientPluginTestCase):
self.nova_client.servers.get.side_effect = [ self.nova_client.servers.get.side_effect = [
my_server, nova_exceptions.NotFound(404)] my_server, nova_exceptions.NotFound(404)]
self.assertEqual(my_server, self.nova_plugin.get_server('my_server')) self.assertEqual(my_server, self.nova_plugin.get_server('my_server'))
self.assertRaises(exception.ServerNotFound, self.assertRaises(exception.EntityNotFound,
self.nova_plugin.get_server, 'idontexist') self.nova_plugin.get_server, 'idontexist')
calls = [mock.call('my_server'), calls = [mock.call('my_server'),
mock.call('idontexist')] mock.call('idontexist')]
@ -319,8 +319,8 @@ class ServerConstraintTest(common.HeatTestCase):
self.assertTrue(self.constraint.validate("foo", self.ctx)) self.assertTrue(self.constraint.validate("foo", self.ctx))
def test_validation_error(self): def test_validation_error(self):
self.mock_get_server.side_effect = exception.ServerNotFound( self.mock_get_server.side_effect = exception.EntityNotFound(
server='bar') entity='Server', name='bar')
self.assertFalse(self.constraint.validate("bar", self.ctx)) self.assertFalse(self.constraint.validate("bar", self.ctx))