From e867c785cbbc22de3b6e818f89e132718e7786ea Mon Sep 17 00:00:00 2001
From: Joe Keen <joe.keen@hp.com>
Date: Tue, 10 Mar 2015 15:07:03 -0600
Subject: [PATCH] Handle API returning dict instead of list

Change-Id: I8d9c0462999209a1316d220c39ef5f93dd796755
---
 monascaclient/v2_0/alarm_definitions.py | 2 +-
 monascaclient/v2_0/alarms.py            | 6 +++---
 monascaclient/v2_0/metrics.py           | 6 +++---
 monascaclient/v2_0/notifications.py     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/monascaclient/v2_0/alarm_definitions.py b/monascaclient/v2_0/alarm_definitions.py
index 209ebb5..e4005e3 100644
--- a/monascaclient/v2_0/alarm_definitions.py
+++ b/monascaclient/v2_0/alarm_definitions.py
@@ -57,7 +57,7 @@ class AlarmDefinitionsManager(monasca_manager.MonascaManager):
         # print url_str
         resp, body = self.client.json_request(
             'GET', url_str, headers=newheaders)
-        return body
+        return body['elements'] if type(body) is dict else body
 
     def delete(self, **kwargs):
         """Delete a specific alarm definition."""
diff --git a/monascaclient/v2_0/alarms.py b/monascaclient/v2_0/alarms.py
index 6641b21..acc2686 100644
--- a/monascaclient/v2_0/alarms.py
+++ b/monascaclient/v2_0/alarms.py
@@ -49,7 +49,7 @@ class AlarmsManager(monasca_manager.MonascaManager):
         # print url_str
         resp, body = self.client.json_request(
             'GET', url_str, headers=newheaders)
-        return body
+        return body['elements'] if type(body) is dict else body
 
     def delete(self, **kwargs):
         """Delete a specific alarm."""
@@ -86,7 +86,7 @@ class AlarmsManager(monasca_manager.MonascaManager):
         del kwargs['alarm_id']
         resp, body = self.client.json_request('GET', url_str,
                                               headers=newheaders)
-        return body
+        return body['elements'] if type(body) is dict else body
 
     def history_list(self, **kwargs):
         """History list of alarm state."""
@@ -99,4 +99,4 @@ class AlarmsManager(monasca_manager.MonascaManager):
             url_str = url_str + '?%s' % urlutils.urlencode(kwargs, True)
         resp, body = self.client.json_request('GET', url_str,
                                               headers=newheaders)
-        return body
+        return body['elements'] if type(body) is dict else body
diff --git a/monascaclient/v2_0/metrics.py b/monascaclient/v2_0/metrics.py
index f42db9e..3734e5f 100644
--- a/monascaclient/v2_0/metrics.py
+++ b/monascaclient/v2_0/metrics.py
@@ -58,7 +58,7 @@ class MetricsManager(monasca_manager.MonascaManager):
         # print url_str
         resp, body = self.client.json_request(
             'GET', url_str, headers=newheaders)
-        return body
+        return body['elements'] if type(body) is dict else body
 
     def list_measurements(self, **kwargs):
         """Get a list of measurements based on metric definition filters."""
@@ -73,7 +73,7 @@ class MetricsManager(monasca_manager.MonascaManager):
         # print url_str
         resp, body = self.client.json_request(
             'GET', url_str, headers=newheaders)
-        return body
+        return body['elements'] if type(body) is dict else body
 
     def list_statistics(self, **kwargs):
         """Get a list of measurement statistics based on metric def filters."""
@@ -88,4 +88,4 @@ class MetricsManager(monasca_manager.MonascaManager):
         # print url_str
         resp, body = self.client.json_request(
             'GET', url_str, headers=newheaders)
-        return body
+        return body['elements'] if type(body) is dict else body
diff --git a/monascaclient/v2_0/notifications.py b/monascaclient/v2_0/notifications.py
index bd7b136..a8c8197 100644
--- a/monascaclient/v2_0/notifications.py
+++ b/monascaclient/v2_0/notifications.py
@@ -48,7 +48,7 @@ class NotificationsManager(monasca_manager.MonascaManager):
         newheaders = self.get_headers()
         resp, body = self.client.json_request(
             'GET', self.base_url, headers=newheaders)
-        return body
+        return body['elements'] if type(body) is dict else body
 
     def delete(self, **kwargs):
         """Delete a notification."""