Return-Path: 
 <commits-return-25826-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 6E1CE10B94
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed,  3 Jul 2013 22:25:44 +0000 (UTC)
Received: (qmail 73698 invoked by uid 500); 3 Jul 2013 22:25:41 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 73620 invoked by uid 500); 3 Jul 2013 22:25:41 -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 73523 invoked by uid 99); 3 Jul 2013 22:25:41 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jul 2013 22:25:41 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 2FFA582A0CE; Wed,  3 Jul 2013 22:25:41 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ahuang@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 03 Jul 2013 22:25:48 -0000
Message-Id: <b4318e5904ba4b76b6ececba4a59e76c@git.apache.org>
In-Reply-To: <bf9e3c5d479647a6a7a1dc6810e64455@git.apache.org>
References: <bf9e3c5d479647a6a7a1dc6810e64455@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [09/50] [abbrv] git commit: updated refs/heads/vmsync to 78fa5e1

CLOUDSTACK-2808


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

Branch: refs/heads/vmsync
Commit: db5d526269acac3fba357bd9f7ac4638a865fce1
Parents: 43f31dc
Author: unknown <radhikap@BANLRADHIKAP.citrite.net>
Authored: Tue Jul 2 19:37:57 2013 +0530
Committer: unknown <radhikap@BANLRADHIKAP.citrite.net>
Committed: Tue Jul 2 19:39:04 2013 +0530

----------------------------------------------------------------------
 docs/en-US/creating-network-offerings.xml |  4 +-
 docs/en-US/vlan-assign-isolated-nw.xml    | 72 ++++++++++++++++++++++++++
 docs/en-US/vlan-provisioning.xml          |  1 +
 3 files changed, 76 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db5d5262/docs/en-US/creating-network-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-network-offerings.xml b/docs/en-US/creating-network-offerings.xml
index 260751e..6e25b27 100644
--- a/docs/en-US/creating-network-offerings.xml
+++ b/docs/en-US/creating-network-offerings.xml
@@ -68,7 +68,9 @@
         </listitem>
         <listitem>
           <para><emphasis role="bold">Specify VLAN</emphasis>. (Isolated guest networks only)
-            Indicate whether a VLAN should be specified when this offering is used.</para>
+            Indicate whether a VLAN could be specified when this offering is used. If you select
+            this option and later use this network offering while creating a VPC tier or an isolated
+            network, you will be able to specify a VLAN ID for the network you create.</para>
         </listitem>
         <listitem>
           <para><emphasis role="bold">VPC</emphasis>. This option indicate whether the guest network

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db5d5262/docs/en-US/vlan-assign-isolated-nw.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vlan-assign-isolated-nw.xml b/docs/en-US/vlan-assign-isolated-nw.xml
new file mode 100644
index 0000000..82fd5b5
--- /dev/null
+++ b/docs/en-US/vlan-assign-isolated-nw.xml
@@ -0,0 +1,72 @@
+<?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="vlan-assign-isolated-nw">
+  <title>Assigning VLANs to Isolated Networks</title>
+  <para>&PRODUCT; provides you the ability to control VLAN assignment to Isolated networks. You can
+    assign a VLAN ID when a network is created, just the way it's done for Shared networks.
+    Additionally, a network with VLAN ID can be excluded from the Network Garbage Collection.</para>
+  <para>The former behaviour also is supported &mdash; VLAN is randomly allocated to a network from
+    the VNET range of the physical network when the network turns to Implemented state. The VLAN is
+    released back to the VNET pool when the network shuts down as a part of the Network Garbage
+    Collection. The VLAN can be re-used either by the same network when it is implemented again, or
+    by any other network. On each subsequent implementation of a network, a new VLAN can be
+    assigned.</para>
+  <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>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db5d5262/docs/en-US/vlan-provisioning.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vlan-provisioning.xml b/docs/en-US/vlan-provisioning.xml
index d37be16..2d1a49e 100644
--- a/docs/en-US/vlan-provisioning.xml
+++ b/docs/en-US/vlan-provisioning.xml
@@ -42,4 +42,5 @@
     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" />
+  <xi:include href="vlan-assign-isolated-nw.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>