commit df8fc374fa01453ca653224fe71a027f3b6a1a62
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Thu Sep 01 18:32:34 2016 +0000
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Thu Sep 01 18:32:34 2016 +0000
tree 8758cd53fe2d91b15762025d490a2aace7126be9
parent fd8c9b3b4f41031e0e71609b94711d4a476c7c27

Dashboard changes to adapt to ceilometer mitaka output

Change-Id: I1f5169d494708e42ed4bc222b305b04c127923af

xos/api/tenant/monitoring/dashboard/ceilometerdashboard.py

diff --git a/xos/api/tenant/monitoring/dashboard/ceilometerdashboard.py b/xos/api/tenant/monitoring/dashboard/ceilometerdashboard.py
index 0f8c6b4..d4e5d94 100644
--- a/xos/api/tenant/monitoring/dashboard/ceilometerdashboard.py
+++ b/xos/api/tenant/monitoring/dashboard/ceilometerdashboard.py
@@ -175,6 +175,11 @@
                 name = r['metadata']['display_name']
             elif 'name' in r['metadata']:
                 name = r['metadata']['name']
+            #Output of 'resources' REST query has chnaged from kilo to mitaka,below if conditions to handle mitaka output
+            elif 'resource_metadata.display_name' in r['metadata']:
+                name = r['metadata']['resource_metadata.display_name']
+            elif 'resource_metadata.name' in r['metadata']:
+                name = r['metadata']['resource_metadata.name']
             else:
                 name = r['resource_id']
             resource_map[r['resource_id']] = name