You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/17 20:09:22 UTC
[11/25] git commit: updated refs/heads/ui-mixed-zone-management to
c3009e3
CLOUDSTACK-1910: cloudstack UI - zone wizard - add Netscaler device step - add 3 new fields: "GSLB service", "GSLB service Public IP", "GSLB service Private IP".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d5776d91
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d5776d91
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d5776d91
Branch: refs/heads/ui-mixed-zone-management
Commit: d5776d91eae698c995121e990729a79998f70dde
Parents: 4b636a1
Author: Jessica Wang <je...@citrix.com>
Authored: Tue Apr 16 17:40:21 2013 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Tue Apr 16 17:40:21 2013 -0700
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5776d91/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 8add9bb..08cadd0 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -653,7 +653,18 @@
},
privateinterface: {
label: 'label.private.interface'
+ },
+ gslbprovider: {
+ label: 'GSLB service',
+ isBoolean: true,
+ isChecked: true
+ },
+ gslbproviderpublicip: {
+ label: 'GSLB service Public IP'
},
+ gslbproviderprivateip: {
+ label: 'GSLB service Private IP'
+ },
numretries: {
label: 'label.numretries',
defaultValue: '2'
@@ -2593,7 +2604,10 @@
array1.push("&physicalnetworkid=" + args.data.returnedBasicPhysicalNetwork.id);
array1.push("&username=" + todb(args.data.basicPhysicalNetwork.username));
array1.push("&password=" + todb(args.data.basicPhysicalNetwork.password));
- array1.push("&networkdevicetype=" + todb(args.data.basicPhysicalNetwork.networkdevicetype));
+ array1.push("&networkdevicetype=" + todb(args.data.basicPhysicalNetwork.networkdevicetype));
+ array1.push("&gslbprovider=" + (args.data.basicPhysicalNetwork.gslbprovider == "on"));
+ array1.push("&gslbproviderpublicip=" + todb(args.data.basicPhysicalNetwork.gslbproviderpublicip));
+ array1.push("&gslbproviderprivateip=" + todb(args.data.basicPhysicalNetwork.gslbproviderprivateip));
//construct URL starts here
var url = [];