diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/storage.js b/src/sunstone/public/app/tabs/vms-tab/panels/storage.js
index 7ee8db539d..4ff4e5dfe9 100644
--- a/src/sunstone/public/app/tabs/vms-tab/panels/storage.js
+++ b/src/sunstone/public/app/tabs/vms-tab/panels/storage.js
@@ -60,6 +60,7 @@ define(function(require) {
' + Locale.tr("ID") + ' | \
' + Locale.tr("Target") + ' | \
' + Locale.tr("Image / Format-Size") + ' | \
+ ' + Locale.tr("Size") + ' | \
' + Locale.tr("Persistent") + ' | \
' + Locale.tr("Actions");
@@ -150,6 +151,17 @@ define(function(require) {
disks.push(context_disk);
}
+ var disksSize = {};
+ var monitoringDisks = [];
+ if ($.isArray(that.element.MONITORING.DISK_SIZE))
+ monitoringDisks = that.element.MONITORING.DISK_SIZE;
+ else if (!$.isEmptyObject(that.element.MONITORING.DISK_SIZE))
+ monitoringDisks = [that.element.MONITORING.DISK_SIZE];
+
+ $.each(monitoringDisks, function(index, monitoringDisk){
+ disksSize[monitoringDisk.ID] = monitoringDisk.SIZE;
+ })
+
var disk_dt_data = [];
if (disks.length) {
@@ -212,10 +224,24 @@ define(function(require) {
}
}
+ var sizeStr = "";
+ if (disk.SIZE) {
+ sizeStr += Humanize.sizeFromMB(disk.SIZE);
+ } else {
+ sizeStr += '-';
+ }
+ sizeStr += '/';
+ if (disksSize[disk.DISK_ID]) {
+ sizeStr += Humanize.sizeFromMB(disksSize[disk.DISK_ID]);
+ } else {
+ sizeStr += '-';
+ }
+
disk_dt_data.push({
DISK_ID : disk.DISK_ID,
TARGET : disk.TARGET,
IMAGE : (disk.IMAGE ? disk.IMAGE : (Humanize.sizeFromMB(disk.SIZE) + (disk.FORMAT ? (' - ' + disk.FORMAT) : ''))),
+ SIZE: sizeStr,
SAVE : ((disk.SAVE && disk.SAVE == 'YES') ? Locale.tr('YES') : Locale.tr('NO')),
ACTIONS : actions,
SNAPSHOTS : snapshotsHtml[disk.DISK_ID]
@@ -236,6 +262,7 @@ define(function(require) {
{"data": "DISK_ID", "defaultContent": ""},
{"data": "TARGET", "defaultContent": ""},
{"data": "IMAGE", "defaultContent": "", "orderable": false},
+ {"data": "SIZE", "defaultContent": ""},
{"data": "SAVE", "defaultContent": "", "orderable": false},
{"data": "ACTIONS", "defaultContent": "", "orderable": false}
],
@@ -440,4 +467,4 @@ define(function(require) {
subTree : subTree
};
}
-});
\ No newline at end of file
+});
|