Return-Path: 
 <commits-return-30318-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 619631003E
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Tue, 27 Aug 2013 20:31:09 +0000 (UTC)
Received: (qmail 81101 invoked by uid 500); 27 Aug 2013 20:31:09 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 81071 invoked by uid 500); 27 Aug 2013 20:31:08 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 81053 invoked by uid 99); 27 Aug 2013 20:31:08 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Aug 2013 20:31:08 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id E2AA046445; Tue, 27 Aug 2013 20:31:07 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: animesh@apache.org
To: commits@cloudstack.apache.org
Date: Tue, 27 Aug 2013 20:31:08 -0000
Message-Id: <b3528121ec9e46cea9d0ac2bbff411cb@git.apache.org>
In-Reply-To: <6af73946eefc497aaee5ae490990f6b5@git.apache.org>
References: <6af73946eefc497aaee5ae490990f6b5@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/3] git commit: updated refs/heads/4.2 to ca0f624

CLOUDSTACK-772 review comments on DVS fixed


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5566cd7e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5566cd7e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5566cd7e

Branch: refs/heads/4.2
Commit: 5566cd7e94ad5956d47bec94c5d644c037162a55
Parents: 4312fae
Author: radhikap <radhika.puthiyetath@citrix.com>
Authored: Tue Aug 27 14:17:15 2013 +0530
Committer: animesh <animesh@apache.org>
Committed: Tue Aug 27 13:30:19 2013 -0700

----------------------------------------------------------------------
 docs/en-US/vmware-cluster-config-dvswitch.xml | 78 ++++++++++++++++++++++
 1 file changed, 78 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5566cd7e/docs/en-US/vmware-cluster-config-dvswitch.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vmware-cluster-config-dvswitch.xml b/docs/en-US/vmware-cluster-config-dvswitch.xml
index 98bee0e..173055f 100644
--- a/docs/en-US/vmware-cluster-config-dvswitch.xml
+++ b/docs/en-US/vmware-cluster-config-dvswitch.xml
@@ -78,6 +78,84 @@
     <para>Use this VDS name when you specify the switch name in the traffic label while creating the
       zone. Traffic label format is [["Name of vSwitch/dvSwitch/EthernetPortProfile"][,"VLAN
       ID"[,"vSwitch Type"]]]</para>
+<<<<<<< HEAD
+=======
+    <para>The possible values for traffic labels are:</para>
+    <itemizedlist>
+      <listitem><para>empty string</para></listitem>
+      <listitem><para>dvSwitch0</para></listitem>
+      <listitem><para> dvSwitch0,200</para></listitem>
+      <listitem><para>dvSwitch1,300,vmwaredvs</para></listitem>
+      <listitem><para>myEthernetPortProfile,,nexusdvs</para></listitem>
+      <listitem><para>dvSwitch0,,vmwaredvs</para></listitem>
+    </itemizedlist>
+    
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="./images/traffic-label.png"/>
+      </imageobject>
+      <textobject>
+        <phrase>traffic-label.png: Traffic label specified while zone creation.</phrase>
+      </textobject>
+    </mediaobject>
+    <informaltable frame="all">
+      <tgroup cols="3" align="left" colsep="1" rowsep="1">
+        <colspec colname="c1"/>
+        <colspec colname="c2"/>
+        <colspec colname="c3"/>
+        <thead>
+          <row>
+            <entry><para>Fields</para></entry>
+            <entry><para>Name</para></entry>
+            <entry><para>Description</para></entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry><para>1</para></entry>
+            <entry><para>Represents the name of the virtual / distributed virtual switch at
+                vCenter.</para></entry>
+            <entry><para>The default value depends on the type of virtual switch:</para>
+              <para><emphasis role="bold">vSwitch0</emphasis>: If type of virtual switch is VMware
+                vNetwork Standard virtual switch </para>
+              <para><emphasis role="bold">dvSwitch0</emphasis>: If type of virtual switch is VMware
+                vNetwork Distributed virtual switch</para>
+              <para><emphasis role="bold">epp0</emphasis>: If type of virtual switch is Cisco Nexus
+                1000v Distributed virtual switch</para></entry>
+          </row>
+          <row>
+            <entry><para>2</para></entry>
+            <entry><para>VLAN ID to be used for this traffic wherever applicable.</para></entry>
+            <entry><para>This field would be used for only public traffic as of now. In case of guest traffic this
+                field would be ignored and could be left empty for guest traffic. By default empty
+                string would be assumed which translates to untagged VLAN for that specific traffic
+                type.</para></entry>
+          </row>
+          <row>
+            <entry><para>3</para></entry>
+            <entry><para>Type of virtual switch. Specified as string.</para></entry>
+            <entry><para>Possible valid values are vmwaredvs, vmwaresvs, nexusdvs. </para>
+              <para><emphasis role="bold">vmwaresvs</emphasis>: Represents VMware vNetwork Standard
+                virtual switch</para>
+              <para><emphasis role="bold">vmwaredvs</emphasis>: Represents VMware vNetwork
+                distributed virtual switch</para>
+              <para><emphasis role="bold">nexusdvs</emphasis>: Represents Cisco Nexus 1000v
+                distributed virtual switch.</para>
+              <para>If nothing specified (left empty), zone-level default virtual switch would be
+                defaulted, based on the value of global parameter you specify. </para>
+              <para>Following are the global configuration parameters:</para>
+              <para><emphasis role="bold">vmware.use.dvswitch</emphasis>: Set to true to enable any
+                kind (VMware DVS and Cisco Nexus 1000v) of distributed virtual switch in a &PRODUCT;
+                deployment. If set to false, the virtual switch that can be used in that &PRODUCT;
+                deployment is Standard virtual switch. </para>
+              <para><emphasis role="bold">vmware.use.nexus.vswitch</emphasis>: This parameter is
+                ignored if vmware.use.dvswitch is set to false. Set to true to enable Cisco Nexus
+                1000v distributed virtual switch in a &PRODUCT; deployment.</para></entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+>>>>>>> 6fc98a8... CLOUDSTACK-772 review comments on DVS fixed
   </section>
   <section id="enable-dvswitch">
     <title>Enabling Virtual Distributed Switch in &PRODUCT;</title>