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:16:38 UTC
[1/2] git commit: updated refs/heads/4.5 to 221e429
Repository: cloudstack
Updated Branches:
refs/heads/4.5 666f75287 -> 221e429b4
ui: list all networks
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/ca1e5c16
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca1e5c16
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca1e5c16
Branch: refs/heads/4.5
Commit: ca1e5c16906ebcccba8fd382239659d9083c4178
Parents: 666f752
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Mar 26 12:45:16 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Mar 26 12:45:16 2015 +0530
----------------------------------------------------------------------
ui/scripts/network.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca1e5c16/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 53c9d86..dd0a71d 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -99,7 +99,7 @@
// Add primary IP as default
ipSelection.push({
- id: -1,
+ id: primaryIp,
description: primaryIp + ' (Primary)'
});
@@ -921,7 +921,7 @@
var oldcidr;
$.ajax({
- url: createURL("listNetworks&id=" + args.context.networks[0].id),
+ url: createURL("listNetworks&id=" + args.context.networks[0].id + "&listAll=true"),
dataType: "json",
async: false,
success: function(json) {
[2/2] git commit: updated refs/heads/4.5 to 221e429
Posted by bh...@apache.org.
CLOUDSTACK-7915: as a backup use hardcoded LB algorithms in UI
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/221e429b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/221e429b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/221e429b
Branch: refs/heads/4.5
Commit: 221e429b456e4e08af783c424744741fded73f5b
Parents: ca1e5c1
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:45:30 2015 +0530
----------------------------------------------------------------------
ui/scripts/network.js | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/221e429b/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index dd0a71d..533f1c5 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3507,7 +3507,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
});