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/02/27 16:53:57 UTC
[1/2] git commit: refs/heads/dvswitch-UI - dvSwitch-UI Integration -
Set 2
dvSwitch-UI Integration - Set 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1f21c126
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1f21c126
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1f21c126
Branch: refs/heads/dvswitch-UI
Commit: 1f21c126878a23e5786aed2c740977299d7f1da2
Parents: 1b94047
Author: Pranav Saxena <pr...@citrix.com>
Authored: Wed Feb 27 15:29:27 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Wed Feb 27 15:29:27 2013 +0530
----------------------------------------------------------------------
ui/scripts/system.js | 42 +++++++++++++++++++++++++++++++++++++++-
ui/scripts/zoneWizard.js | 41 ++++++++++++++++++++++++++++++++++++---
2 files changed, 77 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1f21c126/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4e95652..3193a0a 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -7479,6 +7479,20 @@
},
//hypervisor==VMWare begins here
+
+ overridepublictraffic:{
+ label:'Override Public-Traffic',
+ isBoolean:true
+
+ },
+
+ overrideguesttraffic:{
+ label:'Override Guest-Traffic',
+ isBoolean:true
+
+ },
+
+
vSwitchPublicType:{
label: 'Public Traffic vSwitch Type',
select: function(args) {
@@ -7490,8 +7504,20 @@
items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"});
args.response.success({data: items});
},
- isHidden:true
+ isHidden:true,
+ dependsOn:'overridepublictraffic'
},
+
+ vSwitchPublicName:{
+ label:'vSwitch Public Traffic Name',
+ dependsOn:'overridepublictraffic',
+ isHidden:true
+
+
+ },
+
+
+
vSwitchGuestType:{
label: 'Guest Traffic vSwitch Type',
select: function(args) {
@@ -7501,9 +7527,21 @@
items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"});
args.response.success({data: items});
},
- isHidden:true
+ isHidden:true,
+ dependsOn:'overrideguesttraffic'
+
},
+ vSwitchGuestName:{
+ label:'vSwitch Guest Traffic Name',
+ dependsOn:'overrideguesttraffic',
+ isHidden:true
+
+
+ },
+
+
+
vCenterHost: {
label: 'label.vcenter.host',
docID: 'helpClustervCenterHost',
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1f21c126/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index a5c5209..e6b5c1a 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -811,6 +811,19 @@
},
//hypervisor==VMWare begins here
+
+ overridepublictraffic:{
+ label:'Override Public-Traffic',
+ isBoolean:true
+
+ },
+
+ overrideguesttraffic:{
+ label:'Override Guest-Traffic',
+ isBoolean:true
+
+ },
+
vSwitchPublicType:{
label: 'Public Traffic vSwitch Type',
@@ -823,8 +836,19 @@
items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"});
args.response.success({data: items});
},
- isHidden:true
- },
+ isHidden:true,
+ dependsOn:'overridepublictraffic'
+ },
+
+ vSwitchPublicName:{
+ label:'vSwitch Public Traffic Name',
+ dependsOn:'overridepublictraffic',
+ isHidden:true
+
+
+ },
+
+
vSwitchGuestType:{
label: 'Guest Traffic vSwitch Type',
select: function(args) {
@@ -834,8 +858,17 @@
items.push({id: "vmwaresvs", description: "VMware vNetwork Standard Virtual Switch"});
items.push({id: "vmwaredvs", description: "VMware vNetwork Distributed Virtual Switch"});
args.response.success({data: items});
- }, isHidden:true
- },
+ }, isHidden:true,
+ dependsOn:'overrideguesttraffic'
+
+ },
+
+ vSwitchGuestName:{
+ label:'vSwitch Guest Traffic Name',
+ dependsOn:'overrideguesttraffic',
+ isHidden:true
+
+ },
vCenterHost: {
label: 'label.vcenter.host',