Merge "print user friendly error message for alarm update time constraints"

1 files changed, 3 insertions, 2 deletions

diff --git a/ceilometerclient/v2/alarms.py b/ceilometerclient/v2/alarms.py
index 18cdbb0..a54183a 100644
--- a/ceilometerclient/v2/alarms.py
+++ b/ceilometerclient/v2/alarms.py
@@ -135,14 +135,15 @@ class AlarmManager(base.Manager):
             updated_tcs = [dict(tc) for tc in existing_tcs]
             for tc in new_tcs:
                 for i, old_tc in enumerate(updated_tcs):
-                    if old_tc['name'] == tc['name']:  # if names match, merge
+                    # if names match, merge
+                    if old_tc['name'] == tc.get('name'):
                         utils.merge_nested_dict(updated_tcs[i], tc)
                         break
                 else:
                     updated_tcs.append(tc)
         tcs_to_remove = kwargs.get('remove_time_constraints', [])
         for tc in updated_tcs:
-            if tc['name'] in tcs_to_remove:
+            if tc.get('name') in tcs_to_remove:
                 updated_tcs.remove(tc)
         return updated_tcs