shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

Bug #3948: show real disk-snapshot size in sunstone

Browse Source
This commit is contained in:
Carlos Martín 2015-09-01 17:46:05 +02:00
parent d18dd76f69
commit ee3146315d
1 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/sunstone/public/app/tabs/vms-tab/panels/storage.js
View File

@ -66,6 +66,21 @@ define(function(require) {
snapshots = [this.element.SNAPSHOTS];
}
var snapshotsSize = {};
var monitoringSnapshots = [];
if ($.isArray(that.element.MONITORING.SNAPSHOT_SIZE))
monitoringSnapshots = that.element.MONITORING.SNAPSHOT_SIZE;
else if (!$.isEmptyObject(that.element.MONITORING.SNAPSHOT_SIZE))
monitoringSnapshots = [that.element.MONITORING.SNAPSHOT_SIZE];
$.each(monitoringSnapshots, function(index, monitoringSnap){
if(snapshotsSize[monitoringSnap.DISK_ID] == undefined){
snapshotsSize[monitoringSnap.DISK_ID] = {};
}
snapshotsSize[monitoringSnap.DISK_ID][monitoringSnap.ID] = monitoringSnap.SIZE;
})
var snapshotsHtml = {};
$.each(snapshots, function(){
@ -76,6 +91,12 @@ define(function(require) {
diskSnapshots = [diskSnapshots];
}
var indexedSize = snapshotsSize[diskId];
if(indexedSize == undefined){
indexedSize = {};
}
var treeRoot = {
htmlStr : '',
subTree : []
@ -94,7 +115,7 @@ define(function(require) {
$.each(noParent, function(){
treeRoot.subTree.push(
_makeTree(that, indexedSnapshots[this], indexedSnapshots)
_makeTree(that, indexedSnapshots[this], indexedSnapshots, indexedSize)
);
});
@ -188,14 +209,15 @@ define(function(require) {
}
var sizeStr = "";
if (disk.SIZE) {
sizeStr += Humanize.sizeFromMB(disk.SIZE);
if (disksSize[disk.DISK_ID]) {
sizeStr += Humanize.sizeFromMB(disksSize[disk.DISK_ID]);
} else {
sizeStr += '-';
}
sizeStr += '/';
if (disksSize[disk.DISK_ID]) {
sizeStr += Humanize.sizeFromMB(disksSize[disk.DISK_ID]);
if (disk.SIZE) {
sizeStr += Humanize.sizeFromMB(disk.SIZE);
} else {
sizeStr += '-';
}
@ -461,7 +483,7 @@ define(function(require) {
});
}
function _makeTree(that, snapshot, indexedSnapshots){
function _makeTree(that, snapshot, indexedSnapshots, indexedSize){
var SPACE = '    ';
var subTree = [];
@ -469,7 +491,7 @@ define(function(require) {
if (snapshot.CHILDREN){
$.each(snapshot.CHILDREN.split(","), function(){
subTree.push(
_makeTree(that, indexedSnapshots[this], indexedSnapshots)
_makeTree(that, indexedSnapshots[this], indexedSnapshots, indexedSize)
);
});
}
@ -485,8 +507,21 @@ define(function(require) {
Locale.tr("Active")+'"/>' + SPACE;
}
html += Humanize.prettyTime(snapshot.DATE) + SPACE +
Humanize.sizeFromMB(snapshot.SIZE) + SPACE +
var sizeStr = "";
if (indexedSize[snapshot.ID]) {
sizeStr += Humanize.sizeFromMB(indexedSize[snapshot.ID]);
} else {
sizeStr += '-';
}
sizeStr += '/';
if (snapshot.SIZE) {
sizeStr += Humanize.sizeFromMB(snapshot.SIZE);
} else {
sizeStr += '-';
}
html += Humanize.prettyTime(snapshot.DATE) + SPACE + sizeStr + SPACE +
(snapshot.NAME ? snapshot.NAME + SPACE : '');
html += '</div>';