You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/07/23 01:08:20 UTC
[2/2] git commit: updated refs/heads/4.2 to c2faa09
CLOUDSTACK-2990: Before scape-up, present prompt to user if on VMware
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c2faa090
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2faa090
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2faa090
Branch: refs/heads/4.2
Commit: c2faa0906897b9f745f65cb7f62eccf8bb431a4c
Parents: 6d5435e
Author: Brian Federle <br...@citrix.com>
Authored: Mon Jul 22 16:07:40 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Jul 22 16:08:13 2013 -0700
----------------------------------------------------------------------
ui/scripts/autoscaler.js | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2faa090/ui/scripts/autoscaler.js
----------------------------------------------------------------------
diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js
index d30ace8..b2aa56b 100644
--- a/ui/scripts/autoscaler.js
+++ b/ui/scripts/autoscaler.js
@@ -1341,6 +1341,7 @@
array1.push("&interval=" + args.data.interval);
array1.push("&scaleuppolicyids=" + args.scaleUpPolicyResponse.id);
array1.push("&scaledownpolicyids=" + args.scaleDownPolicyResponse.id);
+
$.ajax({
url: createURL('createAutoScaleVmGroup' + array1.join("")),
dataType: 'json',
@@ -1414,8 +1415,35 @@
}
};
- //*** API calls start!!! ********
- scaleUp(args);
+ // Get hypervisor;
+ // if VMware, show notification to user about additional configuration required
+ $.ajax({
+ url: createURL('listTemplates'),
+ data: {
+ id: args.data.templateNames,
+ templatefilter: 'all'
+ },
+ async: false,
+ success: function(json) {
+ var template = json.listtemplatesresponse.template;
+
+ if (template && template[0].hypervisor === 'VMware') {
+ cloudStack.dialog.confirm({
+ message: 'For VMware-based VMs, please read the dynamic scaling section in the admin guide before scaling. Would you like to continue?,',
+ action: function() {
+ //*** API calls start!!! ********
+ scaleUp(args);
+ },
+ cancelAction: function() {
+ $('.loading-overlay').remove();
+ }
+ });
+ } else {
+ //*** API calls start!!! ********
+ scaleUp(args);
+ }
+ }
+ });
},
destroy: function(args) {