cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [2/2] git commit: moving nicira docs to their own directory
Date Wed, 02 Oct 2013 14:44:57 GMT
moving nicira docs to their own directory


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

Branch: refs/heads/4.2
Commit: 0808f4ba1b928cf7fd418c596022f88cc9e1ec09
Parents: 08f7e6b
Author: David Nalley <david@gnsa.us>
Authored: Wed Oct 2 10:44:50 2013 -0400
Committer: David Nalley <david@gnsa.us>
Committed: Wed Oct 2 10:44:50 2013 -0400

----------------------------------------------------------------------
 en-US/CloudStack_Nicira_NVP_Guide.ent           |  22 ----
 en-US/CloudStack_Nicira_NVP_Guide.xml           |  55 --------
 en-US/images/nvp-add-controller.png             | Bin 35928 -> 0 bytes
 en-US/images/nvp-enable-provider.png            | Bin 32158 -> 0 bytes
 en-US/images/nvp-network-offering.png           | Bin 104060 -> 0 bytes
 en-US/images/nvp-physical-network-stt.png       | Bin 27317 -> 0 bytes
 en-US/images/nvp-vpc-offering-edit.png          | Bin 29279 -> 0 bytes
 en-US/plugin-niciranvp-about.xml                |  28 ----
 en-US/plugin-niciranvp-devicemanagement.xml     |  35 -----
 en-US/plugin-niciranvp-features.xml             |  84 ------------
 en-US/plugin-niciranvp-introduction.xml         |  29 ----
 en-US/plugin-niciranvp-networkofferings.xml     | 131 -------------------
 en-US/plugin-niciranvp-physicalnet.xml          |  37 ------
 en-US/plugin-niciranvp-preparations.xml         |  37 ------
 en-US/plugin-niciranvp-provider.xml             |  36 -----
 en-US/plugin-niciranvp-revisions.xml            |  59 ---------
 en-US/plugin-niciranvp-tables.xml               | 106 ---------------
 en-US/plugin-niciranvp-troubleshooting.xml      |  28 ----
 en-US/plugin-niciranvp-ui.xml                   |  26 ----
 en-US/plugin-niciranvp-usage.xml                |  33 -----
 en-US/plugin-niciranvp-uuidreferences.xml       |  30 -----
 en-US/plugin-niciranvp-vpc.xml                  |  30 -----
 en-US/plugin-niciranvp-vpcfeatures.xml          |  28 ----
 en-US/plugin-niciranvp-vpcnetworkoffering.xml   |  81 ------------
 en-US/plugin-niciranvp-vpcoffering.xml          |  38 ------
 nicira/en-US/Author_Group.xml                   |  32 +++++
 nicira/en-US/Book_Info.xml                      |  47 +++++++
 nicira/en-US/CloudStack_Nicira_NVP_Guide.ent    |  22 ++++
 nicira/en-US/CloudStack_Nicira_NVP_Guide.xml    |  55 ++++++++
 nicira/en-US/images/nvp-add-controller.png      | Bin 0 -> 35928 bytes
 nicira/en-US/images/nvp-enable-provider.png     | Bin 0 -> 32158 bytes
 nicira/en-US/images/nvp-network-offering.png    | Bin 0 -> 104060 bytes
 .../en-US/images/nvp-physical-network-stt.png   | Bin 0 -> 27317 bytes
 nicira/en-US/images/nvp-vpc-offering-edit.png   | Bin 0 -> 29279 bytes
 nicira/en-US/plugin-niciranvp-about.xml         |  28 ++++
 .../en-US/plugin-niciranvp-devicemanagement.xml |  35 +++++
 nicira/en-US/plugin-niciranvp-features.xml      |  84 ++++++++++++
 nicira/en-US/plugin-niciranvp-introduction.xml  |  29 ++++
 .../en-US/plugin-niciranvp-networkofferings.xml | 131 +++++++++++++++++++
 nicira/en-US/plugin-niciranvp-physicalnet.xml   |  37 ++++++
 nicira/en-US/plugin-niciranvp-preparations.xml  |  37 ++++++
 nicira/en-US/plugin-niciranvp-provider.xml      |  36 +++++
 nicira/en-US/plugin-niciranvp-revisions.xml     |  59 +++++++++
 nicira/en-US/plugin-niciranvp-tables.xml        | 106 +++++++++++++++
 .../en-US/plugin-niciranvp-troubleshooting.xml  |  28 ++++
 nicira/en-US/plugin-niciranvp-ui.xml            |  26 ++++
 nicira/en-US/plugin-niciranvp-usage.xml         |  33 +++++
 .../en-US/plugin-niciranvp-uuidreferences.xml   |  30 +++++
 nicira/en-US/plugin-niciranvp-vpc.xml           |  30 +++++
 nicira/en-US/plugin-niciranvp-vpcfeatures.xml   |  28 ++++
 .../plugin-niciranvp-vpcnetworkoffering.xml     |  81 ++++++++++++
 nicira/en-US/plugin-niciranvp-vpcoffering.xml   |  38 ++++++
 nicira/publican.cfg                             |  28 ++++
 publican-plugin-niciranvp.cfg                   |  28 ----
 54 files changed, 1060 insertions(+), 981 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/CloudStack_Nicira_NVP_Guide.ent
----------------------------------------------------------------------
diff --git a/en-US/CloudStack_Nicira_NVP_Guide.ent b/en-US/CloudStack_Nicira_NVP_Guide.ent
deleted file mode 100644
index abb1885..0000000
--- a/en-US/CloudStack_Nicira_NVP_Guide.ent
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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.
--->
-
-<!ENTITY PRODUCT "CloudStack">
-<!ENTITY BOOKID "Technical Documentation">
-<!ENTITY YEAR "2012">
-<!ENTITY HOLDER "Apache Software Foundation">

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/CloudStack_Nicira_NVP_Guide.xml
----------------------------------------------------------------------
diff --git a/en-US/CloudStack_Nicira_NVP_Guide.xml b/en-US/CloudStack_Nicira_NVP_Guide.xml
deleted file mode 100644
index 5431fc1..0000000
--- a/en-US/CloudStack_Nicira_NVP_Guide.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book 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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-
-<!-- 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.
--->
-
-<book>
-    <bookinfo id="cloudstack_plugin_niciranvp">
-    <title>&PRODUCT; Plugin Guide for the Nicira NVP Plugin</title>
-    <productname>Apache CloudStack</productname>
-    <productnumber>4.2.0</productnumber>
-    <edition>1</edition>
-    <pubsnumber></pubsnumber>
-    <abstract>
-        <para>
-            Plugin Guide for the Nicira NVP Plugin.
-        </para>
-    </abstract>
-    <corpauthor>
-        <inlinemediaobject>
-            <imageobject>
-                <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
-            </imageobject>
-        </inlinemediaobject>
-    </corpauthor>
-    <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    </bookinfo>
-    <xi:include href="plugin-niciranvp-about.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="plugin-niciranvp-usage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="plugin-niciranvp-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="plugin-niciranvp-revisions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>
-

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/images/nvp-add-controller.png
----------------------------------------------------------------------
diff --git a/en-US/images/nvp-add-controller.png b/en-US/images/nvp-add-controller.png
deleted file mode 100644
index e02d31f..0000000
Binary files a/en-US/images/nvp-add-controller.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/images/nvp-enable-provider.png
----------------------------------------------------------------------
diff --git a/en-US/images/nvp-enable-provider.png b/en-US/images/nvp-enable-provider.png
deleted file mode 100644
index 0f2d02d..0000000
Binary files a/en-US/images/nvp-enable-provider.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/images/nvp-network-offering.png
----------------------------------------------------------------------
diff --git a/en-US/images/nvp-network-offering.png b/en-US/images/nvp-network-offering.png
deleted file mode 100644
index c2d25c4..0000000
Binary files a/en-US/images/nvp-network-offering.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/images/nvp-physical-network-stt.png
----------------------------------------------------------------------
diff --git a/en-US/images/nvp-physical-network-stt.png b/en-US/images/nvp-physical-network-stt.png
deleted file mode 100644
index 2ce7853..0000000
Binary files a/en-US/images/nvp-physical-network-stt.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/images/nvp-vpc-offering-edit.png
----------------------------------------------------------------------
diff --git a/en-US/images/nvp-vpc-offering-edit.png b/en-US/images/nvp-vpc-offering-edit.png
deleted file mode 100644
index ff235e2..0000000
Binary files a/en-US/images/nvp-vpc-offering-edit.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-about.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-about.xml b/en-US/plugin-niciranvp-about.xml
deleted file mode 100644
index cfab83c..0000000
--- a/en-US/plugin-niciranvp-about.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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.
--->
-<chapter id="About-the-Nicira-NVP-Plugin" >
-    <title>The Nicira NVP Plugin</title>
-    <xi:include href="plugin-niciranvp-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</chapter>
-   

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-devicemanagement.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-devicemanagement.xml b/en-US/plugin-niciranvp-devicemanagement.xml
deleted file mode 100644
index 761c39f..0000000
--- a/en-US/plugin-niciranvp-devicemanagement.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Device-management">
-    <title>Device Management</title>
-    <para>In &PRODUCT; a Nicira NVP setup is considered a "device" that can be added and removed from a physical network. To complete the configuration of the Nicira NVP plugin a device needs to be added to the physical network. Press the "Add NVP Controller" button on the provider panel and enter the configuration details.</para>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/nvp-add-controller.png" />
-        </imageobject>
-        <textobject>
-            <phrase>nvp-physical-network-stt.png: a screenshot of the device configuration popup.</phrase>
-        </textobject>
-    </mediaobject>
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-features.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-features.xml b/en-US/plugin-niciranvp-features.xml
deleted file mode 100644
index e439f1b..0000000
--- a/en-US/plugin-niciranvp-features.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Features-of-the-Nicira-NVP-Plugin">
-    <title>Features of the Nicira NVP Plugin</title>
-    <para>The following table lists the CloudStack network services provided by the Nicira NVP Plugin.</para>
-    <table>
-        <title>Supported Services</title>
-        <tgroup cols="3">
-        <thead>
-            <row>
-                <entry>Network Service</entry>
-                <entry>CloudStack version</entry>
-                <entry>NVP version</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>Virtual Networking</entry>
-                <entry>&gt;= 4.0</entry>
-                <entry>&gt;= 2.2.1</entry>
-            </row>
-            <row>
-                <entry>Source NAT</entry>
-                <entry>&gt;= 4.1</entry>
-                <entry>&gt;= 3.0.1</entry>
-            </row>
-            <row>
-                <entry>Static NAT</entry>
-                <entry>&gt;= 4.1</entry>
-                <entry>&gt;= 3.0.1</entry>
-            </row>
-            <row>
-                <entry>Port Forwarding</entry>
-                <entry>&gt;= 4.1</entry>
-                <entry>&gt;= 3.0.1</entry>
-            </row>
-        </tbody>
-        </tgroup>
-    </table>
-    <note><para>The Virtual Networking service was originally called 'Connectivity' in CloudStack 4.0</para></note>
-    <para>The following hypervisors are supported by the Nicira NVP Plugin.</para>
-    <table>
-        <title>Supported Hypervisors</title>
-        <tgroup cols="2">
-        <thead>
-            <row>
-                <entry>Hypervisor</entry>
-                <entry>CloudStack version</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>XenServer</entry>
-                <entry>&gt;= 4.0</entry>
-            </row>
-            <row>
-                <entry>KVM</entry>
-                <entry>&gt;= 4.1</entry>
-            </row>
-        </tbody>
-        </tgroup>
-    </table>
-    <note><para>Please refer to the Nicira NVP configuration guide on how to prepare the hypervisors for Nicira NVP integration.</para></note>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-introduction.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-introduction.xml b/en-US/plugin-niciranvp-introduction.xml
deleted file mode 100644
index a06f123..0000000
--- a/en-US/plugin-niciranvp-introduction.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Introduction-to-the-Nicira-NVP-Plugin">
-    <title>Introduction to the Nicira NVP Plugin</title>
-    <para>The Nicira NVP plugin adds Nicira NVP as one of the available SDN implementations in
-        CloudStack. With the plugin an exisiting Nicira NVP setup can be used by CloudStack to
-        implement isolated guest networks and to provide additional services like routing and
-        NAT.</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-networkofferings.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-networkofferings.xml b/en-US/plugin-niciranvp-networkofferings.xml
deleted file mode 100644
index b30437e..0000000
--- a/en-US/plugin-niciranvp-networkofferings.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="network-offerings">
-    <title>Network Offerings</title>
-    <para>Using the Nicira NVP plugin requires a network offering with Virtual Networking enabled and configured to use the NiciraNvp element. Typical use cases combine services from the Virtual Router appliance and the Nicira NVP plugin.</para>
-    <table>
-        <title>Isolated network offering with regular services from the Virtual Router.</title>
-        <tgroup cols="2">
-        <thead>
-            <row>
-                <entry>Service</entry>
-                <entry>Provider</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>VPN</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>DHCP</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>DNS</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Firewall</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Load Balancer</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>User Data</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Source NAT</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Static NAT</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Post Forwarding</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Virtual Networking</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-        </tbody>
-        </tgroup>
-    </table>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/nvp-network-offering.png" />
-        </imageobject>
-        <textobject>
-            <phrase>nvp-physical-network-stt.png: a screenshot of a network offering.</phrase>
-        </textobject>
-    </mediaobject>
-    <note><para>The tag in the network offering should be set to the name of the physical network with the NVP provider.</para></note>
-    <para>Isolated network with network services. The virtual router is still required to provide network services like dns and dhcp.</para>
-    <table>
-        <title>Isolated network offering with network services</title>
-        <tgroup cols="2">
-        <thead>
-            <row>
-                <entry>Service</entry>
-                <entry>Provider</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>DHCP</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>DNS</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>User Data</entry>
-                <entry>VirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Source NAT</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-            <row>
-                <entry>Static NAT</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-            <row>
-                <entry>Post Forwarding</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-            <row>
-                <entry>Virtual Networking</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-        </tbody>
-        </tgroup>
-    </table>
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-physicalnet.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-physicalnet.xml b/en-US/plugin-niciranvp-physicalnet.xml
deleted file mode 100644
index d320290..0000000
--- a/en-US/plugin-niciranvp-physicalnet.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="zone-configuration">
-    <title>Zone Configuration</title>
-    <para>&PRODUCT; needs to have at least one physical network with the isolation method set to "STT". This network should be enabled for the Guest traffic type.</para>
-    <note><para>The Guest traffic type should be configured with the traffic label that matches the name of
-        the Integration Bridge on the hypervisor. See the Nicira NVP User Guide for more details
-        on how to set this up in XenServer or KVM.</para></note>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/nvp-physical-network-stt.png" />
-        </imageobject>
-        <textobject>
-            <phrase>nvp-physical-network-stt.png: a screenshot of a physical network with the STT isolation type</phrase>
-        </textobject>
-    </mediaobject>
-    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-preparations.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-preparations.xml b/en-US/plugin-niciranvp-preparations.xml
deleted file mode 100644
index 6072559..0000000
--- a/en-US/plugin-niciranvp-preparations.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Prerequisites">
-    <title>Prerequisites</title>
-    <para>Before enabling the Nicira NVP plugin the NVP Controller needs to be configured. Please review the NVP User Guide on how to do that.</para>
-    <para>Make sure you have the following information ready:</para>
-    <itemizedlist>
-        <listitem><para>The IP address of the NVP Controller</para></listitem>
-        <listitem><para>The username to access the API</para></listitem>
-        <listitem><para>The password to access the API</para></listitem>
-        <listitem><para>The UUID of the Transport Zone that contains the hypervisors in this Zone</para></listitem>
-        <listitem>
-            <para>The UUID of the Gateway Service used to provide router and NAT services.</para>
-        </listitem>
-    </itemizedlist>
-    <note><para>The gateway service uuid is optional and is used for Layer 3 services only (SourceNat, StaticNat and PortForwarding)</para></note>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-provider.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-provider.xml b/en-US/plugin-niciranvp-provider.xml
deleted file mode 100644
index 8694478..0000000
--- a/en-US/plugin-niciranvp-provider.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Enabling-the-service-provider">
-    <title>Enabling the service provider</title>
-    <para>The Nicira NVP provider is disabled by default. Navigate to the "Network Service Providers" configuration of the physical network with the STT isolation type. Navigate to the Nicira NVP provider and press the "Enable Provider" button.</para>
-    <note><para>CloudStack 4.0 does not have the UI interface to configure the Nicira NVP plugin. Configuration needs to be done using the API directly.</para></note>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/nvp-enable-provider.png" />
-        </imageobject>
-        <textobject>
-            <phrase>nvp-physical-network-stt.png: a screenshot of an enabled Nicira NVP provider</phrase>
-        </textobject>
-    </mediaobject>
-    
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-revisions.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-revisions.xml b/en-US/plugin-niciranvp-revisions.xml
deleted file mode 100644
index b58d333..0000000
--- a/en-US/plugin-niciranvp-revisions.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE appendix 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.
--->
-
-<appendix id="appe-cloudstack-Revision_History">
-    <title>Revision History</title>
-    <simpara>
-        <revhistory>
-            <revision>
-                <revnumber>0-0</revnumber>
-                <date>Wed Oct 03 2012</date>
-                <author>
-                    <firstname>Hugo</firstname>
-                    <surname>Trippaers</surname>
-                    <email>hugo@apache.org</email>
-                </author>
-                <revdescription>
-                    <simplelist>
-                        <member>Documentation created for 4.0.0-incubating version of the NVP Plugin</member>
-                    </simplelist>
-                </revdescription>
-            </revision>
-            <revision>
-                <revnumber>1-0</revnumber>
-                <date>Wed May 22 2013</date>
-                <author>
-                    <firstname>Hugo</firstname>
-                    <surname>Trippaers</surname>
-                    <email>hugo@apache.org</email>
-                </author>
-                <revdescription>
-                    <simplelist>
-                        <member>Documentation updated for &PRODUCT; 4.1.0</member>
-                    </simplelist>
-                </revdescription>
-            </revision>
-        </revhistory>
-    </simpara>
-</appendix>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-tables.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-tables.xml b/en-US/plugin-niciranvp-tables.xml
deleted file mode 100644
index 615f349..0000000
--- a/en-US/plugin-niciranvp-tables.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="Database-tables">
-    <title>Database tables</title>
-    <para>The following tables are added to the cloud database for the Nicira NVP Plugin</para>
-    <table>
-        <title>nicira_nvp_nic_map</title>
-        <tgroup cols="2">
-            <tbody>
-                <row>
-                    <entry>id</entry>
-                    <entry>auto incrementing id</entry>
-                </row>
-                <row>
-                    <entry>logicalswitch</entry>
-                    <entry>uuid of the logical switch this port is connected to</entry>
-                </row>
-                <row>
-                    <entry>logicalswitchport</entry>
-                    <entry>uuid of the logical switch port for this nic</entry>
-                </row>
-                <row>
-                    <entry>nic</entry>
-                    <entry>the &PRODUCT; uuid for this nic, reference to the nics table</entry>
-                </row>
-            </tbody>
-        </tgroup>
-    </table>
-
-    <table>
-        <title>external_nicira_nvp_devices</title>
-        <tgroup cols="2">
-            <tbody>
-                <row>
-                    <entry>id</entry>
-                    <entry>auto incrementing id</entry>
-                </row>
-                <row>
-                    <entry>uuid</entry>
-                    <entry>UUID identifying this device</entry>
-                </row>
-                <row>
-                    <entry>physical_network_id</entry>
-                    <entry>the physical network this device is configured on</entry>
-                </row>
-                <row>
-                    <entry>provider_name</entry>
-                    <entry>NiciraNVP</entry>
-                </row>
-                <row>
-                    <entry>device_name</entry>
-                    <entry>display name for this device</entry>
-                </row>
-                <row>
-                    <entry>host_id</entry>
-                    <entry>reference to the host table with the device configuration</entry>
-                </row>
-            </tbody>
-        </tgroup>
-    </table>
-
-    <table>
-        <title>nicira_nvp_router_map</title>
-        <tgroup cols="2">
-            <tbody>
-                <row>
-                    <entry>id</entry>
-                    <entry>auto incrementing id</entry>
-                </row>
-                <row>
-                    <entry>logicalrouter_uuid</entry>
-                    <entry>uuid of the logical router</entry>
-                </row>
-                <row>
-                    <entry>network_id</entry>
-                    <entry>id of the network this router is linked to</entry>
-                </row>
-            </tbody>
-        </tgroup>
-    </table>
-
-    <note>
-        <para>nicira_nvp_router_map is only available in &PRODUCT; 4.1 and above</para>
-    </note>
-
-</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-troubleshooting.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-troubleshooting.xml b/en-US/plugin-niciranvp-troubleshooting.xml
deleted file mode 100644
index 02b0655..0000000
--- a/en-US/plugin-niciranvp-troubleshooting.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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.
--->
-<chapter id="Troubleshooting-the-Nicira-NVP-Plugin" >
-    <title>Troubleshooting the Nicira NVP Plugin</title>
-    
-    <xi:include href="plugin-niciranvp-uuidreferences.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-tables.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-ui.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-ui.xml b/en-US/plugin-niciranvp-ui.xml
deleted file mode 100644
index 8b1bbad..0000000
--- a/en-US/plugin-niciranvp-ui.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="plugin-niciranvp-ui">
-    <title>Configuring the Nicira NVP plugin from the UI</title>
-    <para>In CloudStack 4.1.0-incubating the Nicira NVP plugin and its resources can be configured in the infrastructure tab of the UI. Navigate to the physical network with STT isolation and configure the network elements. The NiciraNvp is listed here. <!-- TODO add screenshot --></para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-usage.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-usage.xml b/en-US/plugin-niciranvp-usage.xml
deleted file mode 100644
index 9f04c38..0000000
--- a/en-US/plugin-niciranvp-usage.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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.
--->
-<chapter id="Using-the-Nicira-NVP-Plugin" >
-    <title>Configuring the Nicira NVP Plugin</title>
-    
-    <xi:include href="plugin-niciranvp-preparations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-physicalnet.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-provider.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="plugin-niciranvp-devicemanagement.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    <xi:include href="plugin-niciranvp-networkofferings.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-uuidreferences.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-uuidreferences.xml b/en-US/plugin-niciranvp-uuidreferences.xml
deleted file mode 100644
index cb5f1ca..0000000
--- a/en-US/plugin-niciranvp-uuidreferences.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="UUID-references">
-    <title>UUID References</title>
-    <para>The plugin maintains several references in the &PRODUCT; database to items created on the NVP Controller.</para>
-    <para>Every guest network that is created will have its broadcast type set to Lswitch and if the network is in state "Implemented", the broadcast URI will have the UUID of the Logical Switch that was created for this network on the NVP Controller.</para>
-    <para>The Nics that are connected to one of the Logical Switches will have their Logical Switch Port UUID listed in the nicira_nvp_nic_map table</para>
-    <note><para>All devices created on the NVP Controller will have a tag set to domain-account of the owner of the network, this string can be used to search for items in the NVP Controller.</para></note>    
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-vpc.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-vpc.xml b/en-US/plugin-niciranvp-vpc.xml
deleted file mode 100644
index a43c5fa..0000000
--- a/en-US/plugin-niciranvp-vpc.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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.
--->
-<chapter id="Using-the-Nicira-NVP-Plugin-With_VPC" >
-    <title>Using the Nicira NVP plugin with VPC</title>
-    
-    <xi:include href="plugin-niciranvp-vpcfeatures.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-vpcoffering.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-    <xi:include href="plugin-niciranvp-vpcnetworkoffering.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-
-</chapter>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-vpcfeatures.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-vpcfeatures.xml b/en-US/plugin-niciranvp-vpcfeatures.xml
deleted file mode 100644
index a8d8194..0000000
--- a/en-US/plugin-niciranvp-vpcfeatures.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="vpc-features">
-    <title>Supported VPC features</title>
-    <para>The Nicira NVP plugin supports &PRODUCT; VPC to a certain extent. Starting with &PRODUCT; version 4.1 VPCs can be deployed using NVP isolated networks.</para>
-    <para>It is not possible to use a Nicira NVP Logical Router for as a VPC Router</para>
-    <para>It is not possible to connect a private gateway using a Nicira NVP Logical Switch</para>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-vpcnetworkoffering.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-vpcnetworkoffering.xml b/en-US/plugin-niciranvp-vpcnetworkoffering.xml
deleted file mode 100644
index 141006e..0000000
--- a/en-US/plugin-niciranvp-vpcnetworkoffering.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="nvp-vpc-network-offering">
-    <title>VPC Network Offerings</title>
-    <para>The VPC needs specific network offerings with the VPC flag enabled. Otherwise these network offerings are identical to regular network offerings. To allow VPC networks with a Nicira NVP isolated network the offerings need to support the Virtual Networking service with the NiciraNVP provider.</para>
-    <para>In a typical configuration two network offerings need to be created. One with the loadbalancing service enabled and one without loadbalancing.</para>
-    <table>
-        <title>VPC Network Offering with Loadbalancing</title>
-        <tgroup cols="2">
-        <thead>
-            <row>
-                <entry>Service</entry>
-                <entry>Provider</entry>
-            </row>
-        </thead>
-        <tbody>
-            <row>
-                <entry>VPN</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>DHCP</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>DNS</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Load Balancer</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>User Data</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Source NAT</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Static NAT</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Post Forwarding</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>NetworkACL</entry>
-                <entry>VpcVirtualRouter</entry>
-            </row>
-            <row>
-                <entry>Virtual Networking</entry>
-                <entry>NiciraNVP</entry>
-            </row>
-        </tbody>
-        </tgroup>
-    </table>
-    
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/en-US/plugin-niciranvp-vpcoffering.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-niciranvp-vpcoffering.xml b/en-US/plugin-niciranvp-vpcoffering.xml
deleted file mode 100644
index 292621e..0000000
--- a/en-US/plugin-niciranvp-vpcoffering.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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;
-<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
-%xinclude;
-]>
-<!-- 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="nvp-vpc-offering">
-    <title>VPC Offering with Nicira NVP</title>
-    <para>To allow a VPC to use the Nicira NVP plugin to provision networks, a new VPC offering needs to be created which allows the Virtual Networking service to be implemented by NiciraNVP.</para>
-    <para>This is not currently possible with the UI. The API does provide the proper calls to create a VPC offering with Virtual Networking enabled. However due to a limitation in the 4.1 API it is not possible to select the provider for this network service. To configure the VPC offering with the NiciraNVP provider edit the database table 'vpc_offering_service_map' and change the provider to NiciraNvp for the service 'Connectivity'</para>
-    <para>It is also possible to update the default VPC offering by adding a row to the
-        'vpc_offering_service_map' with service 'Connectivity' and provider 'NiciraNvp'</para>
-    <mediaobject>
-        <imageobject>
-            <imagedata fileref="./images/nvp-vpc-offering-edit.png" />
-        </imageobject>
-        <textobject>
-            <phrase>nvp-physical-network-stt.png: a screenshot of the mysql table.</phrase>
-        </textobject>
-    </mediaobject>
-    <note><para>When creating a new VPC offering please note that the UI does not allow you to select a VPC offering yet. The VPC needs to be created using the API with the offering UUID.</para></note>
-</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/Author_Group.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/Author_Group.xml b/nicira/en-US/Author_Group.xml
new file mode 100644
index 0000000..ba9e651
--- /dev/null
+++ b/nicira/en-US/Author_Group.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Runbook.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.
+-->
+
+
+<authorgroup>
+    <author>
+        <firstname>Apache</firstname>
+        <surname>CloudStack</surname>
+    </author>
+</authorgroup>
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/Book_Info.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/Book_Info.xml b/nicira/en-US/Book_Info.xml
new file mode 100644
index 0000000..327668d
--- /dev/null
+++ b/nicira/en-US/Book_Info.xml
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE bookinfo 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.
+-->
+
+<bookinfo id="book-release-notes-3.0.4">
+    <title>&PRODUCT; Guide</title>
+    <subtitle>Revised August 9, 2012 10:48 pm Pacific</subtitle>
+    <productname>Apache CloudStack</productname>
+    <productnumber>4.2.0</productnumber>
+    <edition>1</edition>
+    <pubsnumber></pubsnumber>
+    <abstract>
+        <para>
+            Complete technical documentation of &PRODUCT;.
+        </para>
+    </abstract>
+    <corpauthor>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+            </imageobject>
+        </inlinemediaobject>
+    </corpauthor>
+    <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</bookinfo>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/CloudStack_Nicira_NVP_Guide.ent
----------------------------------------------------------------------
diff --git a/nicira/en-US/CloudStack_Nicira_NVP_Guide.ent b/nicira/en-US/CloudStack_Nicira_NVP_Guide.ent
new file mode 100644
index 0000000..abb1885
--- /dev/null
+++ b/nicira/en-US/CloudStack_Nicira_NVP_Guide.ent
@@ -0,0 +1,22 @@
+<!-- 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.
+-->
+
+<!ENTITY PRODUCT "CloudStack">
+<!ENTITY BOOKID "Technical Documentation">
+<!ENTITY YEAR "2012">
+<!ENTITY HOLDER "Apache Software Foundation">

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/CloudStack_Nicira_NVP_Guide.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/CloudStack_Nicira_NVP_Guide.xml b/nicira/en-US/CloudStack_Nicira_NVP_Guide.xml
new file mode 100644
index 0000000..5431fc1
--- /dev/null
+++ b/nicira/en-US/CloudStack_Nicira_NVP_Guide.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE book 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;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+
+<!-- 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.
+-->
+
+<book>
+    <bookinfo id="cloudstack_plugin_niciranvp">
+    <title>&PRODUCT; Plugin Guide for the Nicira NVP Plugin</title>
+    <productname>Apache CloudStack</productname>
+    <productnumber>4.2.0</productnumber>
+    <edition>1</edition>
+    <pubsnumber></pubsnumber>
+    <abstract>
+        <para>
+            Plugin Guide for the Nicira NVP Plugin.
+        </para>
+    </abstract>
+    <corpauthor>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+            </imageobject>
+        </inlinemediaobject>
+    </corpauthor>
+    <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    </bookinfo>
+    <xi:include href="plugin-niciranvp-about.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="plugin-niciranvp-usage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="plugin-niciranvp-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+    <xi:include href="plugin-niciranvp-troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="plugin-niciranvp-revisions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/images/nvp-add-controller.png
----------------------------------------------------------------------
diff --git a/nicira/en-US/images/nvp-add-controller.png b/nicira/en-US/images/nvp-add-controller.png
new file mode 100644
index 0000000..e02d31f
Binary files /dev/null and b/nicira/en-US/images/nvp-add-controller.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/images/nvp-enable-provider.png
----------------------------------------------------------------------
diff --git a/nicira/en-US/images/nvp-enable-provider.png b/nicira/en-US/images/nvp-enable-provider.png
new file mode 100644
index 0000000..0f2d02d
Binary files /dev/null and b/nicira/en-US/images/nvp-enable-provider.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/images/nvp-network-offering.png
----------------------------------------------------------------------
diff --git a/nicira/en-US/images/nvp-network-offering.png b/nicira/en-US/images/nvp-network-offering.png
new file mode 100644
index 0000000..c2d25c4
Binary files /dev/null and b/nicira/en-US/images/nvp-network-offering.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/images/nvp-physical-network-stt.png
----------------------------------------------------------------------
diff --git a/nicira/en-US/images/nvp-physical-network-stt.png b/nicira/en-US/images/nvp-physical-network-stt.png
new file mode 100644
index 0000000..2ce7853
Binary files /dev/null and b/nicira/en-US/images/nvp-physical-network-stt.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/images/nvp-vpc-offering-edit.png
----------------------------------------------------------------------
diff --git a/nicira/en-US/images/nvp-vpc-offering-edit.png b/nicira/en-US/images/nvp-vpc-offering-edit.png
new file mode 100644
index 0000000..ff235e2
Binary files /dev/null and b/nicira/en-US/images/nvp-vpc-offering-edit.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-about.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-about.xml b/nicira/en-US/plugin-niciranvp-about.xml
new file mode 100644
index 0000000..cfab83c
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-about.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter 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;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- 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.
+-->
+<chapter id="About-the-Nicira-NVP-Plugin" >
+    <title>The Nicira NVP Plugin</title>
+    <xi:include href="plugin-niciranvp-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+    <xi:include href="plugin-niciranvp-features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</chapter>
+   

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-devicemanagement.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-devicemanagement.xml b/nicira/en-US/plugin-niciranvp-devicemanagement.xml
new file mode 100644
index 0000000..761c39f
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-devicemanagement.xml
@@ -0,0 +1,35 @@
+<?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;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- 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="Device-management">
+    <title>Device Management</title>
+    <para>In &PRODUCT; a Nicira NVP setup is considered a "device" that can be added and removed from a physical network. To complete the configuration of the Nicira NVP plugin a device needs to be added to the physical network. Press the "Add NVP Controller" button on the provider panel and enter the configuration details.</para>
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="./images/nvp-add-controller.png" />
+        </imageobject>
+        <textobject>
+            <phrase>nvp-physical-network-stt.png: a screenshot of the device configuration popup.</phrase>
+        </textobject>
+    </mediaobject>
+    
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-features.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-features.xml b/nicira/en-US/plugin-niciranvp-features.xml
new file mode 100644
index 0000000..e439f1b
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-features.xml
@@ -0,0 +1,84 @@
+<?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;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- 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="Features-of-the-Nicira-NVP-Plugin">
+    <title>Features of the Nicira NVP Plugin</title>
+    <para>The following table lists the CloudStack network services provided by the Nicira NVP Plugin.</para>
+    <table>
+        <title>Supported Services</title>
+        <tgroup cols="3">
+        <thead>
+            <row>
+                <entry>Network Service</entry>
+                <entry>CloudStack version</entry>
+                <entry>NVP version</entry>
+            </row>
+        </thead>
+        <tbody>
+            <row>
+                <entry>Virtual Networking</entry>
+                <entry>&gt;= 4.0</entry>
+                <entry>&gt;= 2.2.1</entry>
+            </row>
+            <row>
+                <entry>Source NAT</entry>
+                <entry>&gt;= 4.1</entry>
+                <entry>&gt;= 3.0.1</entry>
+            </row>
+            <row>
+                <entry>Static NAT</entry>
+                <entry>&gt;= 4.1</entry>
+                <entry>&gt;= 3.0.1</entry>
+            </row>
+            <row>
+                <entry>Port Forwarding</entry>
+                <entry>&gt;= 4.1</entry>
+                <entry>&gt;= 3.0.1</entry>
+            </row>
+        </tbody>
+        </tgroup>
+    </table>
+    <note><para>The Virtual Networking service was originally called 'Connectivity' in CloudStack 4.0</para></note>
+    <para>The following hypervisors are supported by the Nicira NVP Plugin.</para>
+    <table>
+        <title>Supported Hypervisors</title>
+        <tgroup cols="2">
+        <thead>
+            <row>
+                <entry>Hypervisor</entry>
+                <entry>CloudStack version</entry>
+            </row>
+        </thead>
+        <tbody>
+            <row>
+                <entry>XenServer</entry>
+                <entry>&gt;= 4.0</entry>
+            </row>
+            <row>
+                <entry>KVM</entry>
+                <entry>&gt;= 4.1</entry>
+            </row>
+        </tbody>
+        </tgroup>
+    </table>
+    <note><para>Please refer to the Nicira NVP configuration guide on how to prepare the hypervisors for Nicira NVP integration.</para></note>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-introduction.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-introduction.xml b/nicira/en-US/plugin-niciranvp-introduction.xml
new file mode 100644
index 0000000..a06f123
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-introduction.xml
@@ -0,0 +1,29 @@
+<?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;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- 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="Introduction-to-the-Nicira-NVP-Plugin">
+    <title>Introduction to the Nicira NVP Plugin</title>
+    <para>The Nicira NVP plugin adds Nicira NVP as one of the available SDN implementations in
+        CloudStack. With the plugin an exisiting Nicira NVP setup can be used by CloudStack to
+        implement isolated guest networks and to provide additional services like routing and
+        NAT.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-networkofferings.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-networkofferings.xml b/nicira/en-US/plugin-niciranvp-networkofferings.xml
new file mode 100644
index 0000000..b30437e
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-networkofferings.xml
@@ -0,0 +1,131 @@
+<?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;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- 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="network-offerings">
+    <title>Network Offerings</title>
+    <para>Using the Nicira NVP plugin requires a network offering with Virtual Networking enabled and configured to use the NiciraNvp element. Typical use cases combine services from the Virtual Router appliance and the Nicira NVP plugin.</para>
+    <table>
+        <title>Isolated network offering with regular services from the Virtual Router.</title>
+        <tgroup cols="2">
+        <thead>
+            <row>
+                <entry>Service</entry>
+                <entry>Provider</entry>
+            </row>
+        </thead>
+        <tbody>
+            <row>
+                <entry>VPN</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>DHCP</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>DNS</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>Firewall</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>Load Balancer</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>User Data</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>Source NAT</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>Static NAT</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>Post Forwarding</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>Virtual Networking</entry>
+                <entry>NiciraNVP</entry>
+            </row>
+        </tbody>
+        </tgroup>
+    </table>
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="./images/nvp-network-offering.png" />
+        </imageobject>
+        <textobject>
+            <phrase>nvp-physical-network-stt.png: a screenshot of a network offering.</phrase>
+        </textobject>
+    </mediaobject>
+    <note><para>The tag in the network offering should be set to the name of the physical network with the NVP provider.</para></note>
+    <para>Isolated network with network services. The virtual router is still required to provide network services like dns and dhcp.</para>
+    <table>
+        <title>Isolated network offering with network services</title>
+        <tgroup cols="2">
+        <thead>
+            <row>
+                <entry>Service</entry>
+                <entry>Provider</entry>
+            </row>
+        </thead>
+        <tbody>
+            <row>
+                <entry>DHCP</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>DNS</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>User Data</entry>
+                <entry>VirtualRouter</entry>
+            </row>
+            <row>
+                <entry>Source NAT</entry>
+                <entry>NiciraNVP</entry>
+            </row>
+            <row>
+                <entry>Static NAT</entry>
+                <entry>NiciraNVP</entry>
+            </row>
+            <row>
+                <entry>Post Forwarding</entry>
+                <entry>NiciraNVP</entry>
+            </row>
+            <row>
+                <entry>Virtual Networking</entry>
+                <entry>NiciraNVP</entry>
+            </row>
+        </tbody>
+        </tgroup>
+    </table>
+    
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-physicalnet.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-physicalnet.xml b/nicira/en-US/plugin-niciranvp-physicalnet.xml
new file mode 100644
index 0000000..d320290
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-physicalnet.xml
@@ -0,0 +1,37 @@
+<?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;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- 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="zone-configuration">
+    <title>Zone Configuration</title>
+    <para>&PRODUCT; needs to have at least one physical network with the isolation method set to "STT". This network should be enabled for the Guest traffic type.</para>
+    <note><para>The Guest traffic type should be configured with the traffic label that matches the name of
+        the Integration Bridge on the hypervisor. See the Nicira NVP User Guide for more details
+        on how to set this up in XenServer or KVM.</para></note>
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="./images/nvp-physical-network-stt.png" />
+        </imageobject>
+        <textobject>
+            <phrase>nvp-physical-network-stt.png: a screenshot of a physical network with the STT isolation type</phrase>
+        </textobject>
+    </mediaobject>
+    </section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-preparations.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-preparations.xml b/nicira/en-US/plugin-niciranvp-preparations.xml
new file mode 100644
index 0000000..6072559
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-preparations.xml
@@ -0,0 +1,37 @@
+<?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;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- 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="Prerequisites">
+    <title>Prerequisites</title>
+    <para>Before enabling the Nicira NVP plugin the NVP Controller needs to be configured. Please review the NVP User Guide on how to do that.</para>
+    <para>Make sure you have the following information ready:</para>
+    <itemizedlist>
+        <listitem><para>The IP address of the NVP Controller</para></listitem>
+        <listitem><para>The username to access the API</para></listitem>
+        <listitem><para>The password to access the API</para></listitem>
+        <listitem><para>The UUID of the Transport Zone that contains the hypervisors in this Zone</para></listitem>
+        <listitem>
+            <para>The UUID of the Gateway Service used to provide router and NAT services.</para>
+        </listitem>
+    </itemizedlist>
+    <note><para>The gateway service uuid is optional and is used for Layer 3 services only (SourceNat, StaticNat and PortForwarding)</para></note>
+</section>


Mime
View raw message