x/tuskar-ui
Code Issues Proposed changes

Merge "Ordering the attached volumes for an instance by device name instead of order by id"

Browse Source
This commit is contained in:
Jenkins 2012-05-24 08:10:19 +00:00 committed by Gerrit Code Review
commit 629453f41e
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
horizon/dashboards/nova/instances_and_volumes/instances/tests.py
View File

@ -243,6 +243,37 @@ class InstanceViewTests(test.TestCase):
res = self.client.post(INDEX_URL, formData)
self.assertRedirectsNoFollow(res, INDEX_URL)
@test.create_stubs({api: ("server_get", "volume_instance_list",
"flavor_get", "server_security_groups")})
def test_instance_details_volumes(self):
server = self.servers.first()
volumes = deepcopy(self.volumes.list())
volumes[0].device = "/dev/hdk"
second_vol = deepcopy(volumes[0])
second_vol.id = 2
second_vol.device = "/dev/hdb"
volumes.append(second_vol)
api.server_get(IsA(http.HttpRequest), server.id).AndReturn(server)
api.volume_instance_list(IsA(http.HttpRequest),
server.id).AndReturn(volumes)
api.flavor_get(IsA(http.HttpRequest),
server.flavor['id']).AndReturn(self.flavors.first())
api.server_security_groups(IsA(http.HttpRequest),
server.id).AndReturn(self.security_groups.first())
self.mox.ReplayAll()
url = reverse('horizon:nova:instances_and_volumes:instances:detail',
args=[server.id])
res = self.client.get(url)
self.assertItemsEqual(res.context['instance'].volumes, volumes)
# Test device ordering
self.assertEquals(res.context['instance'].volumes[0].device,
"/dev/hdb")
self.assertEquals(res.context['instance'].volumes[1].device,
"/dev/hdk")
def test_instance_log(self):
server = self.servers.first()
CONSOLE_OUTPUT = 'output'

2
horizon/dashboards/nova/instances_and_volumes/instances/views.py
View File

@ -118,6 +118,8 @@ class DetailView(tabs.TabView):
instance = api.server_get(self.request, instance_id)
instance.volumes = api.volume_instance_list(self.request,
instance_id)
# Sort by device name
instance.volumes.sort(key=lambda vol: vol.device)
instance.full_flavor = api.flavor_get(self.request,
instance.flavor["id"])
instance.security_groups = api.server_security_groups(