From: Steven Hardy <shardy@redhat.com>
Date: Fri, 24 Aug 2012 15:30:39 +0000 (+0100)
Subject: heat engine : bugfix show_watch, fix single-watch mode
X-Git-Tag: 2014.1~1507
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=16ec0a357c64e0056269f4d3e56ffdff724e387f;p=openstack-build%2Fheat-build.git

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 <shardy@redhat.com>
---

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)