You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/26 08:18:01 UTC
git commit: updated refs/heads/master to 9763c9b
Repository: cloudstack
Updated Branches:
refs/heads/master 724699424 -> 9763c9b84
CLOUDSTACK-7915: as a backup use hardcoded LB algorithms in UI
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit 221e429b456e4e08af783c424744741fded73f5b)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9763c9b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9763c9b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9763c9b8
Branch: refs/heads/master
Commit: 9763c9b84d1184e5b931049cef57bac662490d03
Parents: 7246994
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Mar 26 12:45:30 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Mar 26 12:47:51 2015 +0530
----------------------------------------------------------------------
ui/scripts/network.js | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9763c9b8/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 33e85b8..46475bb 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3517,7 +3517,22 @@
label: 'label.algorithm',
isEditable: true,
select: function(args) {
- var data = getLBAlgorithms(args.context.networks[0]);
+ var data = [{
+ id: 'roundrobin',
+ name: 'roundrobin',
+ description: _l('label.lb.algorithm.roundrobin')
+ }, {
+ id: 'leastconn',
+ name: 'leastconn',
+ description: _l('label.lb.algorithm.leastconn')
+ }, {
+ id: 'source',
+ name: 'source',
+ description: _l('label.lb.algorithm.source')
+ }];
+ if (typeof args.context != 'undefined') {
+ data = getLBAlgorithms(args.context.networks[0]);
+ }
args.response.success({
data: data
});