Browse files

show volume type & iops

  • Loading branch information...
1 parent d30dcc5 commit 96c007f7b0c2a4acdec0e08c4718cde59b406c5a @winebarrel winebarrel committed Sep 2, 2012
View
4 ec2ui/content/ec2ui/controller.js
@@ -157,6 +157,8 @@ var ec2ui_controller = {
var status = getNodeValueByName(items.snapshotItem(i), "status");
var createTime = new Date();
createTime.setISO8601(getNodeValueByName(items.snapshotItem(i), "createTime"));
+ var volumeType = getNodeValueByName(items.snapshotItem(i), "volumeType");
+ var iops = getNodeValueByName(items.snapshotItem(i), "iops");
// Zero out the values for attachment
var instanceId = "";
@@ -173,7 +175,7 @@ var ec2ui_controller = {
}
attachTime.setISO8601(getNodeValueByName(items.snapshotItem(i), "attachTime"));
}
- list.push(new Volume(id, size, snapshotId, zone, status, createTime, instanceId, device, attachStatus, attachTime));
+ list.push(new Volume(id, size, snapshotId, zone, status, createTime, instanceId, device, attachStatus, attachTime, volumeType, iops));
this.walkTagSet(items.snapshotItem(i), "volumeId", tags);
}
View
4 ec2ui/content/ec2ui/model.js
@@ -69,7 +69,7 @@ function Snapshot(id, volumeId, status, startTime, progress, volumeSize, descrip
}
}
-function Volume(id, size, snapshotId, zone, status, createTime, instanceId, device, attachStatus, attachTime, tag) {
+function Volume(id, size, snapshotId, zone, status, createTime, instanceId, device, attachStatus, attachTime, volumeType, iops, tag) {
this.id = id;
this.size = size;
this.snapshotId = snapshotId;
@@ -82,6 +82,8 @@ function Volume(id, size, snapshotId, zone, status, createTime, instanceId, devi
if (attachStatus != "") {
this.attachTime = attachTime.strftime('%Y-%m-%d %H:%M:%S');
}
+ this.volumeType = volumeType;
+ this.iops = iops;
if (tag) {
this.tag = tag;
__addNameTagToModel__(tag, this);
View
6 ec2ui/content/ec2ui/volumes_tab_overlay.xul
@@ -129,6 +129,12 @@
<treecol id="vol.attachTime" label="&ec2ui.volumes.attachment.attachTime.label;"
flex="1" persist="width ordinal hidden sortDirection" />
<splitter class="tree-splitter" />
+ <treecol id="vol.volumeType" label="&ec2ui.volumes.attachment.volumeType.label;"
+ flex="1" persist="width ordinal hidden sortDirection" />
+ <splitter class="tree-splitter" />
+ <treecol id="vol.iops" label="&ec2ui.volumes.attachment.iops.label;"
+ flex="1" persist="width ordinal hidden sortDirection" />
+ <splitter class="tree-splitter" />
<treecol id="vol.tag" label="Tag" flex="1"
persist="width ordinal hidden sortDirection" />
<splitter class="tree-splitter" />
View
2 ec2ui/content/ec2ui/volumesview.js
@@ -21,7 +21,7 @@ var ec2ui_VolumeTreeView = {
COLNAMES:
['vol.name', 'vol.id','vol.size','vol.snapshotId','vol.availabilityZone','vol.status',
'vol.createTime', 'vol.instanceId', 'vol.instanceName', 'vol.device', 'vol.attachStatus',
- 'vol.attachTime', 'vol.tag', 'vol.comment'],
+ 'vol.attachTime', 'vol.tag', 'vol.comment', 'vol.volumeType', 'vol.iops'],
imageIdRegex : new RegExp("^vol-"),
getSearchText : function() {
View
2 ec2ui/locale/ec2ui/en-US/ec2ui.dtd
@@ -106,6 +106,8 @@
<!ENTITY ec2ui.volumes.attachment.device.label "Device">
<!ENTITY ec2ui.volumes.attachment.status.label "Attachment Status">
<!ENTITY ec2ui.volumes.attachment.attachTime.label "Attach Time">
+<!ENTITY ec2ui.volumes.attachment.volumeType.label "Volume Type">
+<!ENTITY ec2ui.volumes.attachment.iops.label "IOPS">
<!ENTITY ec2ui.volumes.attachment.description.device "Linux devices: /dev/sda through /dev/sdp">
<!ENTITY ec2ui.snapshots.id.label "SNAP ID">

0 comments on commit 96c007f

Please sign in to comment.