You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/04/05 11:39:15 UTC
[1/3] git commit: updated refs/heads/master to ae4befb
Updated Branches:
refs/heads/master 8d6bb9538 -> ae4befb0b
scale UP CPU and memory UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b091ea6e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b091ea6e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b091ea6e
Branch: refs/heads/master
Commit: b091ea6ead7cc7be3c66d2173bfd2cab232a47ad
Parents: 82c2e30
Author: Pranav Saxena <pr...@citrix.com>
Authored: Fri Feb 22 02:07:08 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
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/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/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");
[2/3] git commit: updated refs/heads/master to ae4befb
Posted by pr...@apache.org.
scale UP CPU and memory UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/534f5540
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/534f5540
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/534f5540
Branch: refs/heads/master
Commit: 534f5540a33d47ea5bd84c58c94def2abfc0e9db
Parents: b091ea6
Author: Pranav Saxena <pr...@citrix.com>
Authored: Fri Feb 22 02:16:20 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Fri Feb 22 02:16:20 2013 +0530
----------------------------------------------------------------------
ui/scripts/instances.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/534f5540/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index c21e031..a25e240 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1526,7 +1526,7 @@
allowedActions.push("destroy");
allowedActions.push("changeService");
allowedActions.push("reset");
- allowedactions.push("scaleUp");
+ allowedActions.push("scaleUp");
if (isAdmin())
allowedActions.push("migrate");
[3/3] git commit: updated refs/heads/master to ae4befb
Posted by pr...@apache.org.
Merge remote-tracking branch 'remotes/origin/scale-UP'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae4befb0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae4befb0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae4befb0
Branch: refs/heads/master
Commit: ae4befb0b9215b91049b5c9126710741b5feeabe
Parents: 8d6bb95 534f554
Author: Pranav Saxena <pr...@citrix.com>
Authored: Fri Apr 5 15:06:36 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Fri Apr 5 15:06:36 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/cloudstack/blob/ae4befb0/ui/css/cloudstack3.css
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae4befb0/ui/scripts/instances.js
----------------------------------------------------------------------