From 16ec0a357c64e0056269f4d3e56ffdff724e387f Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Fri, 24 Aug 2012 16:30:39 +0100 Subject: [PATCH] heat engine : bugfix show_watch, fix single-watch mode When called with watch_name!=None we need to wrap the watch_rule_get response in a list Change-Id: I83bbe816758767afd3eb49b090b0b652036cad60 Signed-off-by: Steven Hardy --- heat/engine/manager.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/heat/engine/manager.py b/heat/engine/manager.py index 480fa2cf..a4ba4828 100644 --- a/heat/engine/manager.py +++ b/heat/engine/manager.py @@ -488,11 +488,14 @@ class EngineManager(manager.Manager): ''' if watch_name: try: - wrs = db_api.watch_rule_get(context, watch_name) + wr = db_api.watch_rule_get(context, watch_name) except Exception as ex: logger.warn('show_watch (%s) db error %s' % (watch_name, str(ex))) - return + if wr: + wrs = [wr] + else: + raise AttributeError('Unknown watch name %s' % watch_name) else: try: wrs = db_api.watch_rule_get_all(context) -- 2.45.2