You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/10/02 16:37:51 UTC
git commit: moving midonet to its own directory
Updated Branches:
refs/heads/4.2 b23872a59 -> 08f7e6bf6
moving midonet to its 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/08f7e6bf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/08f7e6bf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/08f7e6bf
Branch: refs/heads/4.2
Commit: 08f7e6bf629e09605b258712bca79f7b1a222921
Parents: b23872a
Author: David Nalley <da...@gnsa.us>
Authored: Wed Oct 2 10:37:33 2013 -0400
Committer: David Nalley <da...@gnsa.us>
Committed: Wed Oct 2 10:37:33 2013 -0400
----------------------------------------------------------------------
en-US/MidoNet_Plugin_Guide.ent | 22 ------
en-US/MidoNet_Plugin_Guide.xml | 52 -------------
en-US/plugin-midonet-about.xml | 27 -------
en-US/plugin-midonet-features.xml | 57 --------------
en-US/plugin-midonet-introduction.xml | 26 -------
en-US/plugin-midonet-preparations.xml | 90 ----------------------
en-US/plugin-midonet-provider.xml | 39 ----------
en-US/plugin-midonet-revisions.xml | 45 -----------
en-US/plugin-midonet-ui.xml | 65 ----------------
en-US/plugin-midonet-usage.xml | 29 -------
midonet/en-US/Author_Group.xml | 32 ++++++++
midonet/en-US/Book_Info.xml | 47 +++++++++++
midonet/en-US/MidoNet_Plugin_Guide.ent | 22 ++++++
midonet/en-US/MidoNet_Plugin_Guide.xml | 52 +++++++++++++
midonet/en-US/plugin-midonet-about.xml | 27 +++++++
midonet/en-US/plugin-midonet-features.xml | 57 ++++++++++++++
midonet/en-US/plugin-midonet-introduction.xml | 26 +++++++
midonet/en-US/plugin-midonet-preparations.xml | 90 ++++++++++++++++++++++
midonet/en-US/plugin-midonet-provider.xml | 39 ++++++++++
midonet/en-US/plugin-midonet-revisions.xml | 45 +++++++++++
midonet/en-US/plugin-midonet-ui.xml | 65 ++++++++++++++++
midonet/en-US/plugin-midonet-usage.xml | 29 +++++++
midonet/publican.cfg | 28 +++++++
publican-plugin-midonet.cfg | 28 -------
24 files changed, 559 insertions(+), 480 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/en-US/MidoNet_Plugin_Guide.ent
----------------------------------------------------------------------
diff --git a/en-US/MidoNet_Plugin_Guide.ent b/en-US/MidoNet_Plugin_Guide.ent
deleted file mode 100644
index f31c407..0000000
--- a/en-US/MidoNet_Plugin_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 "2013">
-<!ENTITY HOLDER "Apache Software Foundation">
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/en-US/MidoNet_Plugin_Guide.xml
----------------------------------------------------------------------
diff --git a/en-US/MidoNet_Plugin_Guide.xml b/en-US/MidoNet_Plugin_Guide.xml
deleted file mode 100644
index 86182e6..0000000
--- a/en-US/MidoNet_Plugin_Guide.xml
+++ /dev/null
@@ -1,52 +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="midonet_plugin">
- <title>&PRODUCT; Plugin Guide for the MidoNet Plugin</title>
- <productname>Apache CloudStack</productname>
- <productnumber>4.2.0</productnumber>
- <edition>1</edition>
- <pubsnumber></pubsnumber>
- <abstract>
- <para>
- Plugin Guide for the MidoNet 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-midonet-about.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="plugin-midonet-usage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="plugin-midonet-revisions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/en-US/plugin-midonet-about.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-midonet-about.xml b/en-US/plugin-midonet-about.xml
deleted file mode 100644
index dd9b3ad..0000000
--- a/en-US/plugin-midonet-about.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<chapter id="About-the-MidoNet-Plugin" >
- <title>The MidoNet Plugin</title>
- <xi:include href="plugin-midonet-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="plugin-midonet-features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</chapter>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/en-US/plugin-midonet-features.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-midonet-features.xml b/en-US/plugin-midonet-features.xml
deleted file mode 100644
index f242d63..0000000
--- a/en-US/plugin-midonet-features.xml
+++ /dev/null
@@ -1,57 +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-MidoNet-Plugin">
- <title>Features of the MidoNet Plugin</title>
-
- <note>
- <para>
- In &PRODUCT; 4.2.0 only the KVM hypervisor is supported for use in combination with MidoNet.
- </para>
- </note>
-
- <para>In &PRODUCT; release 4.2.0 this plugin supports several services in the Advanced Isolated network mode.
- </para>
-
- <para>
- When tenants create new isolated layer 3 networks, instead of spinning up extra Virtual Router VMs, the relevant L3 elements (routers etc) are created in the MidoNet virtual topology by making the appropriate calls to the MidoNet API. Instead of using VLANs, isolation is provided by MidoNet.
- </para>
-
- <para>
- Aside from the above service (Connectivity), several extra features are supported in the 4.2.0 release:
- </para>
-
- <itemizedlist>
- <listitem><para>DHCP</para></listitem>
- <listitem><para>Firewall (ingress)</para></listitem>
- <listitem><para>Source NAT</para></listitem>
- <listitem><para>Static NAT</para></listitem>
- <listitem><para>Port Forwarding</para></listitem>
- </itemizedlist>
-
- <para>
- The plugin has been tested with MidoNet version 12.12. (Caddo).
- </para>
-
-
-
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/en-US/plugin-midonet-introduction.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-midonet-introduction.xml b/en-US/plugin-midonet-introduction.xml
deleted file mode 100644
index 7793ecb..0000000
--- a/en-US/plugin-midonet-introduction.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="Introduction-to-the-MidoNet-Plugin">
- <title>Introduction to the MidoNet Plugin</title>
- <para>The MidoNet plugin allows &PRODUCT; to use the MidoNet virtualized networking solution as a provider for &PRODUCT; networks and services. For more information on MidoNet and how it works, see <ulink url="http://www.midokura.com/midonet/">http://www.midokura.com/midonet/</ulink>.</para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/en-US/plugin-midonet-preparations.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-midonet-preparations.xml b/en-US/plugin-midonet-preparations.xml
deleted file mode 100644
index cf78774..0000000
--- a/en-US/plugin-midonet-preparations.xml
+++ /dev/null
@@ -1,90 +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>In order to use the MidoNet plugin, the compute hosts must be running the MidoNet Agent, and the MidoNet API server must be available. Please consult the MidoNet User Guide for more information. The following section describes the &PRODUCT; side setup.</para>
-
- <orderedlist>
- <listitem>
- <para>&PRODUCT; needs to have at least one physical network with the isolation method set to "MIDO". This network should be enabled for the Guest and Public traffic types.</para>
- </listitem>
-
-<listitem>
- <para>Next, we need to set the following &PRODUCT; settings under "Global Settings" in the UI:</para>
-
-<table frame='all'><title>&PRODUCT; settings</title>
-<tgroup cols='3' align='left' colsep='1' rowsep='1'>
-<thead>
-<row>
- <entry>Setting Name</entry>
- <entry>Description</entry>
- <entry>Example</entry>
-</row>
-</thead>
-<tbody>
-<row>
- <entry>midonet.apiserver.address</entry>
- <entry>Specify the address at which the Midonet API server can be contacted</entry>
- <entry>http://192.168.1.144:8081/midolmanj-mgmt</entry>
-</row>
-<row>
- <entry>midonet.providerrouter.id</entry>
- <entry>Specifies the UUID of the Midonet provider router</entry>
- <entry>d7c5e6a3-e2f4-426b-b728-b7ce6a0448e5</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-</listitem>
-
-<listitem>
- <para>
- We also want MidoNet to take care of public traffic, so in <emphasis>componentContext.xml</emphasis> we need to replace this line:
-
- <programlisting><![CDATA[<bean id="PublicNetworkGuru" class="com.cloud.network.guru.PublicNetworkGuru">]]>
- </programlisting>
-
- With this:
-
- <programlisting><![CDATA[<bean id="PublicNetworkGuru" class="com.cloud.network.guru.MidoNetPublicNetworkGuru">]]>
- </programlisting>
-</para>
-</listitem>
-</orderedlist>
-
- <note>
- <para>
- On the compute host, MidoNet takes advantage of per-traffic type VIF driver support in &PRODUCT; KVM.
- </para>
- <para>
- In agent.properties, we set the following to make MidoNet take care of Guest and Public traffic:
-
-<programlisting>libvirt.vif.driver.Guest=com.cloud.network.resource.MidoNetVifDriver
-libvirt.vif.driver.Public=com.cloud.network.resource.MidoNetVifDriver</programlisting>
-
- This is explained further in MidoNet User Guide.
- </para>
- </note>
-
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/en-US/plugin-midonet-provider.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-midonet-provider.xml b/en-US/plugin-midonet-provider.xml
deleted file mode 100644
index 904828c..0000000
--- a/en-US/plugin-midonet-provider.xml
+++ /dev/null
@@ -1,39 +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 MidoNet service provider via the API</title>
- <para>
- To enable via the API, use the following API calls:</para>
- <para><emphasis>addNetworkServiceProvider</emphasis></para>
- <itemizedlist>
- <listitem><para>name = "MidoNet"</para></listitem>
- <listitem><para>physicalnetworkid = <the uuid of the physical network></para></listitem>
- </itemizedlist>
- <para><emphasis>updateNetworkServiceProvider</emphasis></para>
- <itemizedlist>
- <listitem><para>id = <the provider uuid returned by the previous call></para></listitem>
- <listitem><para>state = "Enabled"</para></listitem>
- </itemizedlist>
-
-
-</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/en-US/plugin-midonet-revisions.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-midonet-revisions.xml b/en-US/plugin-midonet-revisions.xml
deleted file mode 100644
index 73def23..0000000
--- a/en-US/plugin-midonet-revisions.xml
+++ /dev/null
@@ -1,45 +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 Mar 13 2013</date>
- <author>
- <firstname>Dave</firstname>
- <surname>Cahill</surname>
- <email>dcahill@midokura.com</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Documentation created for 4.2.0 version of the MidoNet Plugin</member>
- </simplelist>
- </revdescription>
- </revision>
- </revhistory>
- </simpara>
-</appendix>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/en-US/plugin-midonet-ui.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-midonet-ui.xml b/en-US/plugin-midonet-ui.xml
deleted file mode 100644
index 8ee9850..0000000
--- a/en-US/plugin-midonet-ui.xml
+++ /dev/null
@@ -1,65 +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-midonet-ui">
- <title>Enabling the MidoNet service provider via the UI</title>
- <para>To allow &PRODUCT; to use the MidoNet Plugin the network service provider needs to be enabled on the physical network.
- </para>
-
- <para>
- The steps to enable via the UI are as follows:
- <orderedlist>
- <listitem><para>
- In the left navbar, click Infrastructure
- </para></listitem>
-
- <listitem><para>
- In Zones, click View All
- </para></listitem>
-
- <listitem><para>
- Click the name of the Zone on which you are setting up MidoNet
- </para></listitem>
-
- <listitem><para>
- Click the Physical Network tab
- </para></listitem>
-
- <listitem><para>
- Click the Name of the Network on which you are setting up MidoNet
- </para></listitem>
-
- <listitem><para>
- Click Configure on the Network Service Providers box
- </para></listitem>
-
- <listitem><para>
- Click on the name MidoNet
- </para></listitem>
-
- <listitem><para>
- Click the Enable Provider button in the Network tab
- </para></listitem>
-
- </orderedlist>
- </para>
-</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/en-US/plugin-midonet-usage.xml
----------------------------------------------------------------------
diff --git a/en-US/plugin-midonet-usage.xml b/en-US/plugin-midonet-usage.xml
deleted file mode 100644
index a314581..0000000
--- a/en-US/plugin-midonet-usage.xml
+++ /dev/null
@@ -1,29 +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-MidoNet-Plugin" >
- <title>Using the MidoNet Plugin</title>
-
- <xi:include href="plugin-midonet-preparations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="plugin-midonet-ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
- <xi:include href="plugin-midonet-provider.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-</chapter>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/en-US/Author_Group.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/Author_Group.xml b/midonet/en-US/Author_Group.xml
new file mode 100644
index 0000000..ba9e651
--- /dev/null
+++ b/midonet/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/08f7e6bf/midonet/en-US/Book_Info.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/Book_Info.xml b/midonet/en-US/Book_Info.xml
new file mode 100644
index 0000000..327668d
--- /dev/null
+++ b/midonet/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/08f7e6bf/midonet/en-US/MidoNet_Plugin_Guide.ent
----------------------------------------------------------------------
diff --git a/midonet/en-US/MidoNet_Plugin_Guide.ent b/midonet/en-US/MidoNet_Plugin_Guide.ent
new file mode 100644
index 0000000..f31c407
--- /dev/null
+++ b/midonet/en-US/MidoNet_Plugin_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 "2013">
+<!ENTITY HOLDER "Apache Software Foundation">
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/en-US/MidoNet_Plugin_Guide.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/MidoNet_Plugin_Guide.xml b/midonet/en-US/MidoNet_Plugin_Guide.xml
new file mode 100644
index 0000000..86182e6
--- /dev/null
+++ b/midonet/en-US/MidoNet_Plugin_Guide.xml
@@ -0,0 +1,52 @@
+<?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="midonet_plugin">
+ <title>&PRODUCT; Plugin Guide for the MidoNet Plugin</title>
+ <productname>Apache CloudStack</productname>
+ <productnumber>4.2.0</productnumber>
+ <edition>1</edition>
+ <pubsnumber></pubsnumber>
+ <abstract>
+ <para>
+ Plugin Guide for the MidoNet 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-midonet-about.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="plugin-midonet-usage.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="plugin-midonet-revisions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/en-US/plugin-midonet-about.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/plugin-midonet-about.xml b/midonet/en-US/plugin-midonet-about.xml
new file mode 100644
index 0000000..dd9b3ad
--- /dev/null
+++ b/midonet/en-US/plugin-midonet-about.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+<chapter id="About-the-MidoNet-Plugin" >
+ <title>The MidoNet Plugin</title>
+ <xi:include href="plugin-midonet-introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="plugin-midonet-features.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</chapter>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/en-US/plugin-midonet-features.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/plugin-midonet-features.xml b/midonet/en-US/plugin-midonet-features.xml
new file mode 100644
index 0000000..f242d63
--- /dev/null
+++ b/midonet/en-US/plugin-midonet-features.xml
@@ -0,0 +1,57 @@
+<?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-MidoNet-Plugin">
+ <title>Features of the MidoNet Plugin</title>
+
+ <note>
+ <para>
+ In &PRODUCT; 4.2.0 only the KVM hypervisor is supported for use in combination with MidoNet.
+ </para>
+ </note>
+
+ <para>In &PRODUCT; release 4.2.0 this plugin supports several services in the Advanced Isolated network mode.
+ </para>
+
+ <para>
+ When tenants create new isolated layer 3 networks, instead of spinning up extra Virtual Router VMs, the relevant L3 elements (routers etc) are created in the MidoNet virtual topology by making the appropriate calls to the MidoNet API. Instead of using VLANs, isolation is provided by MidoNet.
+ </para>
+
+ <para>
+ Aside from the above service (Connectivity), several extra features are supported in the 4.2.0 release:
+ </para>
+
+ <itemizedlist>
+ <listitem><para>DHCP</para></listitem>
+ <listitem><para>Firewall (ingress)</para></listitem>
+ <listitem><para>Source NAT</para></listitem>
+ <listitem><para>Static NAT</para></listitem>
+ <listitem><para>Port Forwarding</para></listitem>
+ </itemizedlist>
+
+ <para>
+ The plugin has been tested with MidoNet version 12.12. (Caddo).
+ </para>
+
+
+
+</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/en-US/plugin-midonet-introduction.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/plugin-midonet-introduction.xml b/midonet/en-US/plugin-midonet-introduction.xml
new file mode 100644
index 0000000..7793ecb
--- /dev/null
+++ b/midonet/en-US/plugin-midonet-introduction.xml
@@ -0,0 +1,26 @@
+<?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-MidoNet-Plugin">
+ <title>Introduction to the MidoNet Plugin</title>
+ <para>The MidoNet plugin allows &PRODUCT; to use the MidoNet virtualized networking solution as a provider for &PRODUCT; networks and services. For more information on MidoNet and how it works, see <ulink url="http://www.midokura.com/midonet/">http://www.midokura.com/midonet/</ulink>.</para>
+</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/en-US/plugin-midonet-preparations.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/plugin-midonet-preparations.xml b/midonet/en-US/plugin-midonet-preparations.xml
new file mode 100644
index 0000000..cf78774
--- /dev/null
+++ b/midonet/en-US/plugin-midonet-preparations.xml
@@ -0,0 +1,90 @@
+<?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>In order to use the MidoNet plugin, the compute hosts must be running the MidoNet Agent, and the MidoNet API server must be available. Please consult the MidoNet User Guide for more information. The following section describes the &PRODUCT; side setup.</para>
+
+ <orderedlist>
+ <listitem>
+ <para>&PRODUCT; needs to have at least one physical network with the isolation method set to "MIDO". This network should be enabled for the Guest and Public traffic types.</para>
+ </listitem>
+
+<listitem>
+ <para>Next, we need to set the following &PRODUCT; settings under "Global Settings" in the UI:</para>
+
+<table frame='all'><title>&PRODUCT; settings</title>
+<tgroup cols='3' align='left' colsep='1' rowsep='1'>
+<thead>
+<row>
+ <entry>Setting Name</entry>
+ <entry>Description</entry>
+ <entry>Example</entry>
+</row>
+</thead>
+<tbody>
+<row>
+ <entry>midonet.apiserver.address</entry>
+ <entry>Specify the address at which the Midonet API server can be contacted</entry>
+ <entry>http://192.168.1.144:8081/midolmanj-mgmt</entry>
+</row>
+<row>
+ <entry>midonet.providerrouter.id</entry>
+ <entry>Specifies the UUID of the Midonet provider router</entry>
+ <entry>d7c5e6a3-e2f4-426b-b728-b7ce6a0448e5</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</listitem>
+
+<listitem>
+ <para>
+ We also want MidoNet to take care of public traffic, so in <emphasis>componentContext.xml</emphasis> we need to replace this line:
+
+ <programlisting><![CDATA[<bean id="PublicNetworkGuru" class="com.cloud.network.guru.PublicNetworkGuru">]]>
+ </programlisting>
+
+ With this:
+
+ <programlisting><![CDATA[<bean id="PublicNetworkGuru" class="com.cloud.network.guru.MidoNetPublicNetworkGuru">]]>
+ </programlisting>
+</para>
+</listitem>
+</orderedlist>
+
+ <note>
+ <para>
+ On the compute host, MidoNet takes advantage of per-traffic type VIF driver support in &PRODUCT; KVM.
+ </para>
+ <para>
+ In agent.properties, we set the following to make MidoNet take care of Guest and Public traffic:
+
+<programlisting>libvirt.vif.driver.Guest=com.cloud.network.resource.MidoNetVifDriver
+libvirt.vif.driver.Public=com.cloud.network.resource.MidoNetVifDriver</programlisting>
+
+ This is explained further in MidoNet User Guide.
+ </para>
+ </note>
+
+</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/en-US/plugin-midonet-provider.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/plugin-midonet-provider.xml b/midonet/en-US/plugin-midonet-provider.xml
new file mode 100644
index 0000000..904828c
--- /dev/null
+++ b/midonet/en-US/plugin-midonet-provider.xml
@@ -0,0 +1,39 @@
+<?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 MidoNet service provider via the API</title>
+ <para>
+ To enable via the API, use the following API calls:</para>
+ <para><emphasis>addNetworkServiceProvider</emphasis></para>
+ <itemizedlist>
+ <listitem><para>name = "MidoNet"</para></listitem>
+ <listitem><para>physicalnetworkid = <the uuid of the physical network></para></listitem>
+ </itemizedlist>
+ <para><emphasis>updateNetworkServiceProvider</emphasis></para>
+ <itemizedlist>
+ <listitem><para>id = <the provider uuid returned by the previous call></para></listitem>
+ <listitem><para>state = "Enabled"</para></listitem>
+ </itemizedlist>
+
+
+</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/en-US/plugin-midonet-revisions.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/plugin-midonet-revisions.xml b/midonet/en-US/plugin-midonet-revisions.xml
new file mode 100644
index 0000000..73def23
--- /dev/null
+++ b/midonet/en-US/plugin-midonet-revisions.xml
@@ -0,0 +1,45 @@
+<?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 Mar 13 2013</date>
+ <author>
+ <firstname>Dave</firstname>
+ <surname>Cahill</surname>
+ <email>dcahill@midokura.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Documentation created for 4.2.0 version of the MidoNet Plugin</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ </revhistory>
+ </simpara>
+</appendix>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/en-US/plugin-midonet-ui.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/plugin-midonet-ui.xml b/midonet/en-US/plugin-midonet-ui.xml
new file mode 100644
index 0000000..8ee9850
--- /dev/null
+++ b/midonet/en-US/plugin-midonet-ui.xml
@@ -0,0 +1,65 @@
+<?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-midonet-ui">
+ <title>Enabling the MidoNet service provider via the UI</title>
+ <para>To allow &PRODUCT; to use the MidoNet Plugin the network service provider needs to be enabled on the physical network.
+ </para>
+
+ <para>
+ The steps to enable via the UI are as follows:
+ <orderedlist>
+ <listitem><para>
+ In the left navbar, click Infrastructure
+ </para></listitem>
+
+ <listitem><para>
+ In Zones, click View All
+ </para></listitem>
+
+ <listitem><para>
+ Click the name of the Zone on which you are setting up MidoNet
+ </para></listitem>
+
+ <listitem><para>
+ Click the Physical Network tab
+ </para></listitem>
+
+ <listitem><para>
+ Click the Name of the Network on which you are setting up MidoNet
+ </para></listitem>
+
+ <listitem><para>
+ Click Configure on the Network Service Providers box
+ </para></listitem>
+
+ <listitem><para>
+ Click on the name MidoNet
+ </para></listitem>
+
+ <listitem><para>
+ Click the Enable Provider button in the Network tab
+ </para></listitem>
+
+ </orderedlist>
+ </para>
+</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/en-US/plugin-midonet-usage.xml
----------------------------------------------------------------------
diff --git a/midonet/en-US/plugin-midonet-usage.xml b/midonet/en-US/plugin-midonet-usage.xml
new file mode 100644
index 0000000..a314581
--- /dev/null
+++ b/midonet/en-US/plugin-midonet-usage.xml
@@ -0,0 +1,29 @@
+<?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-MidoNet-Plugin" >
+ <title>Using the MidoNet Plugin</title>
+
+ <xi:include href="plugin-midonet-preparations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="plugin-midonet-ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="plugin-midonet-provider.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</chapter>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/midonet/publican.cfg
----------------------------------------------------------------------
diff --git a/midonet/publican.cfg b/midonet/publican.cfg
new file mode 100644
index 0000000..6558d99
--- /dev/null
+++ b/midonet/publican.cfg
@@ -0,0 +1,28 @@
+# Publican configuration file for CloudStack Complete Documentation Set
+# Contains all technical docs except release notes
+# Config::Simple 4.58
+# Tue May 29 00:57:27 2012
+#
+# 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.
+
+xml_lang: en-US
+type: Book
+docname: MidoNet_Plugin_Guide
+brand: cloudstack
+chunk_first: 1
+chunk_section_depth: 1
+condition: install
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/08f7e6bf/publican-plugin-midonet.cfg
----------------------------------------------------------------------
diff --git a/publican-plugin-midonet.cfg b/publican-plugin-midonet.cfg
deleted file mode 100644
index 6558d99..0000000
--- a/publican-plugin-midonet.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-# Publican configuration file for CloudStack Complete Documentation Set
-# Contains all technical docs except release notes
-# Config::Simple 4.58
-# Tue May 29 00:57:27 2012
-#
-# 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.
-
-xml_lang: en-US
-type: Book
-docname: MidoNet_Plugin_Guide
-brand: cloudstack
-chunk_first: 1
-chunk_section_depth: 1
-condition: install