From 7e5fd88f7c1d5072c774d5278229de2a76d6da78 Mon Sep 17 00:00:00 2001
From: Radhika PC <radhika.puthiyetath@citrix.com>
Date: Wed, 24 Apr 2013 17:54:21 +0530
Subject: [PATCH] CLOUDSTACK-804 ui changes

---
 docs/en-US/images/add-vlan-icon.png | Bin 0 -> 860 bytes
 docs/en-US/non-contiguous-vlan.xml  |  68 ++++++++++++++++++++++++++++
 docs/en-US/vlan-provisioning.xml    |   2 +
 3 files changed, 70 insertions(+)
 create mode 100644 docs/en-US/images/add-vlan-icon.png
 create mode 100644 docs/en-US/non-contiguous-vlan.xml

diff --git a/docs/en-US/images/add-vlan-icon.png b/docs/en-US/images/add-vlan-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..04655dc37ada249faf43d58b9628357ed7b649c8
GIT binary patch
literal 860
zcmV-i1Ec(jP)<h;3K|Lk000e1NJLTq0015U000>X0ssI2saFY200001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0`W;iK~zXf<&;@Z
zT2T~*@4su)m!|1MHA+<kWKg6aqktfy2q*#qB1U5+RzpQl5XvaC%w-S+nFLW=)Bn)Z
zkoX{jiQ%oumy?^d_gdNaoO3S}iT~6YE&WBcwac92L3h9Y6spbs;toU<Dh+h^@OV{j
z^cT19VqLWfHSZturFwsHc|+?;HPpQOoh#P*i}O6VuGoMY&4+BE(qHUuzg(e$8n+Lb
ze7PIGP>e4Szj^x(F@d$(J>ht!NApw3=JLtpDyZJLPhDQO6Hn!JdJ~>N8W@5hP?&KP
z204Mn6J|8qd!W?O@+4Xv9;r+T-PD^uvxRmJbOzW69F9bj$aDsaOQtcgQ-l#X^3x!U
z!&?kRlO0_x(Q0?E$rMoS<~EVex8w1L6{<}dV~#b)V{;aG{ADh0iArZpO_PRTqY{}i
zlE`#40`csJOCps+)mkH-%C(csT;&R7v(>&R5YMvbcXqY@U|6}a1>S%_q##jPlf}`|
z2t>2hxeB5y)p{(M?Z#!k<n@IF!d37Iq%RBLuOO1h7)%Zti{ISZ>E<$7?5h$PbX~53
zjq5=?l?C$}O=qAdnn-W&YC$w{h9;3Jy15Le7V(M%Di%xrP~;gFoAayo8%WU`OrR8w
zC8CK`t4FR>gB>SRXTi;FH@1``!--HN2GQ64Q1}_z{lkI5;rAatj=~W-z2T_}JY*`P
z6}`8A&~9ugM+W1+=tA+@7Yskc?eWj^mvHzmV~7b1W=grCIn?RZnr%Fuh{oaROb(AP
zaJW3}#+LH^*tjh05*@gR*qv_ff`CF}qA-)-f{%=i4}Ts*qHz>Di^=95pPUB6(bq(K
z0~g^~(&0K6t*lWQYyycgIZXsBcm@~TaAJ<clHGD&nA&;n1B4<mo5Q70Yxn}uJYTS|
zB$O&trzQ(HRkt?)8eTIs@PLB`Yb2h`T@_1}YPnh~Rchcdo=o?c_vO8Q(cHVC*D?Oj
m(dILoKrHJoG$t2|oBj&|5s64ai7C_o0000<MNUMnLSTZc(uflP

literal 0
HcmV?d00001

diff --git a/docs/en-US/non-contiguous-vlan.xml b/docs/en-US/non-contiguous-vlan.xml
new file mode 100644
index 00000000000..79fac835c7e
--- /dev/null
+++ b/docs/en-US/non-contiguous-vlan.xml
@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section id="non-contiguous-vlan">
+  <title>Non Contiguous VLAN Ranges</title>
+  <para>&PRODUCT; provides you with the flexibility to add non contiguous VLAN ranges to your
+    network. The administrator can either update an existing VLAN range or add multiple non
+    contiguous VLAN ranges while creating a zone. You can also use the UpdatephysicalNetwork API to
+    extend the VLAN range.</para>
+  <section id="add-vlan-range">
+    <title>Adding a New VLAN Range</title>
+    <orderedlist>
+      <listitem><para>Log in to the CloudPlatform UI as an administrator or end user.</para></listitem>
+      <listitem>
+        <para>Ensure that the VLAN range does not already exist.</para>
+      </listitem>
+      <listitem>
+        <para>Check whether the new VLAN range overlaps with any existing ones. If overlaps, extend
+          the existing range. If does not overlap, add the new range.</para>
+      </listitem>
+      <listitem>
+        <para>In the left navigation, choose Infrastructure. On Zones, click View More, then click the zone to
+          which you want to work with.</para>
+      </listitem>
+      <listitem>
+        <para>Click Physical Network.</para>
+      </listitem>
+      <listitem>
+        <para>In the Guest node of the diagram, click Configure.</para>
+      </listitem>
+      <listitem>
+        <para>Click Add VLAN Ranges button <inlinemediaobject>
+            <imageobject>
+              <imagedata fileref="./images/add-vlan-icon.png"/>
+            </imageobject>
+            <textobject>
+              <phrase>add-vlan-ico.png: button to add a VLAN range.</phrase>
+            </textobject>
+          </inlinemediaobject></para>
+        <para>The Add VLAN Ranges dialog is displayed.</para>
+      </listitem>
+      <listitem>
+        <para>Specify the start and end of the VLAN range.</para>
+      </listitem>
+      <listitem>
+      <para>Click OK.</para>
+      </listitem>
+    </orderedlist>
+  </section>
+</section>
diff --git a/docs/en-US/vlan-provisioning.xml b/docs/en-US/vlan-provisioning.xml
index 9345647d47a..d37be16fe5e 100644
--- a/docs/en-US/vlan-provisioning.xml
+++ b/docs/en-US/vlan-provisioning.xml
@@ -40,4 +40,6 @@
     different physical NIC and use the same set of VLANs if you run out of VLANs. Another advantage
     is that you can use the same set of IPs for different customers, each one with their own routers
     and the guest networks on different physical NICs.</para>
+  <xi:include href="vlan-allocation-eg.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="non-contiguous-vlan.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>