From 7d3a0f4d15d542144335aa36e8ad2d0b5bb11b4d Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien.danjou@enovance.com>
Date: Mon, 19 Mar 2012 10:38:43 +0100
Subject: [PATCH] Fix ephemeral field name in quota computing

ephemeral is now part of an extension is now prefixed with OS-FLV-EXT-DATA.

This fixes bug #961965

Change-Id: I67fc7cd666fbf6c350eb0361a5f4e69d1842973b
---
 horizon/api/nova.py                   |  4 ++-
 horizon/tests/api_tests/nova_tests.py | 44 +++++++++++++--------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/horizon/api/nova.py b/horizon/api/nova.py
index 2f91d6688d7..2b798081949 100644
--- a/horizon/api/nova.py
+++ b/horizon/api/nova.py
@@ -409,7 +409,9 @@ def tenant_quota_usages(request):
     flavors = dict([(f.id, f) for f in flavor_list(request)])
     usages = {'instances': {'flavor_fields': [], 'used': len(instances)},
               'cores': {'flavor_fields': ['vcpus'], 'used': 0},
-              'gigabytes': {'flavor_fields': ['disk', 'ephemeral'], 'used': 0},
+              'gigabytes': {'used': 0,
+                            'flavor_fields': ['disk',
+                                              'OS-FLV-EXT-DATA:ephemeral']},
               'ram': {'flavor_fields': ['ram'], 'used': 0},
               'floating_ips': {'flavor_fields': [], 'used': len(floating_ips)}}
 
diff --git a/horizon/tests/api_tests/nova_tests.py b/horizon/tests/api_tests/nova_tests.py
index c867e68166f..dbdc3a9e064 100644
--- a/horizon/tests/api_tests/nova_tests.py
+++ b/horizon/tests/api_tests/nova_tests.py
@@ -178,25 +178,25 @@ def test_tenant_quota_usages(self):
 
         self.assertIsInstance(quota_usages, dict)
         self.assertEquals(quota_usages,
-                          {'gigabytes': {'available': 1000,
-                                         'used': 0,
-                                         'flavor_fields': ['disk',
-                                                           'ephemeral'],
-                                         'quota': 1000},
-                           'instances': {'available': 8,
-                                         'used': 2,
-                                         'flavor_fields': [],
-                                         'quota': 10},
-                           'ram': {'available': 8976,
-                                   'used': 1024,
-                                   'flavor_fields': ['ram'],
-                                   'quota': 10000},
-                           'cores': {'available': 8,
-                                     'used': 2,
-                                     'flavor_fields': ['vcpus'],
-                                     'quota': 10},
-                           'floating_ips': {'available': 0,
-                                            'used': 1,
-                                            'flavor_fields': [],
-                                            'quota': 1}
-                          })
+              {'gigabytes': {'available': 1000,
+                             'used': 0,
+                             'flavor_fields': ['disk',
+                                               'OS-FLV-EXT-DATA:ephemeral'],
+                             'quota': 1000},
+               'instances': {'available': 8,
+                             'used': 2,
+                             'flavor_fields': [],
+                             'quota': 10},
+               'ram': {'available': 8976,
+                       'used': 1024,
+                       'flavor_fields': ['ram'],
+                       'quota': 10000},
+               'cores': {'available': 8,
+                         'used': 2,
+                         'flavor_fields': ['vcpus'],
+                         'quota': 10},
+               'floating_ips': {'available': 0,
+                                'used': 1,
+                                'flavor_fields': [],
+                                'quota': 1}
+              })