Merge "Report status when engine start"
This commit is contained in:
commit
49bde9e4d2
|
@ -1611,6 +1611,10 @@ class EngineService(service.Service):
|
|||
report_interval=cfg.CONF.periodic_interval)
|
||||
)
|
||||
self.service_id = service_ref['id']
|
||||
service_objects.Service.update_by_id(
|
||||
cnxt,
|
||||
self.service_id,
|
||||
dict(deleted_at=None))
|
||||
LOG.info(_LI('Service %s is started'), self.service_id)
|
||||
|
||||
def service_manage_cleanup(self):
|
||||
|
|
|
@ -3196,11 +3196,13 @@ class StackServiceTest(common.HeatTestCase):
|
|||
self.assertTrue(mock_get_all.called)
|
||||
mock_format_service.assert_called_once_with(mock.ANY)
|
||||
|
||||
@mock.patch.object(service_objects.Service, 'update_by_id')
|
||||
@mock.patch.object(service_objects.Service, 'create')
|
||||
@mock.patch.object(context, 'get_admin_context')
|
||||
def test_service_manage_report_start(self,
|
||||
mock_admin_context,
|
||||
mock_service_create):
|
||||
mock_service_create,
|
||||
mock_service_update):
|
||||
self.eng.service_id = None
|
||||
mock_admin_context.return_value = self.ctx
|
||||
srv = dict(id='mock_id')
|
||||
|
@ -3215,8 +3217,11 @@ class StackServiceTest(common.HeatTestCase):
|
|||
engine_id=self.eng.engine_id,
|
||||
topic=self.eng.topic,
|
||||
report_interval=cfg.CONF.periodic_interval))
|
||||
|
||||
self.assertEqual(self.eng.service_id, srv['id'])
|
||||
mock_service_update.assert_called_once_with(
|
||||
self.ctx,
|
||||
self.eng.service_id,
|
||||
dict(deleted_at=None))
|
||||
|
||||
@mock.patch.object(service_objects.Service, 'get_all_by_args')
|
||||
@mock.patch.object(service_objects.Service, 'delete')
|
||||
|
|
Loading…
Reference in New Issue