From a6c6f4851b595dc68ff6254df2f9feb8699b8883 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Sat, 10 Aug 2013 13:26:48 -0700
Subject: [PATCH] revert 12ca1d9102483c71f5008de846b861de317b0f36 since it's a
 partial UI change.

---
 ui/scripts/ui-custom/zoneWizard.js | 31 ++++++------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 64dac269472..8af873e43ea 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -295,36 +295,17 @@
             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: fields
+                    fields: {
+                        label: {
+                            label: hypervisor + ' ' + _l('label.traffic.label'),
+                            defaultValue: trafficData.label
+                        }
+                    }
                 },
 
                 after: function(args) {