修改`设备号`为`设备路径`；去除js中的dev_table；模板中去除对`format_sequence_to_device_name`的依赖。

api/disk.py

@@ -240,9 +240,15 @@ def add_device(func):
                 for i, item in enumerate(ret['data']):
                     ret['data'][i][u'device'] = u'/dev/' + dev_table[item['sequence']]
 
+                    if item['sequence'] < 0:
+                        ret['data'][i][u'device'] = None
+
             elif isinstance(ret['data'], dict):
                 ret['data'][u'device'] = u'/dev/' + dev_table[ret['data']['sequence']]
 
+                if ret['data']['sequence'] < 0:
+                    ret['data'][u'device'] = None
+
             else:
                 raise json.dumps(ret)
 

templates/disk_detail.html

@@ -399,13 +399,7 @@
     }
 
     function render_disks_chart(uuid, granularity) {
-        var dev_table = [];
-
-        for (var i = 1; i <= 26; i++) {
-            dev_table.push('vd' + String.fromCharCode(0x60+i));
-        }
-
-        var dev_name = dev_table[{{ disk_ret.data.sequence }}];
+        var dev_name = '{{ disk_ret.data.device }}';
         var dev_id_throughput = 'disk_throughput_chart';
         var dev_id_iops = 'disk_iops_chart';
 
@@ -669,7 +663,7 @@
                         </tr>
                         <tr>
                             <td>
-                                <span class="guest-label">所属 Guest:&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                                <span class="guest-label">所属虚拟机:&nbsp;&nbsp;&nbsp;&nbsp;</span>
                                 <span class="guest-desc">
                                     {% if disk_ret.data.sequence != -1 %}
                                         <a href="/guest/detail/{{ disk_ret.data.guest_uuid }}">{{ guest_ret.data.label }}/{{ guest_ret.data.remark }}</a>
@@ -680,9 +674,11 @@
                         </tr>
                         <tr>
                             <td>
-                                <span class="guest-label">设备号:&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                                <span class="guest-label">设备路径:&nbsp;&nbsp;&nbsp;&nbsp;</span>
                                 <span class="guest-desc">
-                                {{ format_sequence_to_device_name(disk_ret.data.sequence) }}
+                                    {% if disk_ret.data.sequence >= 0 %}
+                                        {{ disk_ret.data.device }}
+                                    {% endif %}
                                 </span>
                             </td>
                         </tr>

templates/disks_show.html

@@ -620,7 +620,7 @@
                     <th><input class="all_selector" title="选取所有" type="checkbox"></th>
                     <th width="280px;">UUID</th>
                     <th>状态</th>
-                    <th>设备号</th>
+                    <th>设备路径</th>
                     <th>大小</th>
                     <th>IOPS</th>
                     <th>BPS</th>
@@ -648,7 +648,11 @@
                         </div>
                     </td>
                     <td>{{ format_disk_state(item.state)|safe }}</td>
-                    <td>{{ format_sequence_to_device_name(item.sequence) }}</td>
+                    <td>
+                        {% if item.sequence >= 0 %}
+                            {{ item.device }}
+                        {% endif %}
+                    </td>
                     <td>{{ item.size }} GB</td>
                     <td>{{ item.iops }}</td>
                     <td>{{ (item.bps / 1024 / 1024) | int }} MiB</td>

templates/guest_detail.html

@@ -74,12 +74,6 @@
         }
     }
 
-    var dev_table = [];
-
-    for (var i = 1; i <= 26; i++) {
-        dev_table.push('vd' + String.fromCharCode(0x60+i));
-    }
-
     function render_cpu_chart(uuid, granularity) {
         var url = '/api/performance/cpu_memory/last_hour/' + uuid;
         if (granularity === 'hour') {
@@ -838,11 +832,6 @@
     }
 
     function render_disks_chart(uuid, granularity) {
-        var dev_table = [];
-
-        for (var i = 1; i <= 26; i++) {
-            dev_table.push('vd' + String.fromCharCode(0x60+i));
-        }
 
         var disks = [];
         var url = '/api/disks?filter=guest_uuid:in:' + uuid;
@@ -857,9 +846,9 @@
             success: function (data, textStatus, xhr) {
                 $('#disks_chart').empty();
                 $.each(data.data, function(i, ele) {
-                    var dev_name = dev_table[ele['sequence']];
-                    var dev_id_throughput = 'throughput_' + dev_table[ele['sequence']];
-                    var dev_id_iops = 'iops_' + dev_table[ele['sequence']];
+                    var dev_name = ele['device'];
+                    var dev_id_throughput = 'throughput_' + ele['device'];
+                    var dev_id_iops = 'iops_' + ele['device'];
                     var disk_uuid = ele['uuid'];
 
                     $('#disks_chart').append($('<div id=' + dev_id_throughput +' style="width: 800px;height:280px;"></div>'));