Updated Branches: refs/heads/scale-UP [created] b091ea6ea
scale UP CPU and memory UI Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b091ea6e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b091ea6e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b091ea6e Branch: refs/heads/scale-UP Commit: b091ea6ead7cc7be3c66d2173bfd2cab232a47ad Parents: 82c2e30 Author: Pranav Saxena <[email protected]> Authored: Fri Feb 22 02:07:08 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Fri Feb 22 02:07:08 2013 +0530 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 6 ++++-- ui/scripts/instances.js | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b091ea6e/ui/css/cloudstack3.css ---------------------------------------------------------------------- diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index efdae35..0753cc4 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -11277,7 +11277,8 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it background-position: -168px -31px; } -.reset .icon { +.reset .icon , +.scaleUp .icon{ background-position: -168px -31px; } @@ -11286,7 +11287,8 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it background-position: -168px -613px; } -.reset:hover .icon { +.reset:hover .icon, +.scaleUp:hover .icon { background-position: -168px -613px; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b091ea6e/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 264b5a1..c21e031 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1240,6 +1240,44 @@ } }, + scaleUp:{ + label:'scaleUp VM', + action: function(args) { + $.ajax({ + url: createURL("scaleVirtualMachine&id=" + args.context.instances[0].id), + dataType: "json", + async: true, + success: function(json) { + var jid = json.scaleupvirtualmachineresponse.jobid; + args.response.success( + {_custom: + {jobId: jid, + getUpdatedItem: function(json) { + return json.queryasyncjobresultresponse.jobresult.virtualmachine; + }, + getActionFilter: function() { + return vmActionfilter; + } + } + } + ); + } + }); + }, + messages: { + confirm: function(args) { + return 'Do you really want to scale Up your instance ?'; + }, + notification: function(args) { + return 'Instance Scaled Up'; + } + }, + notification: { + poll: pollAsyncJobResult + } + + }, + viewConsole: { label: 'label.view.console', action: { @@ -1488,6 +1526,7 @@ allowedActions.push("destroy"); allowedActions.push("changeService"); allowedActions.push("reset"); + allowedactions.push("scaleUp"); if (isAdmin()) allowedActions.push("migrate"); @@ -1511,6 +1550,8 @@ allowedActions.push("destroy"); allowedActions.push("reset"); allowedActions.push("snapshot"); + allowedActions.push("scaleUp"); + if(isAdmin()) allowedActions.push("migrateToAnotherStorage");
