From 4c89be144afa7b66d7d108755587d25692e68fb3 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 5 Aug 2013 12:08:03 -0700
Subject: [PATCH] CLOUDSTACK-4089: (WIP) Add new fields to zone wizard for
 configuring traffic type for VMware

---
 .../classes/resources/messages.properties     |  1 +
 ui/dictionary.jsp                             |  1 +
 ui/scripts/ui-custom/zoneWizard.js            | 31 +++++++++++++++----
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 3920934a948..41284f1d7a8 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+label.switch.type=Switch Type
 label.service.state=Service State
 label.egress.default.policy=Egress Default Policy
 label.routing=Routing
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 3f58c5937c3..394700c43f9 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,7 @@ under the License.
 <% long now = System.currentTimeMillis(); %>
 <script language="javascript">
 dictionary = {
+'label.switch.type': '<fmt:message key="label.switch.type" />',
 'label.service.state': '<fmt:message key="label.service.state" />',
 'label.egress.default.policy': '<fmt:message key="label.egress.default.policy" />',
 'label.routing': '<fmt:message key="label.routing" />',
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 8af873e43ea..64dac269472 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -295,17 +295,36 @@
             var trafficData = $trafficType.data('traffic-type-data') ?
                 $trafficType.data('traffic-type-data') : {};
             var hypervisor = getData($trafficType.closest('.zone-wizard')).zone.hypervisor;
+            var fields = {
+                label: {
+                    label: hypervisor + ' ' + _l('label.traffic.label'),
+                    defaultValue: trafficData.label
+                }
+            };
+
+            if (hypervisor === 'VMware') {
+                $.extend(fields, {
+                    vlanid: { label: 'VLAN ID' },
+                    switchType: {
+                        label: 'label.switch.type',
+                        select: function(args) {
+                            args.response.success({
+                                data: [
+                                    { id: 'vmwaresvs', description: 'VMware SVS' },
+                                    { id: 'vmwaredvs', description: 'VMware DVS' },
+                                    { id: 'nexusdvs', description: 'Nexus DVS' }
+                                ]
+                            });
+                        }
+                    }
+                });
+            }
 
             cloudStack.dialog.createForm({
                 form: {
                     title: _l('label.edit.traffic.type'),
                     desc: _l('message.edit.traffic.type'),
-                    fields: {
-                        label: {
-                            label: hypervisor + ' ' + _l('label.traffic.label'),
-                            defaultValue: trafficData.label
-                        }
-                    }
+                    fields: fields
                 },
 
                 after: function(args) {