You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/05/17 09:20:17 UTC
[13/50] [abbrv] git commit: updated refs/heads/object_store to f7c1b71
CLOUDSTACK-747: internalLb in VPC - UI - create tier dialog - only one tier is allowed to have PublicLb in a VPC.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e0006a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e0006a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e0006a3
Branch: refs/heads/object_store
Commit: 7e0006a3e5584e0f89873ebfddf77c0bbcd4c222
Parents: dbb223e
Author: Jessica Wang <je...@apache.org>
Authored: Wed May 15 11:01:43 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Wed May 15 11:03:51 2013 -0700
----------------------------------------------------------------------
ui/scripts/sharedFunctions.js | 36 ++++++++++++------------------------
ui/scripts/vpc.js | 9 +++++----
2 files changed, 17 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e0006a3/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index a018406..0352990 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -122,34 +122,22 @@ function createURL(apiName, options) {
return urlString;
}
-/*
-function fromdb(val) {
- return sanitizeXSS(noNull(val));
-}
-*/
-
function todb(val) {
return encodeURIComponent(val);
}
-/*
-function noNull(val) {
- if(val == null)
- return "";
- else
- return val;
-}
-*/
-
-/*
-function sanitizeXSS(val) { // Prevent cross-site-script(XSS) attack
- if(val == null || typeof(val) != "string")
- return val;
- val = val.replace(/</g, "<"); //replace < whose unicode is \u003c
- val = val.replace(/>/g, ">"); //replace > whose unicode is \u003e
- return unescape(val);
-}
-*/
+//LB provider map
+var lbProviderMap = {
+ "publicLb": {
+ "non-vpc": ["VirtualRouter", "Netscaler", "F5"],
+ "vpc": ["VpcVirtualRouter", "Netscaler"]
+ },
+ "internalLb": {
+ "non-vpc": [],
+ "vpc": ["InternalLbVm"]
+ }
+};
+
// Role Functions
function isAdmin() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e0006a3/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 0c4a446..4890dcc 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -2344,15 +2344,16 @@
var items;
if(networkSupportingLbExists == true) {
items = $.grep(networkOfferings, function(networkOffering) {
- var includingLbService = false;
+ var includingPublicLbService = false;
$(networkOffering.service).each(function(){
var thisService = this;
- if(thisService.name == "Lb") {
- includingLbService = true;
+ //only one tier is allowed to have PublicLb provider in a VPC
+ if(thisService.name == "Lb" && lbProviderMap.publicLb.vpc.indexOf(thisService.provider[0].name) != -1) {
+ includingPublicLbService = true;
return false; //break $.each() loop
}
});
- return !includingLbService;
+ return !includingPublicLbService;
});
}
else {