openstack/heat
Code Issues Proposed changes

Merge "Do not replace failed server always"

Browse Source
This commit is contained in:
Jenkins 2017-01-06 08:45:13 +00:00 committed by Gerrit Code Review
commit 24a292c888
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/engine/resources/openstack/nova/server.py
View File

@ -1184,6 +1184,16 @@ class Server(server_base.BaseServer, sh.SchedulerHintsMixin,
before_props.get(self.USER_DATA_UPDATE_POLICY)) before_props.get(self.USER_DATA_UPDATE_POLICY))
return ud_update_policy == 'REPLACE' return ud_update_policy == 'REPLACE'
def needs_replace_failed(self):
if not self.resource_id:
return True
with self.client_plugin().ignore_not_found:
server = self.client().servers.get(self.resource_id)
return server.status in ('ERROR', 'DELETED', 'SOFT_DELETED')
return True
def handle_update(self, json_snippet, tmpl_diff, prop_diff): def handle_update(self, json_snippet, tmpl_diff, prop_diff):
updaters = super(Server, self).handle_update( updaters = super(Server, self).handle_update(
json_snippet, json_snippet,

20
heat/tests/openstack/nova/test_server.py
View File

@ -2021,6 +2021,26 @@ class ServersTest(common.HeatTestCase):
updater = scheduler.TaskRunner(server.update, update_template) updater = scheduler.TaskRunner(server.update, update_template)
self.assertRaises(resource.UpdateReplace, updater) self.assertRaises(resource.UpdateReplace, updater)
@mock.patch.object(nova.NovaClientPlugin, '_create')
def test_update_failed_server_not_replace(self, mock_create):
stack_name = 'update_failed_server_not_replace'
(tmpl, stack) = self._setup_test_stack(stack_name)
resource_defns = tmpl.resource_definitions(stack)
server = servers.Server('failed_not_replace',
resource_defns['WebServer'], stack)
update_props = tmpl.t['Resources']['WebServer']['Properties'].copy()
update_props['name'] = 'my_server'
update_template = server.t.freeze(properties=update_props)
server.action = server.CREATE
server.status = server.FAILED
server.resource_id = '6a953104-b874-44d2-a29a-26e7c367dc5c'
nova_server = self.fc.servers.list()[1]
nova_server.status = 'ACTIVE'
server.client = mock.Mock()
server.client().servers.get.return_value = nova_server
scheduler.TaskRunner(server.update, update_template)()
self.assertEqual((server.UPDATE, server.COMPLETE), server.state)
@mock.patch.object(servers.Server, 'prepare_for_replace') @mock.patch.object(servers.Server, 'prepare_for_replace')
@mock.patch.object(nova.NovaClientPlugin, '_create') @mock.patch.object(nova.NovaClientPlugin, '_create')
def test_server_update_server_userdata_ignore(self, mock_create, def test_server_update_server_userdata_ignore(self, mock_create,