Created
August 5, 2013 14:30
-
-
Save e0ne/6156347 to your computer and use it in GitHub Desktop.
Disk label fix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/nailgun/nailgun/fixtures/sample_environment.json b/nailgun/nailgun/fixtures/sample_environment.json | |
index 7693356..0c32e20 100644 | |
--- a/nailgun/nailgun/fixtures/sample_environment.json | |
+++ b/nailgun/nailgun/fixtures/sample_environment.json | |
@@ -780,7 +780,7 @@ | |
{ | |
"model": "VBOX HARDDISK", | |
"name": "sda", | |
- "disk": "sda", | |
+ "disk": "disk/by-path/pci-0000:00:06.0-scsi-0:0:0:0", | |
"size": 68719476736 | |
} | |
], | |
diff --git a/nailgun/nailgun/volumes/manager.py b/nailgun/nailgun/volumes/manager.py | |
index d12376f..5b8456e 100644 | |
--- a/nailgun/nailgun/volumes/manager.py | |
+++ b/nailgun/nailgun/volumes/manager.py | |
@@ -131,6 +131,7 @@ class DisksFormatConvertor(object): | |
disk_simple = { | |
'id': disk['id'], | |
+ 'name': disk['name'], | |
'size': size, | |
'volumes': cls.format_volumes_to_simple(disk['volumes'])} | |
@@ -201,9 +202,11 @@ class DisksFormatConvertor(object): | |
class Disk(object): | |
- def __init__(self, generator_method, disk_id, size, boot_is_raid=True): | |
+ def __init__(self, generator_method, disk_id, name, | |
+ size, boot_is_raid=True): | |
self.call_generator = generator_method | |
self.id = disk_id | |
+ self.name = name | |
self.size = size | |
self.free_space = size | |
self.volumes = [] | |
@@ -286,6 +289,7 @@ class Disk(object): | |
def render(self): | |
return { | |
"id": self.id, | |
+ "name": self.name, | |
"type": "disk", | |
"size": self.size, | |
"volumes": self.volumes | |
@@ -330,7 +334,9 @@ class VolumeManager(object): | |
boot_is_raid = True if disks_count > 1 else False | |
disk = Disk( | |
- self.call_generator, d["disk"], | |
+ self.call_generator, | |
+ d["disk"], | |
+ d["name"], | |
byte_to_megabyte(d["size"]), | |
boot_is_raid=boot_is_raid) | |
diff --git a/nailgun/static/templates/cluster/node_disk.html b/nailgun/static/templates/cluster/node_disk.html | |
index ecb566e..9199de1 100644 | |
--- a/nailgun/static/templates/cluster/node_disk.html | |
+++ b/nailgun/static/templates/cluster/node_disk.html | |
@@ -1,6 +1,6 @@ | |
<div class="disk-box disk" data-disk="<%- disk.id %>"> | |
- <div class="disk-box-name pull-left"><%- disk.id %></div> | |
+ <div class="disk-box-name pull-left"><%- disk.get('(name') %> (<%- disk.id %>)</div> | |
<div class="disk-box-size pull-right">Total Space: <%= showDiskSize(disk.get('size'), 2) %></div> | |
<div class="disk-map-short disk-map-full"> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment