You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mt...@apache.org on 2014/07/25 20:56:42 UTC
git commit: updated refs/heads/master to 4746f93
Repository: cloudstack
Updated Branches:
refs/heads/master 1c925ede3 -> 4746f9303
Update to volume-resize logic
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4746f930
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4746f930
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4746f930
Branch: refs/heads/master
Commit: 4746f930386ef0464034d3001fe1dc075fac3c1b
Parents: 1c925ed
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Thu Jul 24 22:40:31 2014 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Fri Jul 25 12:55:59 2014 -0600
----------------------------------------------------------------------
ui/scripts/storage.js | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4746f930/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 93fe79a..f4ab6e1 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1308,6 +1308,16 @@
} else {
$newsize.hide();
}
+
+ var $minIops = $form.find('.form-item[rel=minIops]');
+ var $maxIops = $form.find('.form-item[rel=maxIops]');
+ if (selectedDiskOfferingObj.iscustomizediops == true) {
+ $minIops.css('display', 'inline-block');
+ $maxIops.css('display', 'inline-block');
+ } else {
+ $minIops.hide();
+ $maxIops.hide();
+ }
});
}
},
@@ -1323,6 +1333,22 @@
label: 'label.resize.shrink.ok',
isBoolean: true,
isChecked: false
+ },
+ minIops: {
+ label: 'label.disk.iops.min',
+ validation: {
+ required: false,
+ number: true
+ },
+ isHidden: true
+ },
+ maxIops: {
+ label: 'label.disk.iops.max',
+ validation: {
+ required: false,
+ number: true
+ },
+ isHidden: true
}
}
},
@@ -1340,6 +1366,23 @@
if (newSize != null && newSize.length > 0) {
array1.push("&size=" + todb(newSize));
}
+
+ var minIops;
+ var maxIops
+
+ if (selectedDiskOfferingObj.iscustomizediops == true) {
+ minIops = args.data.minIops;
+ maxIops = args.data.maxIops;
+ }
+
+ if (minIops != null && minIops.length > 0) {
+ array1.push("&miniops=" + todb(minIops));
+ }
+
+ if (maxIops != null && maxIops.length > 0) {
+ array1.push("&maxiops=" + todb(maxIops));
+ }
+
$.ajax({
url: createURL("resizeVolume&id=" + args.context.volumes[0].id + array1.join("")),
dataType: "json",