From 8642018ebf463bd960dc3dcaac4dc7508b60e2e6 Mon Sep 17 00:00:00 2001
From: Gabriel Hurley <gabriel@strikeawe.com>
Date: Mon, 12 Dec 2011 17:52:20 -0800
Subject: [PATCH] Volume name is passed to novaclient properly. Fixed bug
 890908.

Change-Id: I51bac51fa3900a8d2dfdba4883e98e951956126d
---
 horizon/horizon/api/nova.py                            |  2 +-
 .../nova/instances_and_volumes/instances/_list.html    | 10 +++++-----
 horizon/horizon/tests/api_tests/nova.py                |  6 ++++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/horizon/horizon/api/nova.py b/horizon/horizon/api/nova.py
index 6c9f2cb9608..4f8b9330922 100644
--- a/horizon/horizon/api/nova.py
+++ b/horizon/horizon/api/nova.py
@@ -336,7 +336,7 @@ def volume_instance_list(request, instance_id):
 
 def volume_create(request, size, name, description):
     return Volume(novaclient(request).volumes.create(
-            size, name, description))
+            size, display_name=name, display_description=description))
 
 
 def volume_delete(request, volume_id):
diff --git a/horizon/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_list.html b/horizon/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_list.html
index e0bc0d484f3..51e13ca28c2 100644
--- a/horizon/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_list.html
+++ b/horizon/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_list.html
@@ -29,16 +29,16 @@ <h3>{% trans "My Instances" %}</h3>
     {% for instance in instances %}
       <tr class="{% cycle 'odd' 'even' %}">
         <td class="select">
-          <input type="checkbox" name="instance_{{instance.id}}" value="instance_{{instance.id}}" id="instance_select_{{instance.id}}" />
+          <input type="checkbox" name="instance_{{ instance.id }}" value="instance_{{ instance.id }}" id="instance_select_{{ instance.id }}" />
         </td>
         <td class="name">
-          <a href="{% url horizon:nova:instances_and_volumes:instances:detail instance.id %}">{{instance.name}}</a>
+          <a href="{% url horizon:nova:instances_and_volumes:instances:detail instance.id %}">{{ instance.name }}</a>
         </td>
         <td>
-          {{instance.attrs.memory_mb|mbformat}} Ram | {{instance.attrs.vcpus}} VCPU | {{instance.attrs.disk_gb}}GB Disk
+          {{ instance.attrs.memory_mb|mbformat }} Ram | {{ instance.attrs.vcpus }} VCPU | {{ instance.attrs.disk_gb }}GB Disk
         </td>
-        <td>{{instance.status|lower|capfirst}}</td>
-        <td id="name_{{instance.name}}" class="actions">
+        <td>{{ instance.status|lower|capfirst }}</td>
+        <td id="name_{{ instance.name }}" class="actions">
           <a class="more-actions" href="#">More</a>
           <ul>
             <li><a class="btn small" target='_blank' href='{% url horizon:nova:instances_and_volumes:instances:vnc instance.id %}'>{% trans 'VNC Console'%}</a></li>
diff --git a/horizon/horizon/tests/api_tests/nova.py b/horizon/horizon/tests/api_tests/nova.py
index 31cd214453b..a1737c93f6b 100644
--- a/horizon/horizon/tests/api_tests/nova.py
+++ b/horizon/horizon/tests/api_tests/nova.py
@@ -569,8 +569,10 @@ def test_volume_instance_list(self):
         self.assertEqual(attachments, self.volume.attachments)
 
     def test_volume_create(self):
-        self.novaclient.volumes.create(IsA(int), IsA(str), IsA(str)).AndReturn(
-                self.volume)
+        self.novaclient.volumes.create(IsA(int),
+                                       display_name=IsA(str),
+                                       display_description=IsA(str)) \
+                                       .AndReturn(self.volume)
         self.mox.ReplayAll()
 
         new_volume = api.volume_create(self.request,