incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [2/52] [partial] CLOUDSTACK-961: Added dependencies for building RPMs.
Date Fri, 11 Jan 2013 21:02:59 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/advanced-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/advanced-zone-configuration.xml b/docs/tmp/en-US/xml_tmp/advanced-zone-configuration.xml
new file mode 100644
index 0000000..03a082f
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/advanced-zone-configuration.xml
@@ -0,0 +1,376 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<section id="advanced-zone-configuration">
+  <title>Advanced Zone Configuration</title>
+  <orderedlist>
+    <listitem>
+      <para>After you select Advanced in the Add Zone wizard and click Next, you will be asked to
+        enter the following details. Then click Next.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name.</emphasis> A name for the zone.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">DNS 1 and 2.</emphasis> These are DNS servers for use by guest
+            VMs in the zone. These DNS servers will be accessed via the public network you will add
+            later. The public IP addresses for the zone must have a route to the DNS server named
+            here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Internal DNS 1 and Internal DNS 2.</emphasis> These are DNS
+            servers for use by system VMs in the zone(these are VMs used by &PRODUCT; itself, such
+            as virtual routers, console proxies,and Secondary Storage VMs.) These DNS servers will
+            be accessed via the management traffic network interface of the System VMs. The private
+            IP address you provide for the pods must have a route to the internal DNS server named
+            here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Network Domain.</emphasis> (Optional) If you want to assign a
+            special domain name to the guest VM network, specify the DNS suffix.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Guest CIDR.</emphasis> This is the CIDR that describes the IP
+            addresses in use in the guest virtual networks in this zone. For example, 10.1.1.0/24.
+            As a matter of good practice you should set different CIDRs for different zones. This
+            will make it easier to set up VPNs between networks in different zones.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Hypervisor.</emphasis> (Introduced in version 3.0.1) Choose
+            the hypervisor for the first cluster in the zone. You can add clusters with different
+            hypervisors later, after you finish adding the zone.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Public.</emphasis> A public zone is available to all users. A
+            zone that is not public will be assigned to a particular domain. Only users in that
+            domain will be allowed to create guest VMs in this zone.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Choose which traffic types will be carried by the physical network.</para>
+      <para>The traffic types are management, public, guest, and storage traffic. For more
+        information about the types, roll over the icons to display their tool tips, or see <xref
+          linkend="advanced-zone-network-traffic-types"/>. This screen starts out with one network
+        already configured. If you have multiple physical networks, you need to add more. Drag and
+        drop traffic types onto a greyed-out network and it will become active. You can move the
+        traffic icons from one network to another; for example, if the default traffic types shown
+        for Network 1 do not match your actual setup, you can move them down. You can also change
+        the network names if desired.</para>
+    </listitem>
+    <listitem>
+      <para>(Introduced in version 3.0.1) Assign a network traffic label to each traffic type on
+        each physical network. These labels must match the labels you have already defined on the
+        hypervisor host. To assign each label, click the Edit button under the traffic type icon
+        within each physical network. A popup dialog appears where you can type the label, then
+        click OK.</para>
+      <para>These traffic labels will be defined only for the hypervisor selected for the first
+        cluster. For all other hypervisors, the labels can be configured after the zone is
+        created.</para>
+    </listitem>
+    <listitem>
+      <para>Click Next.</para>
+    </listitem>
+    <listitem>
+      <para>Configure the IP range for public Internet traffic. Enter the following details, then
+        click Add. If desired, you can repeat this step to add more public Internet IP ranges. When
+        done, click Next.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Gateway.</emphasis> The gateway in use for these IP
+            addresses.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Netmask.</emphasis> The netmask associated with this IP
+            range.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">VLAN.</emphasis> The VLAN that will be used for public
+            traffic.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Start IP/End IP.</emphasis> A range of IP addresses that are
+            assumed to be accessible from the Internet and will be allocated for access to guest
+            networks.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new zone, &PRODUCT; adds the first pod for you. You can always add more pods later.
+        For an overview of what a pod is, see <xref linkend="about-pods"/>.</para>
+      <para>To configure the first pod, enter the following, then click Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Pod Name.</emphasis> A name for the pod.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Reserved system gateway.</emphasis> The gateway for the hosts
+            in that pod.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Reserved system netmask.</emphasis> The network prefix that
+            defines the pod's subnet. Use CIDR notation.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Start/End Reserved System IP.</emphasis> The IP range in the
+            management network that &PRODUCT; uses to manage various system VMs, such as Secondary
+            Storage VMs, Console Proxy VMs, and DHCP. For more information, see <xref
+              linkend="system-reserved-ip-addresses"/>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Specify a range of VLAN IDs to carry guest traffic for each physical network (see VLAN
+        Allocation Example ), then click Next.</para>
+    </listitem>
+    <listitem>
+      <para>In a new pod, &PRODUCT; adds the first cluster for you. You can always add more clusters
+        later. For an overview of what a cluster is, see <xref linkend="about-clusters"/>.</para>
+      <para>To configure the first cluster, enter the following, then click Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Hypervisor.</emphasis> (Version 3.0.0 only; in 3.0.1, this
+            field is read only) Choose the type of hypervisor software that all hosts in this
+            cluster will run. If you choose VMware, additional fields appear so you can give
+            information about a vSphere cluster. For vSphere servers, we recommend creating the
+            cluster of hosts in vCenter and then adding the entire cluster to &PRODUCT;. See Add
+            Cluster: vSphere .</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Cluster name.</emphasis> Enter a name for the cluster. This
+            can be text of your choosing and is not used by &PRODUCT;.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new cluster, &PRODUCT; adds the first host for you. You can always add more hosts
+        later. For an overview of what a host is, see <xref linkend="about-hosts"/>.</para>
+      <note>
+        <para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already
+          running.</para>
+      </note>
+      <para>Before you can configure the host, you need to install the hypervisor software on the
+        host. You will need to know which version of the hypervisor software version is supported by
+        &PRODUCT; and what additional configuration is required to ensure the host will work with
+        &PRODUCT;. To find these installation details, see:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Citrix XenServer Installation for &PRODUCT;</para>
+        </listitem>
+        <listitem>
+          <para>VMware vSphere Installation and Configuration</para>
+        </listitem>
+        <listitem>
+          <para>KVM Installation and Configuration</para>
+        </listitem>
+        <!-- <listitem>
+          <para>Oracle VM (OVM) Installation and Configuration</para>
+      </listitem> -->
+      </itemizedlist>
+      <para>To configure the first host, enter the following, then click Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Host Name.</emphasis> The DNS name or IP address of the
+            host.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Username.</emphasis> Usually root.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password.</emphasis> This is the password for the user named
+            above (from your XenServer or KVM install).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Host Tags.</emphasis> (Optional) Any labels that you use to
+            categorize hosts for ease of maintenance. For example, you can set to the cloud's HA tag
+            (set in the ha.tag global configuration parameter) if you want this host to be used only
+            for VMs with the "high availability" feature enabled. For more information, see
+            HA-Enabled Virtual Machines as well as HA for Hosts, both in the Administration
+            Guide.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new cluster, &PRODUCT; adds the first primary storage server for you. You can
+        always add more servers later. For an overview of what primary storage is, see <xref
+          linkend="about-primary-storage"/>.</para>
+      <para>To configure the first primary storage server, enter the following, then click
+        Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name.</emphasis> The name of the storage device.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Protocol.</emphasis> For XenServer, choose either NFS, iSCSI,
+            or PreSetup. For KVM, choose NFS, SharedMountPoint, CLVM, and RBD. For vSphere choose either VMFS
+            (iSCSI or FiberChannel) or NFS. The remaining fields in the screen vary depending on
+            what you choose here.</para>
+          <informaltable frame="all">
+            <tgroup cols="2" align="left" colsep="1" rowsep="1">
+              <colspec colname="c1"/>
+              <colspec colname="c2"/>
+              <tbody>
+                <row>
+                  <entry><para>NFS</para></entry>
+                  <entry>
+                    <itemizedlist>
+                      <listitem>
+                        <para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of
+                          the storage device.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Path.</emphasis> The exported path from the
+                          server.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated
+                          list of tags for this storage device. It should be an equivalent set or
+                          superset of the tags on your disk offerings.</para>
+                      </listitem>
+                    </itemizedlist>
+                    <para>The tag sets on primary storage across clusters in a Zone must be
+                      identical. For example, if cluster A provides primary storage that has tags T1
+                      and T2, all other clusters in the Zone must also provide primary storage that
+                      has tags T1 and T2.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry><para>iSCSI</para></entry>
+                  <entry>
+                    <itemizedlist>
+                      <listitem>
+                        <para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of
+                          the storage device.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Target IQN.</emphasis> The IQN of the target.
+                          For example, iqn.1986-03.com.sun:02:01ec9bb549-1271378984.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Lun.</emphasis> The LUN number. For example,
+                          3.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated
+                          list of tags for this storage device. It should be an equivalent set or
+                          superset of the tags on your disk offerings.</para>
+                      </listitem>
+                    </itemizedlist>
+                    <para>The tag sets on primary storage across clusters in a Zone must be
+                      identical. For example, if cluster A provides primary storage that has tags T1
+                      and T2, all other clusters in the Zone must also provide primary storage that
+                      has tags T1 and T2.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry><para>preSetup</para></entry>
+                  <entry>
+                    <itemizedlist>
+                      <listitem>
+                        <para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of
+                          the storage device.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">SR Name-Label.</emphasis> Enter the name-label
+                          of the SR that has been set up outside &PRODUCT;.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated
+                          list of tags for this storage device. It should be an equivalent set or
+                          superset of the tags on your disk offerings.</para>
+                      </listitem>
+                    </itemizedlist>
+                    <para>The tag sets on primary storage across clusters in a Zone must be
+                      identical. For example, if cluster A provides primary storage that has tags T1
+                      and T2, all other clusters in the Zone must also provide primary storage that
+                      has tags T1 and T2.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry><para>SharedMountPoint</para></entry>
+                  <entry>
+                    <itemizedlist>
+                      <listitem>
+                        <para><emphasis role="bold">Path.</emphasis> The path on each host that is
+                          where this primary storage is mounted. For example, "/mnt/primary".</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated
+                          list of tags for this storage device. It should be an equivalent set or
+                          superset of the tags on your disk offerings.</para>
+                      </listitem>
+                    </itemizedlist>
+                    <para>The tag sets on primary storage across clusters in a Zone must be
+                      identical. For example, if cluster A provides primary storage that has tags T1
+                      and T2, all other clusters in the Zone must also provide primary storage that
+                      has tags T1 and T2.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry><para>VMFS</para></entry>
+                  <entry>
+                    <itemizedlist>
+                      <listitem>
+                        <para><emphasis role="bold">Server.</emphasis> The IP address or DNS name of
+                          the vCenter server.</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Path.</emphasis> A combination of the datacenter
+                          name and the datastore name. The format is "/" datacenter name "/"
+                          datastore name. For example, "/cloud.dc.VM/cluster1datastore".</para>
+                      </listitem>
+                      <listitem>
+                        <para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated
+                          list of tags for this storage device. It should be an equivalent set or
+                          superset of the tags on your disk offerings.</para>
+                      </listitem>
+                    </itemizedlist>
+                    <para>The tag sets on primary storage across clusters in a Zone must be
+                      identical. For example, if cluster A provides primary storage that has tags T1
+                      and T2, all other clusters in the Zone must also provide primary storage that
+                      has tags T1 and T2.</para>
+                  </entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new zone, &PRODUCT; adds the first secondary storage server for you. For an
+        overview of what secondary storage is, see <xref linkend="about-secondary-storage"/>.</para>
+      <para>Before you can fill out this screen, you need to prepare the secondary storage by
+        setting up NFS shares and installing the latest &PRODUCT; System VM template. See Adding
+        Secondary Storage :</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">NFS Server.</emphasis> The IP address of the server.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Path.</emphasis> The exported path from the server.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click Launch.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/advanced-zone-guest-ip-addresses.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/advanced-zone-guest-ip-addresses.xml b/docs/tmp/en-US/xml_tmp/advanced-zone-guest-ip-addresses.xml
new file mode 100644
index 0000000..b5d10a0
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/advanced-zone-guest-ip-addresses.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;
+]>
+
+<!-- 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="advanced-zone-guest-ip-addresses">
+    <title>Advanced Zone Guest IP Addresses</title>
+    <para>When advanced networking is used, the administrator can create additional networks for use by the guests.  These networks can span the zone and be available to all accounts, or they can be scoped to a single account, in which case only the named account may create guests that attach to these networks.  The networks are defined by a VLAN ID, IP range, and gateway.  The administrator may provision thousands of these networks if desired.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/advanced-zone-network-traffic-types.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/advanced-zone-network-traffic-types.xml b/docs/tmp/en-US/xml_tmp/advanced-zone-network-traffic-types.xml
new file mode 100644
index 0000000..9f475cf
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/advanced-zone-network-traffic-types.xml
@@ -0,0 +1,35 @@
+<?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;
+]>
+
+<!-- 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="advanced-zone-network-traffic-types">
+    <title>Advanced Zone Network Traffic Types</title>
+    <para>When advanced networking is used, there can be multiple physical networks in the zone. Each physical network can carry one or more traffic types, and  you need to let &PRODUCT; know which type of network traffic you want each network to carry. The traffic types in an advanced zone are:</para>
+    <itemizedlist>
+        <listitem><para>Guest. When end users run VMs, they generate guest traffic. The guest VMs communicate with each other over a network that can be referred to as the guest network. This network can be isolated or shared. In an isolated guest network, the administrator needs to reserve VLAN ranges to provide isolation for each &PRODUCT; account’s network (potentially a large number of VLANs). In a shared guest network, all guest VMs share a single network.</para></listitem>
+        <listitem><para>Management. When &PRODUCT;’s internal resources communicate with each other, they generate management traffic. This includes communication between hosts, system VMs (VMs used by &PRODUCT; to perform various tasks in the cloud), and any other component that communicates directly with the &PRODUCT; Management Server. You must configure the IP range for the system VMs to use.</para></listitem>
+        <listitem><para>Public. Public traffic is generated when VMs in the cloud access the Internet. Publicly accessible IPs must be allocated for this purpose. End users can use the &PRODUCT; UI to acquire these IPs to implement NAT between their guest network and the public network, as described in “Acquiring a New IP Address” in the Administration Guide.</para></listitem>
+        <listitem><para>Storage. Traffic such as VM templates and snapshots, which is sent between the secondary storage VM and secondary storage servers. &PRODUCT; uses a separate Network Interface Controller (NIC) named storage NIC for storage network traffic. Use of a storage NIC that always operates on a high bandwidth network allows fast template and snapshot copying. You must configure the IP range to use for the storage network.</para></listitem>
+    </itemizedlist>
+    <para>These traffic types can each be on a separate physical network, or they can be combined with certain restrictions. When you use the Add Zone wizard in the UI to create a new zone, you are guided into making only valid choices.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/advanced-zone-physical-network-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/advanced-zone-physical-network-configuration.xml b/docs/tmp/en-US/xml_tmp/advanced-zone-physical-network-configuration.xml
new file mode 100644
index 0000000..2c3d9b3
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/advanced-zone-physical-network-configuration.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;
+]>
+<!-- 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="advanced-zone-physical-network-configuration">
+  <title>Advanced Zone Physical Network Configuration</title>
+  <para>Within a zone that uses advanced networking, you need to tell the Management Server how the
+    physical network is set up to carry different kinds of traffic in isolation.</para>
+  <xi:include href="configure-guest-traffic-in-advanced-zone.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="configure-public-traffic-in-an-advanced-zone.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/advanced-zone-public-ip-addresses.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/advanced-zone-public-ip-addresses.xml b/docs/tmp/en-US/xml_tmp/advanced-zone-public-ip-addresses.xml
new file mode 100644
index 0000000..eeb9404
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/advanced-zone-public-ip-addresses.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;
+]>
+
+<!-- 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="advanced-zone-public-ip-addresses">
+    <title>Advanced Zone Public IP Addresses</title>
+    <para>When advanced networking is used, the administrator can create additional networks for use by the guests.  These networks can span the zone and be available to all accounts, or they can be scoped to a single account, in which case only the named account may create guests that attach to these networks.  The networks are defined by a VLAN ID, IP range, and gateway.  The administrator may provision thousands of these networks if desired.</para>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/alerts.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/alerts.xml b/docs/tmp/en-US/xml_tmp/alerts.xml
new file mode 100644
index 0000000..b7f34d0
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/alerts.xml
@@ -0,0 +1,53 @@
+<?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;
+]>
+<!-- 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="alerts">
+    <title>Alerts</title>
+        <para>The following is the list of alert type numbers. The current alerts can be found by calling listAlerts.</para>
+        <programlisting>MEMORY = 0</programlisting>
+        <programlisting>CPU = 1</programlisting>
+        <programlisting>STORAGE =2</programlisting>
+        <programlisting>STORAGE_ALLOCATED = 3</programlisting>
+        <programlisting>PUBLIC_IP = 4</programlisting>
+        <programlisting>PRIVATE_IP = 5</programlisting>
+        <programlisting>HOST = 6</programlisting>
+        <programlisting>USERVM = 7</programlisting>
+        <programlisting>DOMAIN_ROUTER = 8</programlisting>
+        <programlisting>CONSOLE_PROXY = 9</programlisting>
+        <programlisting>ROUTING = 10// lost connection to default route (to the gateway)</programlisting>
+        <programlisting>STORAGE_MISC = 11 // lost connection to default route (to the gateway)</programlisting>
+        <programlisting>USAGE_SERVER = 12 // lost connection to default route (to the gateway)</programlisting>
+        <programlisting>MANAGMENT_NODE = 13 // lost connection to default route (to the gateway)</programlisting>
+        <programlisting>DOMAIN_ROUTER_MIGRATE = 14</programlisting>
+        <programlisting>CONSOLE_PROXY_MIGRATE = 15</programlisting>
+        <programlisting>USERVM_MIGRATE = 16</programlisting>
+        <programlisting>VLAN = 17</programlisting>
+        <programlisting>SSVM = 18</programlisting>
+        <programlisting>USAGE_SERVER_RESULT = 19</programlisting>
+        <programlisting>STORAGE_DELETE = 20;</programlisting>
+        <programlisting>UPDATE_RESOURCE_COUNT = 21; //Generated when we fail to update the resource count</programlisting>
+        <programlisting>USAGE_SANITY_RESULT = 22;</programlisting>
+        <programlisting>DIRECT_ATTACHED_PUBLIC_IP = 23;</programlisting>
+        <programlisting>LOCAL_STORAGE = 24;</programlisting>
+        <programlisting>RESOURCE_LIMIT_EXCEEDED = 25; //Generated when the resource limit exceeds the limit. Currently used for recurring snapshots only</programlisting>
+</appendix>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/allocators.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/allocators.xml b/docs/tmp/en-US/xml_tmp/allocators.xml
new file mode 100644
index 0000000..d8ce2b8
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/allocators.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="allocators">
+    <title>Allocators</title>
+    <para>&PRODUCT; enables administrators to write custom allocators that will choose the Host to place a new guest and the storage host from which to allocate guest virtual disk images.</para>
+   </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/api-calls.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/api-calls.xml b/docs/tmp/en-US/xml_tmp/api-calls.xml
new file mode 100644
index 0000000..1fe6f02
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/api-calls.xml
@@ -0,0 +1,32 @@
+<?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;
+]>
+
+<!-- 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="api-calls">
+    <title>Calling the &PRODUCT; API</title>
+    <xi:include href="making-api-request.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="enabling-api-call-expiration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="signing-api-requests.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="responses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="asynchronous-commands.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/api-overview.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/api-overview.xml b/docs/tmp/en-US/xml_tmp/api-overview.xml
new file mode 100644
index 0000000..a541049
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/api-overview.xml
@@ -0,0 +1,38 @@
+<?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;
+]>
+<!-- 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="api-overview">
+  <title>&PRODUCT; API</title>
+  <para>The &PRODUCT; API is a low level API that has been used to implement the &PRODUCT; web UIs.
+    It is also a good basis for implementing other popular APIs such as EC2/S3 and emerging DMTF
+    standards.</para>
+  <para>Many &PRODUCT; API calls are asynchronous. These will return a Job ID immediately when
+    called. This Job ID can be used to query the status of the job later. Also, status calls on
+    impacted resources will provide some indication of their state.</para>
+  <para>The API has a REST-like query basis and returns results in XML or JSON.</para>
+  <para>See <ulink
+      url="http://docs.cloudstack.org/CloudStack_Documentation/Developer's_Guide%3A_CloudStack">the
+      Developer’s Guide</ulink> and <ulink
+      url="http://docs.cloudstack.org/CloudStack_Documentation/API_Reference%3A_CloudStack">the API
+      Reference</ulink>.</para>
+  <xi:include href="provisioning-auth-api.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="allocators.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="user-data-and-meta-data.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</chapter>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/api-reference.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/api-reference.xml b/docs/tmp/en-US/xml_tmp/api-reference.xml
new file mode 100644
index 0000000..cab3ada
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/api-reference.xml
@@ -0,0 +1,26 @@
+<!-- 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="api-reference">
+        <title>API Reference Documentation</title>
+        <para>2.2 API Reference:</para>
+        <para><ulink url="http://download.cloud.com/support/downloads.html/">http://download.cloud.com/support/downloads.html/</ulink></para>
+        <para>3.0 API Reference:</para>
+        <para><ulink url="http://download.cloud.com/releases/3.0.0/api_3.0.0/TOC_Root_Admin.html/">http://download.cloud.com/releases/3.0.0/api_3.0.0/TOC_Root_Admin.html/</ulink></para>
+    </section>
+

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/asynchronous-commands-example.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/asynchronous-commands-example.xml b/docs/tmp/en-US/xml_tmp/asynchronous-commands-example.xml
new file mode 100644
index 0000000..330f125
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/asynchronous-commands-example.xml
@@ -0,0 +1,106 @@
+<!-- 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="asynchronous-commands-example">
+    <title>Example</title>
+        <para>
+            The following shows an example of using an asynchronous command. Assume the API command:</para>
+        <programlisting>command=deployVirtualMachine&amp;zoneId=1&amp;serviceOfferingId=1&amp;diskOfferingId=1&amp;templateId=1
+        </programlisting>
+        <para>CloudStack will immediately return a job ID and any other additional data.</para>
+        <programlisting>
+         &lt;deployvirtualmachineresponse&gt; 
+              &lt;jobid&gt;1&lt;/jobid&gt;
+             &lt;id&gt;100&lt;/id&gt;
+         &lt;/deployvirtualmachineresponse&gt;
+        </programlisting>
+        <para>Using the job ID, you can periodically poll for the results by using the queryAsyncJobResult command.</para>
+        <programlisting>command=queryAsyncJobResult&amp;jobId=1</programlisting>
+        <para>Three possible results could come from this query.</para>
+        <para>Job is still pending:</para>
+        <programlisting>
+         &lt;queryasyncjobresult&gt; 
+              &lt;jobid&gt;1&lt;/jobid&gt;
+              &lt;jobstatus&gt;0&lt;/jobstatus&gt;
+              &lt;jobprocstatus&gt;1&lt;/jobprocstatus&gt;
+         &lt;/queryasyncjobresult&gt;
+        </programlisting>
+        <para>Job has succeeded:</para>
+        <programlisting>
+            &lt;queryasyncjobresultresponse cloud-stack-version="3.0.1.6"&gt;
+                  &lt;jobid&gt;1&lt;/jobid&gt;
+                  &lt;jobstatus&gt;1&lt;/jobstatus&gt;
+                  &lt;jobprocstatus&gt;0&lt;/jobprocstatus&gt;
+                 &lt;jobresultcode&gt;0&lt;/jobresultcode&gt;
+                  &lt;jobresulttype&gt;object&lt;/jobresulttype&gt;
+                  &lt;jobresult&gt;
+                    &lt;virtualmachine&gt;
+                    &lt;id&gt;450&lt;/id&gt;
+                    &lt;name&gt;i-2-450-VM&lt;/name&gt;
+                    &lt;displayname&gt;i-2-450-VM&lt;/displayname&gt;
+                    &lt;account&gt;admin&lt;/account&gt;
+                    &lt;domainid&gt;1&lt;/domainid&gt;
+                    &lt;domain&gt;ROOT&lt;/domain&gt;
+                    &lt;created&gt;2011-03-10T18:20:25-0800&lt;/created&gt;
+                    &lt;state&gt;Running&lt;/state&gt;
+                    &lt;haenable&gt;false&lt;/haenable&gt;
+                    &lt;zoneid&gt;1&lt;/zoneid&gt;
+                    &lt;zonename&gt;San Jose 1&lt;/zonename&gt;
+                    &lt;hostid&gt;2&lt;/hostid&gt;
+                    &lt;hostname&gt;905-13.sjc.lab.vmops.com&lt;/hostname&gt;
+                    &lt;templateid&gt;1&lt;/templateid&gt;
+                    &lt;templatename&gt;CentOS 5.3 64bit LAMP&lt;/templatename&gt;
+                    &lt;templatedisplaytext&gt;CentOS 5.3 64bit LAMP&lt;/templatedisplaytext&gt;
+                    &lt;passwordenabled&gt;false&lt;/passwordenabled&gt;
+                    &lt;serviceofferingid&gt;1&lt;/serviceofferingid&gt;
+                    &lt;serviceofferingname&gt;Small Instance&lt;/serviceofferingname&gt;
+                    &lt;cpunumber&gt;1&lt;/cpunumber&gt;
+                    &lt;cpuspeed&gt;500&lt;/cpuspeed&gt;
+                    &lt;memory&gt;512&lt;/memory&gt;
+                    &lt;guestosid&gt;12&lt;/guestosid&gt;
+                    &lt;rootdeviceid&gt;0&lt;/rootdeviceid&gt;
+                    &lt;rootdevicetype&gt;NetworkFilesystem&lt;/rootdevicetype&gt;
+                    &lt;nic&gt;
+                      &lt;id&gt;561&lt;/id&gt;
+                      &lt;networkid&gt;205&lt;/networkid&gt;
+                      &lt;netmask&gt;255.255.255.0&lt;/netmask&gt;
+                      &lt;gateway&gt;10.1.1.1&lt;/gateway&gt;
+                      &lt;ipaddress&gt;10.1.1.225&lt;/ipaddress&gt;
+                      &lt;isolationuri&gt;vlan://295&lt;/isolationuri&gt;
+                      &lt;broadcasturi&gt;vlan://295&lt;/broadcasturi&gt;
+                      &lt;traffictype&gt;Guest&lt;/traffictype&gt;
+                      &lt;type&gt;Virtual&lt;/type&gt;
+                      &lt;isdefault&gt;true&lt;/isdefault&gt;
+                    &lt;/nic&gt;
+                    &lt;hypervisor&gt;XenServer&lt;/hypervisor&gt;
+                   &lt;/virtualmachine&gt;
+                 &lt;/jobresult&gt;
+            &lt;/queryasyncjobresultresponse&gt;
+        </programlisting>
+        <para>Job has failed:</para>
+        <programlisting>
+            &lt;queryasyncjobresult&gt;
+                  &lt;jobid&gt;1&lt;/jobid&gt; 
+                  &lt;jobstatus&gt;2&lt;/jobstatus&gt; 
+                  &lt;jobprocstatus&gt;0&lt;/jobprocstatus&gt;
+                  &lt;jobresultcode&gt;551&lt;/jobresultcode&gt;
+                  &lt;jobresulttype&gt;text&lt;/jobresulttype&gt;
+                  &lt;jobresult&gt;Unable to deploy virtual machine id = 100 due to not enough capacity&lt;/jobresult&gt; 
+            &lt;/queryasyncjobresult&gt;
+        </programlisting>    
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/asynchronous-commands.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/asynchronous-commands.xml b/docs/tmp/en-US/xml_tmp/asynchronous-commands.xml
new file mode 100644
index 0000000..4c9b59c
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/asynchronous-commands.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="asynchronous-commands">
+        <title>Asynchronous Commands</title>
+    <para>Asynchronous commands were introduced in &PRODUCT; 2.x. Commands are designated as asynchronous when they can potentially take a long period of time to complete such as creating a snapshot or disk volume.  They differ from synchronous commands by the following:
+        </para>
+        <itemizedlist>
+            <listitem><para>They are identified in the API Reference by an (A).</para></listitem>
+            <listitem><para>They will immediately return a job ID to refer to the job that will be responsible in processing the command.</para></listitem>
+            <listitem><para>If executed as a "create" resource command, it will return the resource ID as well as the job ID.</para>
+                <para>You can periodically check the status of the job by making a simple API call to the command, queryAsyncJobResult and passing in the job ID.</para>
+            </listitem>
+        </itemizedlist>
+        <xi:include href="job-status.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+        <xi:include href="asynchronous-commands-example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/attach-iso-to-vm.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/attach-iso-to-vm.xml b/docs/tmp/en-US/xml_tmp/attach-iso-to-vm.xml
new file mode 100644
index 0000000..30e5d51
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/attach-iso-to-vm.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;
+]>
+
+<!-- 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="attach-iso-to-vm">
+    <title>Attaching an ISO to a VM</title>
+    <orderedlist>
+        <listitem><para>In the left navigation, click Instances.</para></listitem>
+        <listitem><para>Choose the virtual machine you want to work with.</para></listitem>
+        <listitem><para>Click the Attach ISO button <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="./images/iso-icon.png" />
+            </imageobject>
+            <textobject><phrase>iso.png: Depicts adding an iso image</phrase></textobject>
+        </inlinemediaobject></para></listitem>
+        <listitem><para>In the Attach ISO dialog box, select the desired ISO.</para></listitem>
+        <listitem><para>Click OK</para></listitem>
+    </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/attaching-volume.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/attaching-volume.xml b/docs/tmp/en-US/xml_tmp/attaching-volume.xml
new file mode 100644
index 0000000..360555e
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/attaching-volume.xml
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="attaching-volume">
+    <title>Attaching a Volume</title>
+    <para>You can attach a volume to a guest VM to provide extra disk storage. Attach a volume when you first create a new volume, when you are moving an existing volume from one VM to another, or after you have migrated a volume from one storage pool to another.</para>
+        <orderedlist>
+            <listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
+            <listitem><para>In the left navigation, click Storage.</para></listitem>
+            <listitem><para>In Select View, choose Volumes.</para></listitem>
+            <listitem><para>4.    Click the volume name in the Volumes list, then click the Attach Disk button<inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="./images/attach-disk-icon.png" />
+                </imageobject>
+                <textobject><phrase>AttachDiskButton.png: button to attach a volume</phrase></textobject>
+            </inlinemediaobject>
+                </para></listitem>
+            <listitem><para>In the Instance popup, choose the VM to which you want to attach the volume. You will only see instances to which you are allowed to attach volumes; for example, a user will see only instances created by that user, but the administrator will have more choices.</para>
+                <!-- <para>If the VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para> -->
+            </listitem> 
+            <listitem><para>When the volume has been attached, you should be able to see it by clicking Instances, the instance name, and View Volumes.</para></listitem>
+        </orderedlist>
+    </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/automatic-snapshot-creation-retention.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/automatic-snapshot-creation-retention.xml b/docs/tmp/en-US/xml_tmp/automatic-snapshot-creation-retention.xml
new file mode 100644
index 0000000..54fbe68
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/automatic-snapshot-creation-retention.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
+-->
+<section id="automatic-snapshot-creation-retention">
+  <title>Automatic Snapshot Creation and Retention</title>
+  <para>(Supported for the following hypervisors: <emphasis role="bold">XenServer</emphasis>,
+      <emphasis role="bold">VMware vSphere</emphasis>, and <emphasis role="bold"
+    >KVM</emphasis>)</para>
+  <para>Users can set up a recurring snapshot policy to automatically create multiple snapshots of a
+    disk at regular intervals. Snapshots can be created on an hourly, daily, weekly, or monthly
+    interval. One snapshot policy can be set up per disk volume. For example, a user can set up a
+    daily snapshot at 02:30.</para>
+  <para>With each snapshot schedule, users can also specify the number of scheduled snapshots to be
+    retained. Older snapshots that exceed the retention limit are automatically deleted. This
+    user-defined limit must be equal to or lower than the global limit set by the &PRODUCT;
+    administrator. See <xref linkend="globally-configured-limits"/>. The limit applies only to those
+    snapshots that are taken as part of an automatic recurring snapshot policy. Additional manual
+    snapshots can be created and retained.</para>
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/aws-api-examples.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/aws-api-examples.xml b/docs/tmp/en-US/xml_tmp/aws-api-examples.xml
new file mode 100644
index 0000000..ee3b44a
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/aws-api-examples.xml
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="aws-api-examples">
+    <title>Examples</title>
+    <para>There are many tools available to interface with a AWS compatible API. In this section we provide
+    a few examples that users of &PRODUCT; can build upon.</para>
+
+    <section id="aws-api-boto-examples">
+        <title>Boto Examples</title>
+        <para>Boto is one of them. It is a Python package available at https://github.com/boto/boto.
+        In this section we provide two examples of Python scripts that use Boto and have been tested with the
+        &PRODUCT; AWS API Interface.</para>
+        <para>First is an EC2 example. Replace the Access and Secret Keys with your own and
+        update the endpoint.</para>
+        <para>
+            <example>
+                <title>An EC2 Boto example</title>
+                <programlisting>#!/usr/bin/env python
+
+import sys
+import os
+import boto
+import boto.ec2
+
+region = boto.ec2.regioninfo.RegionInfo(name="ROOT",endpoint="localhost")
+apikey='GwNnpUPrO6KgIdZu01z_ZhhZnKjtSdRwuYd4DvpzvFpyxGMvrzno2q05MB0ViBoFYtdqKd'
+secretkey='t4eXLEYWw7chBhDlaKf38adCMSHx_wlds6JfSx3z9fSpSOm0AbP9Moj0oGIzy2LSC8iw'
+
+def main():
+	'''Establish connection to EC2 cloud'''
+        conn =boto.connect_ec2(aws_access_key_id=apikey,
+                       aws_secret_access_key=secretkey,
+                       is_secure=False,
+                       region=region,
+                       port=7080,
+                       path="/awsapi",
+                       api_version="2010-11-15")
+
+        '''Get list of images that I own'''
+	images = conn.get_all_images()
+	print images
+	myimage = images[0]
+	'''Pick an instance type'''
+	vm_type='m1.small'
+	reservation = myimage.run(instance_type=vm_type,security_groups=['default'])
+
+if __name__ == '__main__':
+	main()
+                </programlisting>
+            </example>
+        </para>
+        <para>Second is an S3 example. Replace the Access and Secret keys with your own,
+            as well as the endpoint of the service. Be sure to also update the file paths to something
+            that exists on your machine.</para>
+        <para>
+            <example>
+                <title>An S3 Boto Example</title>
+                <programlisting>#!/usr/bin/env python
+
+import sys
+import os
+from boto.s3.key import Key
+from boto.s3.connection import S3Connection
+from boto.s3.connection import OrdinaryCallingFormat
+
+apikey='ChOw-pwdcCFy6fpeyv6kUaR0NnhzmG3tE7HLN2z3OB_s-ogF5HjZtN4rnzKnq2UjtnHeg_yLA5gOw'
+secretkey='IMY8R7CJQiSGFk4cHwfXXN3DUFXz07cCiU80eM3MCmfLs7kusgyOfm0g9qzXRXhoAPCH-IRxXc3w'
+
+cf=OrdinaryCallingFormat()
+
+def main():	
+	'''Establish connection to S3 service'''
+        conn =S3Connection(aws_access_key_id=apikey,aws_secret_access_key=secretkey, \
+                          is_secure=False, \
+                          host='localhost', \
+                          port=7080, \
+                          calling_format=cf, \
+                          path="/awsapi/rest/AmazonS3")
+
+        try:
+            bucket=conn.create_bucket('cloudstack')
+            k = Key(bucket)
+            k.key = 'test'
+            try:
+               k.set_contents_from_filename('/Users/runseb/Desktop/s3cs.py')
+            except:
+               print 'could not write file'
+               pass
+        except:
+            bucket = conn.get_bucket('cloudstack')
+            k = Key(bucket)
+            k.key = 'test'
+            try:
+               k.get_contents_to_filename('/Users/runseb/Desktop/foobar')
+            except:
+               print 'Could not get file'
+               pass
+
+        try:
+           bucket1=conn.create_bucket('teststring')
+           k=Key(bucket1)
+           k.key('foobar')
+           k.set_contents_from_string('This is my silly test')
+        except:
+           bucket1=conn.get_bucket('teststring')
+           k = Key(bucket1)
+           k.key='foobar'
+           k.get_contents_as_string()
+	
+if __name__ == '__main__':
+	main()
+
+                </programlisting>
+            </example>
+        </para>
+    </section>
+
+    <section id="aws-api-jclouds-examples">
+        <title>JClouds Examples</title>
+        <para></para>
+    </section>
+
+ </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/aws-ec2-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/aws-ec2-configuration.xml b/docs/tmp/en-US/xml_tmp/aws-ec2-configuration.xml
new file mode 100644
index 0000000..d6c4066
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/aws-ec2-configuration.xml
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="aws-ec2-configuration">
+  <title>Enabling the AWS API Compatible Interface</title>
+  <para>
+    The software that provides AWS API compatibility is installed along with &PRODUCT;. However, you must enable the feature and perform some setup steps.
+  </para>
+  <orderedlist>
+    <listitem><para>Set the global configuration parameter enable.ec2.api to true. See <xref linkend="global-config" />.</para></listitem>
+    <listitem><para>Create a set of &PRODUCT; service offerings with names that match the Amazon service offerings.
+      You can do this through the &PRODUCT; UI as described in the Administration Guide.</para>
+      <warning><para>Be sure you have included the Amazon default service offering, m1.small.</para></warning></listitem>
+    <listitem><para>If you did not already do so when you set the configuration parameter in step 1, restart the Management Server.</para>
+    <programlisting># service cloud-management restart</programlisting></listitem>
+    <listitem><para>(Optional) The AWS API listens for requests on port 7080. If you prefer AWS API to listen on another port, you can change it as follows:</para>
+      <orderedlist numeration="loweralpha">
+        <listitem><para>Edit the files /etc/cloud/management/server.xml, /etc/cloud/management/server-nonssl.xml, and /etc/cloud/management/server-ssl.xml.</para></listitem>
+        <listitem><para>In each file, find the tag &lt;Service name="Catalina7080"&gt;. Under this tag, locate &lt;Connector executor="tomcatThreadPool-internal" port= ....&lt;.</para></listitem>
+        <listitem><para>Change the port to whatever port you want to use, then save the files.</para></listitem>
+        <listitem><para>Restart the Management Server.</para>
+        <note><para>If you re-install CloudStack, you will have to make these changes again.</para></note>
+        </listitem>
+      </orderedlist>
+    </listitem>
+  </orderedlist>
+ </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/aws-ec2-introduction.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/aws-ec2-introduction.xml b/docs/tmp/en-US/xml_tmp/aws-ec2-introduction.xml
new file mode 100644
index 0000000..a4df086
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/aws-ec2-introduction.xml
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="aws-ec2-introduction">
+  <title>Amazon Web Services EC2 Compatible Interface</title>
+    <para>&PRODUCT; can translate Amazon Web Services (AWS) API calls to native &PRODUCT; API calls
+    so that users can continue using existing AWS-compatible tools. This translation service runs as
+    a separate web application in the same tomcat server as the management server of &PRODUCT;,
+    listening on the same port. This Amazon EC2-compatible API is accessible through a SOAP web
+    service.</para> 
+    <note>
+      <para>This service was previously enabled by separate software called CloudBridge. It is now
+      fully integrated with the &PRODUCT; management server. </para>
+    </note>
+    <para>Limitations</para>
+    <itemizedlist>
+      <listitem>
+        <para>Supported only in zones that use basic networking.</para>
+      </listitem>
+      <listitem>
+        <para>Available in fresh installations of &PRODUCT;. Not available through upgrade of previous versions.</para>
+      </listitem>
+      <listitem>
+        <para>If you need to support features such as elastic IP, set up a Citrix NetScaler to provide this service. The commands such as ec2-associate-address will not work without EIP setup. Users running VMs in this zone will be using the NetScaler-enabled network offering (DefaultSharedNetscalerEIP and ELBNetworkOffering).</para>
+      </listitem>
+    </itemizedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/aws-ec2-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/aws-ec2-requirements.xml b/docs/tmp/en-US/xml_tmp/aws-ec2-requirements.xml
new file mode 100644
index 0000000..59fb5b6
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/aws-ec2-requirements.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;
+]>
+
+<!-- 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="aws-ec2-requirements">
+    <title>System Requirements</title>
+    <itemizedlist>
+        <listitem><para>This interface complies with Amazon's WDSL version dated November 15, 2010, available at
+            <ulink url="http://ec2.amazonaws.com/doc/2010-11-15/">http://ec2.amazonaws.com/doc/2010-11-15/</ulink>.</para></listitem>
+        <listitem><para>Compatible with the EC2 command-line
+            tools <emphasis>EC2 tools v. 1.3.6230</emphasis>, which can be downloaded at <ulink
+            url="http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip">http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.3-62308.zip</ulink>.</para>
+        </listitem>
+    </itemizedlist>
+</section>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/92d4b214/docs/tmp/en-US/xml_tmp/aws-ec2-supported-commands.xml
----------------------------------------------------------------------
diff --git a/docs/tmp/en-US/xml_tmp/aws-ec2-supported-commands.xml b/docs/tmp/en-US/xml_tmp/aws-ec2-supported-commands.xml
new file mode 100644
index 0000000..9494218
--- /dev/null
+++ b/docs/tmp/en-US/xml_tmp/aws-ec2-supported-commands.xml
@@ -0,0 +1,396 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="aws-ec2-supported-commands">
+  <title>Supported AWS API Calls</title>
+    <para>The following Amazon EC2 commands are supported by &PRODUCT; when the AWS API compatibility feature is enabled.
+        For a few commands, there are differences between the &PRODUCT; and Amazon EC2 versions, and these differences are noted. The underlying SOAP call for each command is also given, for those who have built tools using those calls.
+    </para>
+    <table frame='all'>
+      <title>Elastic IP API mapping</title>
+      <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+        <!--<colspec colname='c1'tcolwidth="1*"/>
+        <colspec colname='c2'tcolwidth="1*"/>-->
+        <thead>
+          <row>
+            <entry>EC2 command</entry>
+            <entry>SOAP call</entry>
+            <entry>&PRODUCT; API call</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>ec2-allocate-address</entry>
+            <entry>AllocateAddress</entry>
+            <entry>associateIpAddress</entry>
+          </row>
+          <row>
+            <entry>ec2-associate-address</entry>
+            <entry>AssociateAddress</entry>
+            <entry>enableStaticNat</entry>
+          </row>
+          <row>
+            <entry>ec2-describe-addresses</entry>
+            <entry>DescribeAddresses</entry>
+            <entry>listPublicIpAddresses</entry>
+          </row>
+          <row>
+            <entry>ec2-diassociate-address</entry>
+            <entry>DisassociateAddress</entry>
+            <entry>disableStaticNat</entry>
+          </row>
+          <row>
+            <entry>ec2-release-address</entry>
+            <entry>ReleaseAddress</entry>
+            <entry>disassociateIpAddress</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+    <table frame='all'>
+      <title>Availability Zone API mapping</title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <!--<colspec colname='c1'tcolwidth="1*"/>
+          <colspec colname='c2'tcolwidth="1*"/>-->
+          <thead>
+            <row>
+              <entry>EC2 command</entry>
+              <entry>SOAP call</entry>
+              <entry>&PRODUCT; API call</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>ec2-describe-availability-zones</entry>
+              <entry>DescribeAvailabilityZones</entry>
+              <entry>listZones</entry>
+            </row>
+          </tbody>
+        </tgroup>
+    </table>
+    <table frame='all'>
+      <title>Images API mapping</title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <!--<colspec colname='c1'tcolwidth="1*"/>
+          <colspec colname='c2'tcolwidth="1*"/>-->
+          <thead>
+            <row>
+              <entry>EC2 command</entry>
+              <entry>SOAP call</entry>
+              <entry>&PRODUCT; API call</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>ec2-create-image</entry>
+              <entry>CreateImage</entry>
+              <entry>createTemplate</entry>
+            </row>
+            <row>
+              <entry>ec2-deregister</entry>
+              <entry>DeregisterImage</entry>
+              <entry>DeleteTemplate</entry>
+            </row>
+            <row>
+              <entry>ec2-describe-images</entry>
+              <entry>DescribeImages</entry>
+              <entry>listTemplates</entry>
+            </row>
+            <row>
+              <entry>ec2-register</entry>
+              <entry>RegisterImage</entry>
+              <entry>registerTemplate</entry>
+            </row>
+          </tbody>
+        </tgroup>
+    </table>
+    <table frame='all'>
+      <title>Image Attributes API mapping</title>
+      <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+        <!--<colspec colname='c1'tcolwidth="1*"/>
+        <colspec colname='c2'tcolwidth="1*"/>-->
+        <thead>
+          <row>
+            <entry>EC2 command</entry>
+            <entry>SOAP call</entry>
+            <entry>&PRODUCT; API call</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>ec2-describe-image-attribute</entry>
+            <entry>DescribeImageAttribute</entry>
+            <entry>listTemplatePermissions</entry>
+          </row>
+          <row>
+            <entry>ec2-modify-image-attribute</entry>
+            <entry>ModifyImageAttribute</entry>
+            <entry>updateTemplatePermissions</entry>
+          </row>
+          <row>
+            <entry>ec2-reset-image-attribute</entry>
+            <entry>ResetImageAttribute</entry>
+            <entry>updateTemplatePermissions</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+    <table frame='all'>
+      <title>Instances API mapping</title>
+      <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+        <!--<colspec colname='c1'tcolwidth="1*"/>
+        <colspec colname='c2'tcolwidth="1*"/>-->
+        <thead>
+          <row>
+            <entry>EC2 command</entry>
+            <entry>SOAP call</entry>
+            <entry>&PRODUCT; API call</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>ec2-describe-instances</entry>
+            <entry>DescribeInstances</entry>
+            <entry>listVirtualMachines</entry>
+          </row>
+          <row>
+            <entry>ec2-run-instances</entry>
+            <entry>RunInstances</entry>
+            <entry>deployVirtualMachine</entry>
+          </row>
+          <row>
+            <entry>ec2-reboot-instances</entry>
+            <entry>RebootInstances</entry>
+            <entry>rebootVirtualMachine</entry>
+          </row>
+          <row>
+            <entry>ec2-start-instances</entry>
+            <entry>StartInstances</entry>
+            <entry>startVirtualMachine</entry>
+          </row>
+          <row>
+            <entry>ec2-stop-instances</entry>
+            <entry>StopInstances</entry>
+            <entry>stopVirtualMachine</entry>
+          </row>
+          <row>
+            <entry>ec2-terminate-instances</entry>
+            <entry>TerminateInstances</entry>
+            <entry>destroyVirtualMachine</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+    <table frame='all'>
+      <title>Instance Attributes Mapping</title>
+      <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+        <!--<colspec colname='c1'tcolwidth="1*"/>
+        <colspec colname='c2'tcolwidth="1*"/>-->
+        <thead>
+          <row>
+            <entry>EC2 command</entry>
+            <entry>SOAP call</entry>
+            <entry>&PRODUCT; API call</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+             <entry>ec2-describe-instance-attribute</entry>
+             <entry>DescribeInstanceAttribute</entry>
+             <entry>listVirtualMachines</entry>
+           </row>
+         </tbody>
+       </tgroup>
+     </table>
+     <table frame='all'>
+       <title>Keys Pairs Mapping</title>
+       <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+         <!--<colspec colname='c1'tcolwidth="1*"/>
+         <colspec colname='c2'tcolwidth="1*"/>-->
+         <thead>
+           <row>
+             <entry>EC2 command</entry>
+             <entry>SOAP call</entry>
+             <entry>&PRODUCT; API call</entry>
+           </row>
+         </thead>
+         <tbody>
+           <row>
+             <entry>ec2-add-keypair</entry> 
+             <entry>CreateKeyPair</entry>
+             <entry>createSSHKeyPair</entry>
+           </row>
+           <row>
+             <entry>ec2-delete-keypair</entry>
+             <entry>DeleteKeyPair</entry>
+             <entry>deleteSSHKeyPair</entry>
+           </row>
+           <row>
+             <entry>ec2-describe-keypairs</entry>
+             <entry>DescribeKeyPairs</entry>
+             <entry>listSSHKeyPairs</entry>
+           </row>
+           <row>
+             <entry>ec2-import-keypair</entry>
+             <entry>ImportKeyPair</entry>
+             <entry>registerSSHKeyPair</entry>
+           </row>	
+         </tbody>
+       </tgroup>
+     </table>
+     <table frame='all'>
+       <title>Passwords API Mapping</title>
+       <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+         <!--<colspec colname='c1'tcolwidth="1*"/>
+         <colspec colname='c2'tcolwidth="1*"/>-->
+         <thead>
+           <row>
+             <entry>EC2 command</entry>
+             <entry>SOAP call</entry>
+             <entry>&PRODUCT; API call</entry>
+           </row>
+         </thead>
+         <tbody>
+           <row>
+             <entry>ec2-get-password</entry>
+             <entry>GetPasswordData</entry>
+             <entry>getVMPassword</entry>
+          </row>
+         </tbody>
+       </tgroup>
+     </table>
+     <table frame='all'>
+       <title>Security Groups API Mapping</title>
+       <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+         <!--<colspec colname='c1'tcolwidth="1*"/>
+         <colspec colname='c2'tcolwidth="1*"/>-->
+         <thead>
+           <row>
+             <entry>EC2 command</entry>
+             <entry>SOAP call</entry>
+             <entry>&PRODUCT; API call</entry>
+           </row>
+         </thead>
+         <tbody>
+           <row>
+             <entry>ec2-authorize</entry>
+             <entry>AuthorizeSecurityGroupIngress</entry>
+             <entry>authorizeSecurityGroupIngress</entry>
+           </row>
+           <row>
+             <entry>ec2-add-group</entry>
+             <entry>CreateSecurityGroup</entry>
+             <entry>createSecurityGroup</entry>
+           </row>
+           <row>
+             <entry>ec2-delete-group</entry>
+             <entry>DeleteSecurityGroup</entry>
+             <entry>deleteSecurityGroup</entry>
+           </row>
+           <row>
+             <entry>ec2-describe-group</entry>
+             <entry>DescribeSecurityGroups</entry>
+             <entry>listSecurityGroups</entry>
+           </row>
+           <row>
+             <entry>ec2-revoke</entry>
+             <entry>RevokeSecurityGroupIngress</entry>
+             <entry>revokeSecurityGroupIngress</entry>
+           </row>
+         </tbody>
+       </tgroup>
+     </table>
+     <table frame='all'>
+       <title>Snapshots API Mapping</title>
+       <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+         <!--<colspec colname='c1'tcolwidth="1*"/>
+         <colspec colname='c2'tcolwidth="1*"/>-->
+         <thead>
+           <row>
+             <entry>EC2 command</entry>
+             <entry>SOAP call</entry>
+             <entry>&PRODUCT; API call</entry>
+           </row>
+         </thead>
+         <tbody>
+           <row>
+             <entry>ec2-create-snapshot</entry>
+             <entry>CreateSnapshot</entry>
+             <entry>createSnapshot</entry>
+           </row>
+           <row>
+             <entry>ec2-delete-snapshot</entry>
+             <entry>DeleteSnapshot</entry>
+             <entry>deleteSnapshot</entry>
+           </row>
+           <row>
+             <entry>ec2-describe-snapshots</entry>
+             <entry>DescribeSnapshots</entry>
+             <entry>listSnapshots</entry>
+           </row>
+         </tbody>
+      </tgroup>
+    </table>
+    <table frame='all'>
+	  <title>Volumes API Mapping</title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+         <!--<colspec colname='c1'tcolwidth="1*"/>
+         <colspec colname='c2'tcolwidth="1*"/>-->
+         <thead>
+           <row>
+             <entry>EC2 command</entry>
+             <entry>SOAP call</entry>
+             <entry>&PRODUCT; API call</entry>
+           </row>
+         </thead>
+         <tbody>
+           <row>
+             <entry>ec2-attach-volume</entry>
+             <entry>AttachVolume</entry>
+             <entry>attachVolume</entry>
+           </row>
+           <row>
+             <entry>ec2-create-volume</entry>
+             <entry>CreateVolume</entry>
+             <entry>createVolume</entry>
+           </row>
+           <row>
+             <entry>ec2-delete-volume</entry>
+             <entry>DeleteVolume</entry>
+             <entry>deleteVolume</entry>
+           </row>
+           <row>
+             <entry>ec2-describe-volume</entry>
+             <entry>DescribeVolume</entry>
+             <entry>listVolumes</entry>
+           </row>
+           <row>
+             <entry>ec2-detach-volume</entry>
+             <entry>DetachVolume</entry>
+             <entry>detachVolume</entry>
+           </row>
+         </tbody>
+       </tgroup>
+     </table>
+</section>


Mime
View raw message