Merge "Show an engine as down if service record is not updated twice" into stable/queens

2 files changed, 10 insertions, 14 deletions

diff --git a/heat/common/service_utils.py b/heat/common/service_utils.py
index b5cf00485..a59fef8e8 100644
--- a/heat/common/service_utils.py
+++ b/heat/common/service_utils.py
@@ -51,14 +51,10 @@ def format_service(service):
         return
 
     status = 'down'
-    if service.updated_at is not None:
-        if ((timeutils.utcnow() - service.updated_at).total_seconds()
-                <= service.report_interval):
-            status = 'up'
-    else:
-        if ((timeutils.utcnow() - service.created_at).total_seconds()
-                <= service.report_interval):
-            status = 'up'
+    last_updated = service.updated_at or service.created_at
+    check_interval = (timeutils.utcnow() - last_updated).total_seconds()
+    if check_interval <= 2 * service.report_interval:
+        status = 'up'
 
     result = {
         SERVICE_ID: service.id,
diff --git a/heat/tests/test_common_service_utils.py b/heat/tests/test_common_service_utils.py
index 6bad2a83d..0745e8f85 100644
--- a/heat/tests/test_common_service_utils.py
+++ b/heat/tests/test_common_service_utils.py
@@ -51,23 +51,23 @@ class TestServiceUtils(common.HeatTestCase):
 
         self.assertEqual(service_dict['status'], 'up')
 
-        # check again within first report_interval time (60)
+        # check again within first report_interval time
         service_dict = service_utils.format_service(service)
         self.assertEqual(service_dict['status'], 'up')
 
-        # check update not happen within report_interval time (60+)
+        # check update not happen within 2*report_interval time
         service.created_at = (timeutils.utcnow() -
-                              datetime.timedelta(0, 70))
+                              datetime.timedelta(0, 130))
         service_dict = service_utils.format_service(service)
         self.assertEqual(service_dict['status'], 'down')
 
-        # check update happened after report_interval time (60+)
+        # check update happened after 2* report_interval time
         service.updated_at = (timeutils.utcnow() -
-                              datetime.timedelta(0, 70))
+                              datetime.timedelta(0, 130))
         service_dict = service_utils.format_service(service)
         self.assertEqual(service_dict['status'], 'down')
 
-        # check update happened within report_interval time (60)
+        # check update happened within report_interval time
         service.updated_at = (timeutils.utcnow() -
                               datetime.timedelta(0, 50))
         service_dict = service_utils.format_service(service)