deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [2/5] SITE: CIMI Docs (REST API) and cURL examples
Date Mon, 21 Jan 2013 16:15:22 GMT
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-rest/cimi-rest-collections.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-collections.html b/site/output/cimi-rest/cimi-rest-collections.html
new file mode 100644
index 0000000..57887e6
--- /dev/null
+++ b/site/output/cimi-rest/cimi-rest-collections.html
@@ -0,0 +1,563 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>CIMI Resource Collections - Machine</title>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le JavaScript -->
+    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
+    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
+    <script src="/assets/js/application.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-transition.js"></script>
+    <script src="/assets/js/bootstrap-alert.js"></script>
+    <script src="/assets/js/bootstrap-modal.js"></script>
+    <script src="/assets/js/bootstrap-scrollspy.js"></script>
+    <script src="/assets/js/bootstrap-tab.js"></script>
+    <script src="/assets/js/bootstrap-tooltip.js"></script>
+    <script src="/assets/js/bootstrap-popover.js"></script>
+    <script src="/assets/js/bootstrap-button.js"></script>
+    <script src="/assets/js/bootstrap-collapse.js"></script>
+    <script src="/assets/js/bootstrap-carousel.js"></script>
+    <script src="/assets/js/bootstrap-typeahead.js"></script>
+
+    <!-- Le styles -->
+    <link href="/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="/assets/css/application.css" rel="stylesheet">
+    <link rel="shortcut icon" href="/assets/img/favicon.ico">
+  </head>
+
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
+            alt="Deltacloud API"/></a>
+          <ul class="nav top-nav">
+  <li><a href="/">Home</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/about.html">What is Deltacloud?</a></li>
+      <li><a href="/supported-providers.html">Supported Providers</a></li>
+    </ul>
+  </li>
+  <li><a href="/download.html">Download</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
+      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/usage.html#usingapi">Using API</a></li>
+      <li><a href="/usage.html#clients">Client Libraries</a></li>
+      <li><a href="/command-tools.html">Command Line Tools</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/getting-sources.html">Getting Sources</a></li>
+      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/rest-api.html">REST API</a></li>
+      <li><a href="/drivers.html">Drivers API</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
+      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
+    </ul>
+  </li>
+  <li><a href="/contact.html">Contact</a></li>
+</ul>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="container content">
+
+      <p><br></p>
+
+<div class="row">
+  <div class="span9">
+
+<h3 id="cimi-entry-point">CIMI Resources and Collections</h3>
+
+<p> We are continually improving CIMI support in Deltacloud. If you come across any inconsistencies or errors in the Deltacloud CIMI implementation we'll be very glad to <a href="../contact.html">hear about them</a>.</p>
+
+<p>
+In the following sections, the textual definitions following the title of each resource (e.g. "Machine") that are rendered in <strong><em>bold and italic type</em></strong> are taken from the CIMI 1.0.1 specification, available from the DMTF <a href="http://dmtf.org/cloud">Cloud Management Initiative</a> (DSP0263).
+</p>
+
+<hr>
+<br><br><h3 id="cimi-machine">Machine</h3>
+<p>
+<strong><em>
+An instantiated compute resource that encapsulates both CPU and Memory.
+A Machine Collection resource represents the collection of Machine resources within a Provider
+</em></strong>
+</p>
+
+ </div>
+
+ <div class="span3">
+
+<ul class="nav nav-list well">
+<li class="nav-header">
+    CIMI REST API
+  </li>
+  <li><a href="../cimi-rest.html">Introduction</a></li>
+  <li><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      CIMI Resources
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+<li><a href="cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="cimi-rest-collections.html">Machine</a></li>
+      <li><a href="cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+</li>
+  <hr>
+<li class="nav-header">
+    Machine Resources
+  </li>
+  <ul class="nav nav-list">
+<li class="active"><a href="cimi-rest-collections.html">Machine</a></li>
+    <li><a href="cimi-rest-machine-images.html">MachineImage</a></li>
+    <li><a href="cimi-rest-machine-configs.html">MachineConfiguration</a></li>
+    <li><a href="cimi-rest-machine-templates.html">MachineTemplate</a></li>
+  </ul>
+</ul>
+</div>
+
+</div>
+
+<ul class="nav nav-pills">
+<li class="active"><a href="#tab1" data-toggle="tab">Retrieve the Machine Collection</a></li>
+  <li><a href="#single-machine" data-toggle="tab">Retrieve a single Machine</a></li>
+  <li><a href="#create-machine" data-toggle="tab">Create a new Machine</a></li>
+  <li><a href="#machine-action" data-toggle="tab">Perform a Machine Operation</a></li>
+  <li><a href="#machine-volumes" data-toggle="tab">Work with Machine Volumes</a></li>
+</ul><hr><div class="tab-content">
+  <div class="tab-pane active" id="tab1">
+
+<h4>Retrieve the Machine Collection</h4>
+
+Note the 'add' URI of the Machine Collection resource in the example response below. This is the URI that is used for creating a new Machine (adding to the Machine Collection).
+<br><br><p>Example request:</p>
+
+<pre>
+GET /cimi/machines HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+</pre>
+
+<p>Server response:</p>
+
+<pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 2293
+ETag: 5c6dc8cfbceeb1f3c610765a4aa600dd
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 28 Dec 2012 11:08:27 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Collection xmlns="http://schemas.dmtf.org/cimi/1"
+        resourceURI="http://schemas.dmtf.org/cimi/1/MachineCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machines&lt;/id&gt;
+  &lt;count&gt;2&lt;/count&gt;
+  &lt;Machine&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machines/inst0&lt;/id&gt;
+    &lt;name&gt;Mock Instance With Profile Change&lt;/name&gt;
+    &lt;description&gt;No description set for Machine Mock Instance With Profile Change&lt;/description&gt;
+    &lt;created&gt;2012-12-28T13:08:27+02:00&lt;/created&gt;
+    &lt;property key="machine_image"&gt;http://localhost:3001/cimi/machine_images/img1&lt;/property&gt;
+    &lt;property key="credential"&gt;http://localhost:3001/cimi/credentials&lt;/property&gt;
+    &lt;state&gt;STARTED&lt;/state&gt;
+    &lt;cpu&gt;1&lt;/cpu&gt;
+    &lt;memory&gt;12582912&lt;/memory&gt;
+    &lt;disks href="http://localhost:3001/cimi/machines/inst0/disks" /&gt;
+    &lt;volumes href="http://localhost:3001/cimi/machines/inst0/volumes" /&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/restart"
+        href="http://localhost:3001/cimi/machines/inst0/restart" /&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/stop"
+        href="http://localhost:3001/cimi/machines/inst0/stop" /&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/capture"
+        href="http://localhost:3001/cimi/machine_images" /&gt;
+  &lt;/Machine&gt;
+  &lt;Machine&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machines/inst1&lt;/id&gt;
+    &lt;name&gt;MockUserInstance&lt;/name&gt;
+    &lt;description&gt;No description set for Machine MockUserInstance&lt;/description&gt;
+    &lt;created&gt;2012-12-28T13:08:27+02:00&lt;/created&gt;
+    &lt;property key="machine_image"&gt;http://localhost:3001/cimi/machine_images/img3&lt;/property&gt;
+    &lt;property key="credential"&gt;http://localhost:3001/cimi/credentials&lt;/property&gt;
+    &lt;state&gt;STARTED&lt;/state&gt;
+    &lt;cpu&gt;1&lt;/cpu&gt;
+    &lt;memory&gt;1782579&lt;/memory&gt;
+    &lt;disks href="http://localhost:3001/cimi/machines/inst1/disks" /&gt;
+    &lt;volumes href="http://localhost:3001/cimi/machines/inst1/volumes" /&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/restart"
+        href="http://localhost:3001/cimi/machines/inst1/restart" /&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/stop"
+        href="http://localhost:3001/cimi/machines/inst1/stop" /&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/capture"
+        href="http://localhost:3001/cimi/machine_images" /&gt;
+  &lt;/Machine&gt;
+  &lt;operation rel="add" href="http://localhost:3001/cimi/machines" /&gt;
+&lt;/Collection&gt;
+
+
+</pre>
+
+  </div>
+  <div class="tab-pane" id="single-machine">
+
+<h4>Retrieve a single Machine</h4>
+
+<p>Example request:</p>
+
+<pre>
+GET /cimi/machines/inst0 HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+</pre>
+
+<p>Server response:</p>
+
+<pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 1092
+ETag: 2d57aa01f1a50b2d13c04f0c51f08ab9
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 28 Dec 2012 11:20:28 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Machine xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/Machine"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machines/inst0&lt;/id&gt;
+  &lt;name&gt;Mock Instance With Profile Change&lt;/name&gt;
+  &lt;description&gt;No description set for Machine Mock Instance With Profile Change&lt;/description&gt;
+  &lt;created&gt;2012-12-28T13:20:28+02:00&lt;/created&gt;
+  &lt;property key="machine_image"&gt;http://localhost:3001/cimi/machine_images/img1&lt;/property&gt;
+  &lt;property key="credential"&gt;http://localhost:3001/cimi/credentials&lt;/property&gt;
+  &lt;state&gt;STARTED&lt;/state&gt;
+  &lt;cpu&gt;1&lt;/cpu&gt;
+  &lt;memory&gt;12582912&lt;/memory&gt;
+  &lt;disks href="http://localhost:3001/cimi/machines/inst0/disks" /&gt;
+  &lt;volumes href="http://localhost:3001/cimi/machines/inst0/volumes" /&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/restart"
+          href="http://localhost:3001/cimi/machines/inst0/restart" /&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/stop"
+          href="http://localhost:3001/cimi/machines/inst0/stop" /&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/capture"
+          href="http://localhost:3001/cimi/machine_images" /&gt;
+&lt;/Machine&gt;
+
+
+</pre>
+
+  </div>
+
+  <div class="tab-pane" id="create-machine">
+
+<h4>Create a new Machine</h4>
+
+<p>
+The 'add' URI of the Machine Collection is used to create a new Machine. This is returned when retrieving the Machine Collection resource.
+</p>
+
+<p>Example request:</p>
+
+<pre>
+POST /cimi/machines HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Content-Type: application/xml
+Accept: application/xml
+Content-Length: 370
+
+&lt;MachineCreate xmlns="http://schemas.dmtf.org/cimi/1"&gt;
+  &lt;name&gt; myMachine1 &lt;/name&gt;
+  &lt;description&gt; my machine description &lt;/description&gt;
+  &lt;machineTemplate&gt;
+    &lt;machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-small"&gt;
+    &lt;/machineConfig&gt;
+    &lt;machineImage href="http://localhost:3001/cimi/machine_images/img1"&gt;
+    &lt;/machineImage&gt;
+  &lt;/machineTemplate&gt;
+&lt;/MachineCreate&gt;
+
+</pre>
+
+<p>Server response:</p>
+
+<pre>
+HTTP/1.1 201 Created
+Content-Type: application/xml
+Location: http://localhost:3001/cimi/machines/inst3
+CIMI-Specification-Version: 1.0.1
+Content-Length: 1030
+ETag: 360992481f1450f9d475f439e5105f9d
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 28 Dec 2012 11:47:58 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Machine xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/Machine"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machines/inst3&lt;/id&gt;
+  &lt;name&gt; myMachine1 &lt;/name&gt;
+  &lt;description&gt; my machine description &lt;/description&gt;
+  &lt;created&gt;2012-12-28T13:47:58+02:00&lt;/created&gt;
+  &lt;property key="machine_image"&gt;http://localhost:3001/cimi/machine_images/img1&lt;/property&gt;
+  &lt;property key="credential"&gt;http://localhost:3001/cimi/credentials&lt;/property&gt;
+  &lt;state&gt;STARTED&lt;/state&gt;
+  &lt;cpu&gt;1&lt;/cpu&gt;
+  &lt;memory&gt;1782579&lt;/memory&gt;
+  &lt;disks href="http://localhost:3001/cimi/machines/inst3/disks" /&gt;
+  &lt;volumes href="http://localhost:3001/cimi/machines/inst3/volumes" /&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/restart"
+          href="http://localhost:3001/cimi/machines/inst3/restart" /&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/stop"
+          href="http://localhost:3001/cimi/machines/inst3/stop" /&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/capture"
+          href="http://localhost:3001/cimi/machine_images" /&gt;
+&lt;/Machine&gt;
+
+
+</pre>
+
+
+  </div>
+
+
+  <div class="tab-pane" id="machine-action">
+
+<h4>Perform a Machine Operation</h4>
+
+<p>
+The list of Machine operations is returned when the URI of a specific Machine resource is dereferenced. Examples of operations are 'stop', 'restart' and 'capture'. An 'Action' resource is used in the POST message body corresponding to the operation to be executed. The example below shows the 'stop' action.
+</p>
+
+<p>Example request:</p>
+<pre>
+POST /cimi/machines/inst3/stop HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Content-Type: application/xml
+Accept: application/xml
+Content-Length: 125
+
+&lt;Action xmlns="http://schemas.dmtf.org/cimi/1"&gt;
+  &lt;action&gt; http://http://schemas.dmtf.org/cimi/1/action/stop &lt;/action&gt;
+&lt;/Action&gt;
+</pre>
+
+<p>Server response:</p>
+<pre>
+HTTP/1.1 202 Accepted
+CIMI-Specification-Version: 1.0.1
+Content-Length: 0
+Date: Fri, 28 Dec 2012 14:01:43 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+</pre>
+
+
+  </div>
+
+  <div class="tab-pane" id="machine-volumes">
+
+  <h4>Work with Machine Volumes</h4>
+
+  <p>Retrieve the MachineVolume Collection </p>
+
+  <p>Example request:</p>
+
+  <pre>
+GET /cimi/machines/inst1/volumes HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+  </pre>
+
+  <p>Server response:</p>
+  <pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 747
+ETag: 8e2d333a3747634c04942b7d219a8d59
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 18 Jan 2013 14:50:26 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Collection xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/MachineVolumeCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machines/inst1/volumes&lt;/id&gt;
+  &lt;count&gt;1&lt;/count&gt;
+  &lt;MachineVolume&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machines/inst1/volumes/vol3&lt;/id&gt;
+    &lt;name&gt;vol3&lt;/name&gt;
+    &lt;description&gt;MachineVolume vol3 for Machine inst1&lt;/description&gt;
+    &lt;created&gt;2009-07-30T14:35:11Z&lt;/created&gt;
+    &lt;initialLocation&gt;/dev/sda1&lt;/initialLocation&gt;
+    &lt;volume href="http://localhost:3001/cimi/volumes/vol3" /&gt;
+    &lt;operation rel="delete" href="http://localhost:3001/cimi/machines/inst1/volumes/vol3" /&gt;
+  &lt;/MachineVolume&gt;
+  &lt;operation rel="add" href="http://localhost:3001/cimi/machines/inst1/volume_attach" /&gt;
+&lt;/Collection&gt;
+  </pre>
+
+<br><hr>
+<p>Attach a Volume to a Machine - aka add a new MachineVolume to the MachineVolumeCollection of a specific Machine resource </p>
+
+  <p>Example request:</p>
+  <pre>
+
+POST /cimi/machines/inst1/volume_attach HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Content-Type: application/xml
+Accept: application/xml
+Content-Length: 186
+
+&lt;MachineVolume xmlns="http://schemas.dmtf.org/cimi/1/MachineVolume"&gt;
+  &lt;initialLocation&gt; /dev/sdf &lt;/initialLocation&gt;
+  &lt;volume href="http://localhost:3001/cimi/volumes/vol3"/&gt;
+&lt;/MachineVolume&gt;
+  </pre>
+
+  <p>Server response:</p>
+  <pre>
+
+HTTP/1.1 201 Created
+Content-Type: application/xml
+Location: http://localhost:3001/cimi/machines/inst1/volumes/vol3
+CIMI-Specification-Version: 1.0.1
+Content-Length: 522
+ETag: cba6ca3186fa1ca3b7caf6b19e857139
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 18 Jan 2013 14:56:52 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;MachineVolume xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/MachineVolume"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machines/inst1/volumes/vol3&lt;/id&gt;
+  &lt;name&gt;vol3&lt;/name&gt;
+  &lt;description&gt;MachineVolume vol3 for Machine inst1&lt;/description&gt;
+  &lt;created&gt;2009-07-30T14:35:11Z&lt;/created&gt;
+  &lt;initialLocation&gt;/dev/sdf&lt;/initialLocation&gt;
+  &lt;volume href="http://localhost:3001/cimi/volumes/vol3" /&gt;
+  &lt;operation rel="delete" href="http://localhost:3001/cimi/machines/inst1/volumes/vol3" /&gt;
+&lt;/MachineVolume&gt;
+
+  </pre>
+
+
+<br><hr>
+<p>Detach a Volume from a Machine - aka remove a MachineVolume from the MachineVolumeCollection of a specific Machine resource </p>
+
+  <p>Example request:</p>
+  <pre>
+DELETE /cimi/machines/inst1/volumes/vol3 HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+
+  </pre>
+
+  <p>Server response:</p>
+
+  <pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 304
+ETag: 011fb5daa52162644aeb170c86dc08ce
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 18 Jan 2013 17:11:02 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Collection xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/MachineVolumeCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machines/inst1/volumes&lt;/id&gt;
+  &lt;count&gt;0&lt;/count&gt;
+  &lt;operation rel="add" href="http://localhost:3001/cimi/machines/inst1/volume_attach" /&gt;
+&lt;/Collection&gt;
+
+  </pre>
+  </div>
+
+</div>
+
+      <footer class="footer">
+        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
+        <div class='row'>
+          <div class='span3'>
+            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
+          </div>
+          <div class='span9'>
+            <strong>Apache Deltacloud</strong> is a top-level project at the <a
+              href="http://www.apache.org">Apache Software Foundation</a>,
+            having graduated from the ASF Incubator in October
+            2011. Through a collaborative and meritocratic development process, Apache
+            projects deliver enterprise-grade, freely available software products that
+            attract large communities of users. 
+          </div>
+        </div>
+      </footer>
+
+    </div> <!-- /container -->
+
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-rest/cimi-rest-entry-point.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-entry-point.html b/site/output/cimi-rest/cimi-rest-entry-point.html
new file mode 100644
index 0000000..4bc1c4c
--- /dev/null
+++ b/site/output/cimi-rest/cimi-rest-entry-point.html
@@ -0,0 +1,227 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>CIMI Cloud Entry Point</title>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le JavaScript -->
+    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
+    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
+    <script src="/assets/js/application.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-transition.js"></script>
+    <script src="/assets/js/bootstrap-alert.js"></script>
+    <script src="/assets/js/bootstrap-modal.js"></script>
+    <script src="/assets/js/bootstrap-scrollspy.js"></script>
+    <script src="/assets/js/bootstrap-tab.js"></script>
+    <script src="/assets/js/bootstrap-tooltip.js"></script>
+    <script src="/assets/js/bootstrap-popover.js"></script>
+    <script src="/assets/js/bootstrap-button.js"></script>
+    <script src="/assets/js/bootstrap-collapse.js"></script>
+    <script src="/assets/js/bootstrap-carousel.js"></script>
+    <script src="/assets/js/bootstrap-typeahead.js"></script>
+
+    <!-- Le styles -->
+    <link href="/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="/assets/css/application.css" rel="stylesheet">
+    <link rel="shortcut icon" href="/assets/img/favicon.ico">
+  </head>
+
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
+            alt="Deltacloud API"/></a>
+          <ul class="nav top-nav">
+  <li><a href="/">Home</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/about.html">What is Deltacloud?</a></li>
+      <li><a href="/supported-providers.html">Supported Providers</a></li>
+    </ul>
+  </li>
+  <li><a href="/download.html">Download</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
+      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/usage.html#usingapi">Using API</a></li>
+      <li><a href="/usage.html#clients">Client Libraries</a></li>
+      <li><a href="/command-tools.html">Command Line Tools</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/getting-sources.html">Getting Sources</a></li>
+      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/rest-api.html">REST API</a></li>
+      <li><a href="/drivers.html">Drivers API</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
+      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
+    </ul>
+  </li>
+  <li><a href="/contact.html">Contact</a></li>
+</ul>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="container content">
+
+      <p><br></p>
+
+<div class="row">
+  <div class="span9">
+
+<h3 id="cimi-entry-point">The CIMI Cloud Entry Point</h3>
+
+<p>
+<strong><em>The Cloud Entry Point represents the entry point into the cloud defined by the CIMI Model. The Cloud
+Entry Point implements a catalog of resources, such as Systems, System Templates, Machines, Machine
+Templates, etc., that can be queried and browsed by the Consumer.</em></strong>
+</p>
+<p>
+A deltacloud server exposes the CIMI Cloud Entry Point at /cimi/cloudEntryPoint. When dereferencing this URI, the resources listed in the response include only those that are supported by the current deltacloud driver - whether the 'default' driver the server was started with, or that specified with the <a href="../drivers.html">X-Deltacloud-Driver</a> header.
+</p>
+
+ </div>
+
+  <div class="span3">
+
+<ul class="nav nav-list well">
+<li class="nav-header">
+    CIMI REST API
+  </li>
+  <li><a href="../cimi-rest.html">Introduction</a></li>
+  <li class="active"><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      CIMI Resources
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+<li><a href="cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="cimi-rest-collections.html">Machine</a></li>
+      <li><a href="cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+</li>
+
+</ul>
+</div>
+
+</div>
+
+<p>
+Example request:
+</p>
+<pre>
+ GET /cimi/cloudEntryPoint HTTP/1.1
+ Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+ User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+ Host: localhost:3001
+ Accept: application/xml
+</pre>
+
+<p>
+Example response:
+</p>
+
+<pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 1754
+ETag: 503bc06f24d1a51eddc62b33b870c70f
+Cache-Control: max-age=0, private, must-revalidate
+Date: Thu, 27 Dec 2012 15:23:23 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;CloudEntryPoint xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/CloudEntryPoint"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/cloudEntryPoint&lt;/id&gt;
+  &lt;name&gt;mock&lt;/name&gt;
+  &lt;description&gt;Cloud Entry Point for the Deltacloud mock driver&lt;/description&gt;
+  &lt;created&gt;2012-12-27T17:23:23+02:00&lt;/created&gt;
+  &lt;baseURI&gt;http://localhost:3001/cimi/&lt;/baseURI&gt;
+  &lt;resourceMetadata href="http://localhost:3001/cimi/resource_metadata" /&gt;
+  &lt;machines href="http://localhost:3001/cimi/machines" /&gt;
+  &lt;machineTemplates href="http://localhost:3001/cimi/machine_templates" /&gt;
+  &lt;machineImages href="http://localhost:3001/cimi/machine_images" /&gt;
+  &lt;credentials href="http://localhost:3001/cimi/credentials" /&gt;
+  &lt;volumes href="http://localhost:3001/cimi/volumes" /&gt;
+  &lt;volumeImages href="http://localhost:3001/cimi/volume_images" /&gt;
+  &lt;networks href="http://localhost:3001/cimi/networks" /&gt;
+  &lt;networkTemplates href="http://localhost:3001/cimi/network_templates" /&gt;
+  &lt;networkPorts href="http://localhost:3001/cimi/network_ports" /&gt;
+  &lt;networkPortTemplates href="http://localhost:3001/cimi/network_port_templates" /&gt;
+  &lt;addresses href="http://localhost:3001/cimi/addresses" /&gt;
+  &lt;addressTemplates href="http://localhost:3001/cimi/address_templates" /&gt;
+  &lt;forwardingGroups href="http://localhost:3001/cimi/forwarding_groups" /&gt;
+  &lt;forwardingGroupTemplates href="http://localhost:3001/cimi/forwarding_group_templates" /&gt;
+  &lt;volumeConfigs href="http://localhost:3001/cimi/volume_configurations" /&gt;
+  &lt;machineConfigs href="http://localhost:3001/cimi/machine_configurations" /&gt;
+  &lt;networkConfigs href="http://localhost:3001/cimi/network_configurations" /&gt;
+  &lt;networkPortConfigs href="http://localhost:3001/cimi/network_port_configurations" /&gt;
+&lt;/CloudEntryPoint&gt;
+</pre>
+
+      <footer class="footer">
+        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
+        <div class='row'>
+          <div class='span3'>
+            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
+          </div>
+          <div class='span9'>
+            <strong>Apache Deltacloud</strong> is a top-level project at the <a
+              href="http://www.apache.org">Apache Software Foundation</a>,
+            having graduated from the ASF Incubator in October
+            2011. Through a collaborative and meritocratic development process, Apache
+            projects deliver enterprise-grade, freely available software products that
+            attract large communities of users. 
+          </div>
+        </div>
+      </footer>
+
+    </div> <!-- /container -->
+
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-rest/cimi-rest-machine-configs.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-machine-configs.html b/site/output/cimi-rest/cimi-rest-machine-configs.html
new file mode 100644
index 0000000..fe22479
--- /dev/null
+++ b/site/output/cimi-rest/cimi-rest-machine-configs.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>CIMI Resource Collections - Machine Configuration</title>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le JavaScript -->
+    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
+    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
+    <script src="/assets/js/application.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-transition.js"></script>
+    <script src="/assets/js/bootstrap-alert.js"></script>
+    <script src="/assets/js/bootstrap-modal.js"></script>
+    <script src="/assets/js/bootstrap-scrollspy.js"></script>
+    <script src="/assets/js/bootstrap-tab.js"></script>
+    <script src="/assets/js/bootstrap-tooltip.js"></script>
+    <script src="/assets/js/bootstrap-popover.js"></script>
+    <script src="/assets/js/bootstrap-button.js"></script>
+    <script src="/assets/js/bootstrap-collapse.js"></script>
+    <script src="/assets/js/bootstrap-carousel.js"></script>
+    <script src="/assets/js/bootstrap-typeahead.js"></script>
+
+    <!-- Le styles -->
+    <link href="/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="/assets/css/application.css" rel="stylesheet">
+    <link rel="shortcut icon" href="/assets/img/favicon.ico">
+  </head>
+
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
+            alt="Deltacloud API"/></a>
+          <ul class="nav top-nav">
+  <li><a href="/">Home</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/about.html">What is Deltacloud?</a></li>
+      <li><a href="/supported-providers.html">Supported Providers</a></li>
+    </ul>
+  </li>
+  <li><a href="/download.html">Download</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
+      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/usage.html#usingapi">Using API</a></li>
+      <li><a href="/usage.html#clients">Client Libraries</a></li>
+      <li><a href="/command-tools.html">Command Line Tools</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/getting-sources.html">Getting Sources</a></li>
+      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/rest-api.html">REST API</a></li>
+      <li><a href="/drivers.html">Drivers API</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
+      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
+    </ul>
+  </li>
+  <li><a href="/contact.html">Contact</a></li>
+</ul>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="container content">
+
+      <p><br></p>
+
+<div class="row">
+  <div class="span9">
+
+<h3 id="cimi-machine-config">Machine Configuration</h3>
+<p>
+<strong><em>
+The Machine Configuration resource represents the set of configuration values that define the (virtual)
+hardware resources of a to-be-realized Machine Instance. Machine Configurations are created by
+Providers and may, at the Providers discretion, be created by Consumers.
+
+A Machine Configuration Collection resource represents the collection of Machine Configuration
+resources within a Provider
+</em></strong>
+</p>
+
+  </div>
+  <div class="span3">
+
+<ul class="nav nav-list well">
+<li class="nav-header">
+    CIMI REST API
+  </li>
+  <li><a href="../cimi-rest.html">Introduction</a></li>
+  <li><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      CIMI Resources
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+<li><a href="cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="cimi-rest-collections.html">Machine</a></li>
+      <li><a href="cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+</li>
+  <hr>
+<li class="nav-header">
+    Machine Resources
+  </li>
+  <ul class="nav nav-list">
+<li><a href="cimi-rest-collections.html">Machine</a></li>
+    <li><a href="cimi-rest-machine-images.html">MachineImage</a></li>
+    <li class="active"><a href="cimi-rest-machine-configs.html">MachineConfiguration</a></li>
+    <li><a href="cimi-rest-machine-templates.html">MachineTemplate</a></li>
+  </ul>
+</ul>
+</div>
+
+</div>
+
+<ul class="nav nav-pills">
+<li class="active"><a href="#config-collection" data-toggle="tab">Retrieve the Machine Configuration Collection</a></li>
+  <li><a href="#single-config" data-toggle="tab">Retrieve a single Machine Configuration</a></li>
+</ul><hr><div class="tab-content">
+  <div class="tab-pane active" id="config-collection">
+
+<h4>Retrieve the Machine Configuration Collection</h4>
+
+<p>Example request:</p>
+<pre>
+GET /cimi/machine_configurations HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+</pre>
+
+<p>Server response:</p>
+<pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 1504
+ETag: 69348a8afa58a1c35b6cfad7c4066a9e
+Cache-Control: max-age=0, private, must-revalidate
+Date: Wed, 02 Jan 2013 14:12:23 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Collection xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/MachineConfigurationCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machine_configurations&lt;/id&gt;
+  &lt;count&gt;3&lt;/count&gt;
+  &lt;MachineConfiguration&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machine_configurations/m1-small&lt;/id&gt;
+    &lt;name&gt;m1-small&lt;/name&gt;
+    &lt;description&gt;Machine Configuration with 1782579 KiB of memory and 1 CPU&lt;/description&gt;
+    &lt;created&gt;2013-01-02T16:12:23+02:00&lt;/created&gt;
+    &lt;cpu&gt;1&lt;/cpu&gt;
+    &lt;memory&gt;1782579&lt;/memory&gt;
+    &lt;disk&gt;
+      &lt;capacity&gt;167772160&lt;/capacity&gt;
+      &lt;format&gt;unknown&lt;/format&gt;
+    &lt;/disk&gt;
+  &lt;/MachineConfiguration&gt;
+  &lt;MachineConfiguration&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machine_configurations/m1-large&lt;/id&gt;
+    &lt;name&gt;m1-large&lt;/name&gt;
+    &lt;description&gt;Machine Configuration with 10485760 KiB of memory and 1 CPU&lt;/description&gt;
+    &lt;created&gt;2013-01-02T16:12:23+02:00&lt;/created&gt;
+    &lt;cpu&gt;1&lt;/cpu&gt;
+    &lt;memory&gt;10485760&lt;/memory&gt;
+    &lt;disk&gt;
+      &lt;capacity&gt;891289600&lt;/capacity&gt;
+      &lt;format&gt;unknown&lt;/format&gt;
+    &lt;/disk&gt;
+  &lt;/MachineConfiguration&gt;
+  &lt;MachineConfiguration&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machine_configurations/m1-xlarge&lt;/id&gt;
+    &lt;name&gt;m1-xlarge&lt;/name&gt;
+    &lt;description&gt;Machine Configuration with 12582912 KiB of memory and 4 CPU&lt;/description&gt;
+    &lt;created&gt;2013-01-02T16:12:23+02:00&lt;/created&gt;
+    &lt;cpu&gt;4&lt;/cpu&gt;
+    &lt;memory&gt;12582912&lt;/memory&gt;
+    &lt;disk&gt;
+      &lt;capacity&gt;1073741824&lt;/capacity&gt;
+      &lt;format&gt;unknown&lt;/format&gt;
+    &lt;/disk&gt;
+  &lt;/MachineConfiguration&gt;
+&lt;/Collection&gt;
+</pre>
+  </div>
+
+
+  <div class="tab-pane" id="single-config">
+
+<h4>Retrieve a single Machine Configuration</h4>
+
+<p>Example request:</p>
+<pre>
+GET /cimi/machine_configurations/m1-large HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+</pre>
+
+<p>Server response:</p>
+<pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 508
+ETag: 33c094bbcec51437860280fd053f1023
+Cache-Control: max-age=0, private, must-revalidate
+Date: Wed, 02 Jan 2013 14:20:52 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;MachineConfiguration xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/MachineConfiguration"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machine_configurations/m1-large&lt;/id&gt;
+  &lt;name&gt;m1-large&lt;/name&gt;
+  &lt;description&gt;Machine Configuration with 10485760 KiB of memory and 1 CPU&lt;/description&gt;
+  &lt;created&gt;2013-01-02T16:20:52+02:00&lt;/created&gt;
+  &lt;cpu&gt;1&lt;/cpu&gt;
+  &lt;memory&gt;10485760&lt;/memory&gt;
+  &lt;disk&gt;
+    &lt;capacity&gt;891289600&lt;/capacity&gt;
+    &lt;format&gt;unknown&lt;/format&gt;
+  &lt;/disk&gt;
+&lt;/MachineConfiguration&gt;
+
+
+</pre>
+  </div>
+</div>
+
+      <footer class="footer">
+        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
+        <div class='row'>
+          <div class='span3'>
+            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
+          </div>
+          <div class='span9'>
+            <strong>Apache Deltacloud</strong> is a top-level project at the <a
+              href="http://www.apache.org">Apache Software Foundation</a>,
+            having graduated from the ASF Incubator in October
+            2011. Through a collaborative and meritocratic development process, Apache
+            projects deliver enterprise-grade, freely available software products that
+            attract large communities of users. 
+          </div>
+        </div>
+      </footer>
+
+    </div> <!-- /container -->
+
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-rest/cimi-rest-machine-images.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-machine-images.html b/site/output/cimi-rest/cimi-rest-machine-images.html
new file mode 100644
index 0000000..12ad908
--- /dev/null
+++ b/site/output/cimi-rest/cimi-rest-machine-images.html
@@ -0,0 +1,374 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>CIMI Resource Collections - Machine Image</title>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le JavaScript -->
+    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
+    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
+    <script src="/assets/js/application.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-transition.js"></script>
+    <script src="/assets/js/bootstrap-alert.js"></script>
+    <script src="/assets/js/bootstrap-modal.js"></script>
+    <script src="/assets/js/bootstrap-scrollspy.js"></script>
+    <script src="/assets/js/bootstrap-tab.js"></script>
+    <script src="/assets/js/bootstrap-tooltip.js"></script>
+    <script src="/assets/js/bootstrap-popover.js"></script>
+    <script src="/assets/js/bootstrap-button.js"></script>
+    <script src="/assets/js/bootstrap-collapse.js"></script>
+    <script src="/assets/js/bootstrap-carousel.js"></script>
+    <script src="/assets/js/bootstrap-typeahead.js"></script>
+
+    <!-- Le styles -->
+    <link href="/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="/assets/css/application.css" rel="stylesheet">
+    <link rel="shortcut icon" href="/assets/img/favicon.ico">
+  </head>
+
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
+            alt="Deltacloud API"/></a>
+          <ul class="nav top-nav">
+  <li><a href="/">Home</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/about.html">What is Deltacloud?</a></li>
+      <li><a href="/supported-providers.html">Supported Providers</a></li>
+    </ul>
+  </li>
+  <li><a href="/download.html">Download</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
+      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/usage.html#usingapi">Using API</a></li>
+      <li><a href="/usage.html#clients">Client Libraries</a></li>
+      <li><a href="/command-tools.html">Command Line Tools</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/getting-sources.html">Getting Sources</a></li>
+      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/rest-api.html">REST API</a></li>
+      <li><a href="/drivers.html">Drivers API</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
+      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
+    </ul>
+  </li>
+  <li><a href="/contact.html">Contact</a></li>
+</ul>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="container content">
+
+      <p><br></p>
+
+<div class="row">
+  <div class="span9">
+
+<h3 id="cimi-machine-image">Machine Image</h3>
+<p>
+<strong><em>
+This resource represents the information necessary for hardware virtualized resources to create a Machine Instance; it contains configuration data such as startup instructions, including possible combinations of the following items, depending on the 'type' of Machine Image created: the software image, installation software, both a disk image and a set of software and parameters. <br><br>
+A Machine Image Collection resource represents the collection of Machine Image resources within a Provider.
+</em></strong>
+</p>
+
+  </div>
+  <div class="span3">
+
+
+<ul class="nav nav-list well">
+<li class="nav-header">
+    CIMI REST API
+  </li>
+  <li><a href="../cimi-rest.html">Introduction</a></li>
+  <li><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      CIMI Resources
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+<li><a href="cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="cimi-rest-collections.html">Machine</a></li>
+      <li><a href="cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+</li>
+  <hr>
+<li class="nav-header">
+    Machine Resources
+  </li>
+  <ul class="nav nav-list">
+<li><a href="cimi-rest-collections.html">Machine</a></li>
+    <li class="active"><a href="cimi-rest-machine-images.html">MachineImage</a></li>
+    <li><a href="cimi-rest-machine-configs.html">MachineConfiguration</a></li>
+    <li><a href="cimi-rest-machine-templates.html">MachineTemplate</a></li>
+  </ul>
+</ul>
+</div>
+
+</div>
+
+<ul class="nav nav-pills">
+<li class="active"><a href="#image-collection" data-toggle="tab">Retrieve the Machine Image Collection</a></li>
+  <li><a href="#single-image" data-toggle="tab">Retrieve a single Machine Image</a></li>
+  <li><a href="#create-image" data-toggle="tab">Create or Delete a Machine Image</a></li>
+</ul><hr><div class="tab-content">
+  <div class="tab-pane active" id="image-collection">
+
+<h4>Retrieve the Machine Image Collection</h4>
+
+<p>
+Note the 'add' URI of the Machine Image Collection resource in the example response below. This is the URI that is used for creating a new Machine Image (adding to the Machine Image Collection). This URI is also returned when dereferencing a Machine resource, as the href attribute of the 'capture' operation (when this is possible for the given Machine on the particular Cloud Provider).
+</p>
+
+<p>Example request:</p>
+<pre>
+GET /cimi/machine_images HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+</pre>
+
+<p>Server response:</p>
+<pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 1195
+ETag: e2f73ed48eb2abeae77322eea56dfc5d
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 28 Dec 2012 14:23:35 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Collection xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/MachineImageCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machine_images&lt;/id&gt;
+  &lt;count&gt;3&lt;/count&gt;
+  &lt;MachineImage&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machine_images/img1&lt;/id&gt;
+    &lt;name&gt;img1&lt;/name&gt;
+    &lt;description&gt;Fedora 10&lt;/description&gt;
+    &lt;created&gt;2012-12-28T16:23:35+02:00&lt;/created&gt;
+    &lt;state&gt;AVAILABLE&lt;/state&gt;
+    &lt;type&gt;IMAGE&lt;/type&gt;
+    &lt;imageLocation&gt;mock://img1&lt;/imageLocation&gt;
+  &lt;/MachineImage&gt;
+  &lt;MachineImage&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machine_images/img2&lt;/id&gt;
+    &lt;name&gt;img2&lt;/name&gt;
+    &lt;description&gt;Fedora 10&lt;/description&gt;
+    &lt;created&gt;2012-12-28T16:23:35+02:00&lt;/created&gt;
+    &lt;state&gt;AVAILABLE&lt;/state&gt;
+    &lt;type&gt;IMAGE&lt;/type&gt;
+    &lt;imageLocation&gt;mock://img2&lt;/imageLocation&gt;
+  &lt;/MachineImage&gt;
+  &lt;MachineImage&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machine_images/img3&lt;/id&gt;
+    &lt;name&gt;img3&lt;/name&gt;
+    &lt;description&gt;JBoss&lt;/description&gt;
+    &lt;created&gt;2012-12-28T16:23:35+02:00&lt;/created&gt;
+    &lt;state&gt;AVAILABLE&lt;/state&gt;
+    &lt;type&gt;IMAGE&lt;/type&gt;
+    &lt;imageLocation&gt;mock://img3&lt;/imageLocation&gt;
+  &lt;/MachineImage&gt;
+  &lt;operation rel="add" href="http://localhost:3001/cimi/machine_images" /&gt;
+&lt;/Collection&gt;
+</pre>
+
+  </div>
+  <div class="tab-pane" id="single-image">
+
+<h4>Retrieve a single Machine Image</h4>
+
+<p>Example request:</p>
+
+<pre>
+GET /cimi/machine_images/img1 HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+</pre>
+
+<p>Server response:</p>
+
+<pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 385
+ETag: 130f8e9592138afc544d65d73039e540
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 28 Dec 2012 14:55:42 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;MachineImage xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/MachineImage"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machine_images/img1&lt;/id&gt;
+  &lt;name&gt;img1&lt;/name&gt;
+  &lt;description&gt;Fedora 10&lt;/description&gt;
+  &lt;created&gt;2012-12-28T16:55:42+02:00&lt;/created&gt;
+  &lt;state&gt;AVAILABLE&lt;/state&gt;
+  &lt;type&gt;IMAGE&lt;/type&gt;
+  &lt;imageLocation&gt;mock://img1&lt;/imageLocation&gt;
+&lt;/MachineImage&gt;
+</pre>
+
+  </div>
+
+  <div class="tab-pane" id="create-image">
+
+
+<h4>Create a new Machine Image</h4>
+
+<p>
+The example below shows the creation of a new Machine Image resource from an existing Machine resource. When supported by the Machine and the given Cloud Provider, the href attribute of the serialized Machine resource's 'capture' operation provides the URI to which the request body should be sent with HTTP POST in order to create the new Machine Image. The message body is the representation of the to be created Machine Image resource, with the 'imageLocation' attribute referring to the Machine resource from which the Machine Image is to be created, as shown in the example below:
+</p>
+
+<p>Example request:</p>
+
+<pre>
+POST /cimi/machine_images HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Content-Type: application/xml
+Accept: application/xml
+Content-Length: 188
+&lt;MachineImage&gt;
+  &lt;name&gt;some_name&lt;/name&gt;
+  &lt;description&gt;my new machine_image&lt;/description&gt;
+  &lt;type&gt;IMAGE&lt;/type&gt;
+  &lt;imageLocation&gt;http://localhost:3001/cimi/machines/inst1&lt;/imageLocation&gt;
+&lt;/MachineImage&gt;
+</pre>
+
+<p>Server response:</p>
+
+<pre>
+HTTP/1.1 201 Created
+Content-Type: application/xml
+Location: http://localhost:3001/cimi/machine_images/some_name
+CIMI-Specification-Version: 1.0.1
+Content-Length: 411
+ETag: c929191a65da6564f9f69301d38eb6fc
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 28 Dec 2012 15:10:12 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;MachineImage xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/MachineImage"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machine_images/some_name&lt;/id&gt;
+  &lt;name&gt;some_name&lt;/name&gt;
+  &lt;description&gt;my new machine image&lt;/description&gt;
+  &lt;created&gt;2012-12-28T17:10:12+02:00&lt;/created&gt;
+  &lt;state&gt;AVAILABLE&lt;/state&gt;
+  &lt;type&gt;IMAGE&lt;/type&gt;
+  &lt;imageLocation&gt;mock://some_name&lt;/imageLocation&gt;
+&lt;/MachineImage&gt;
+</pre>
+
+<br><hr>
+<h4>Delete a Machine Image</h4>
+
+<p>Example request:</p>
+
+<pre>
+DELETE /cimi/machine_images/some_name HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+</pre>
+
+<p>Server response:</p>
+
+<pre>
+HTTP/1.1 200 OK
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+X-Content-Type-Options: nosniff
+Content-Type: text/html;charset=utf-8
+CIMI-Specification-Version: 1.0.1
+Content-Length: 0
+Date: Fri, 28 Dec 2012 15:21:14 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+</pre>
+
+  </div>
+</div>
+
+      <footer class="footer">
+        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
+        <div class='row'>
+          <div class='span3'>
+            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
+          </div>
+          <div class='span9'>
+            <strong>Apache Deltacloud</strong> is a top-level project at the <a
+              href="http://www.apache.org">Apache Software Foundation</a>,
+            having graduated from the ASF Incubator in October
+            2011. Through a collaborative and meritocratic development process, Apache
+            projects deliver enterprise-grade, freely available software products that
+            attract large communities of users. 
+          </div>
+        </div>
+      </footer>
+
+    </div> <!-- /container -->
+
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-rest/cimi-rest-machine-templates.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-machine-templates.html b/site/output/cimi-rest/cimi-rest-machine-templates.html
new file mode 100644
index 0000000..3e94ed0
--- /dev/null
+++ b/site/output/cimi-rest/cimi-rest-machine-templates.html
@@ -0,0 +1,364 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>CIMI Resource Collections - Machine Template</title>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le JavaScript -->
+    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
+    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
+    <script src="/assets/js/application.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-transition.js"></script>
+    <script src="/assets/js/bootstrap-alert.js"></script>
+    <script src="/assets/js/bootstrap-modal.js"></script>
+    <script src="/assets/js/bootstrap-scrollspy.js"></script>
+    <script src="/assets/js/bootstrap-tab.js"></script>
+    <script src="/assets/js/bootstrap-tooltip.js"></script>
+    <script src="/assets/js/bootstrap-popover.js"></script>
+    <script src="/assets/js/bootstrap-button.js"></script>
+    <script src="/assets/js/bootstrap-collapse.js"></script>
+    <script src="/assets/js/bootstrap-carousel.js"></script>
+    <script src="/assets/js/bootstrap-typeahead.js"></script>
+
+    <!-- Le styles -->
+    <link href="/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="/assets/css/application.css" rel="stylesheet">
+    <link rel="shortcut icon" href="/assets/img/favicon.ico">
+  </head>
+
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
+            alt="Deltacloud API"/></a>
+          <ul class="nav top-nav">
+  <li><a href="/">Home</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/about.html">What is Deltacloud?</a></li>
+      <li><a href="/supported-providers.html">Supported Providers</a></li>
+    </ul>
+  </li>
+  <li><a href="/download.html">Download</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
+      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/usage.html#usingapi">Using API</a></li>
+      <li><a href="/usage.html#clients">Client Libraries</a></li>
+      <li><a href="/command-tools.html">Command Line Tools</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/getting-sources.html">Getting Sources</a></li>
+      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/rest-api.html">REST API</a></li>
+      <li><a href="/drivers.html">Drivers API</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
+      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
+    </ul>
+  </li>
+  <li><a href="/contact.html">Contact</a></li>
+</ul>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="container content">
+
+      <p><br></p>
+
+<div class="row">
+  <div class="span9">
+
+<h3 id="cimi-machine-template">Machine Template</h3>
+<p>
+<strong><em>
+A Machine Template represents the set of metadata and instructions used in the creation of a Machine.
+
+A Machine Template Collection resource represents the collection of Machine Template resources within
+a Provider.
+</em></strong>
+</p>
+
+<p>
+The CIMI specification follows a distinctive pattern with respect to creation of new resources - the machine template is a good example of this:
+</p>
+
+<pre>
+machineConfiguration + machineImage = machineTemplate ===&gt; machine
+</pre>
+
+<p>
+A CIMI client (a <strong>consumer</strong> in CIMI terminology) uses a Machine Template to <a href="../cimi-rest-collections.html#create-machine"> create a new Machine</a>; a Machine Template consists of (amongst other attributes) a Machine Configuration and a Machine Image. Generally speaking - many CIMI resources require use of a template for their creation and a template will typically consist of an image plus a configuration resource.
+</p>
+
+  </div>
+  <div class="span3">
+
+<ul class="nav nav-list well">
+<li class="nav-header">
+    CIMI REST API
+  </li>
+  <li><a href="../cimi-rest.html">Introduction</a></li>
+  <li><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      CIMI Resources
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+<li><a href="cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="cimi-rest-collections.html">Machine</a></li>
+      <li><a href="cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+</li>
+  <hr>
+<li class="nav-header">
+    Machine Resources
+  </li>
+  <ul class="nav nav-list">
+<li><a href="cimi-rest-collections.html">Machine</a></li>
+    <li><a href="cimi-rest-machine-images.html">MachineImage</a></li>
+    <li><a href="cimi-rest-machine-configs.html">MachineConfiguration</a></li>
+    <li class="active"><a href="cimi-rest-machine-templates.html">MachineTemplate</a></li>
+  </ul>
+</ul>
+</div>
+
+</div>
+
+<ul class="nav nav-pills">
+<li class="active"><a href="#template-collection" data-toggle="tab">Retrieve the Machine Template Collection</a></li>
+  <li><a href="#single-template" data-toggle="tab">Retrieve a single Machine Template</a></li>
+  <li><a href="#create-template" data-toggle="tab">Create a new Machine Template</a></li>
+  <li><a href="#delete-template" data-toggle="tab">Delete a Machine Template</a></li>
+</ul><hr><div class="tab-content">
+  <div class="tab-pane active" id="template-collection">
+
+<h4>Retrieve the Machine Template Collection</h4>
+<p>Example request:</p>
+<pre>
+GET /cimi/machine_templates HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+</pre>
+
+<p>Server response:</p>
+<pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 1275
+ETag: fba471ae32eca2b58fa02644b81b73aa
+Cache-Control: max-age=0, private, must-revalidate
+Date: Thu, 03 Jan 2013 15:04:26 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Collection xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/MachineTemplateCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machine_templates&lt;/id&gt;
+  &lt;count&gt;2&lt;/count&gt;
+  &lt;MachineTemplate&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machine_templates/1&lt;/id&gt;
+    &lt;name&gt;myXmlTestMachineTemplate1&lt;/name&gt;
+    &lt;description&gt;Description of my MachineTemplate&lt;/description&gt;
+    &lt;property key="test"&gt;value&lt;/property&gt;
+    &lt;machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-xlarge" /&gt;
+    &lt;machineImage href="http://localhost:3001/cimi/machine_images/img3" /&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete"
+          href="http://localhost:3001/cimi/machine_templates/1" /&gt;
+  &lt;/MachineTemplate&gt;
+  &lt;MachineTemplate&gt;
+    &lt;id&gt;http://localhost:3001/cimi/machine_templates/2&lt;/id&gt;
+    &lt;name&gt;my_template_2&lt;/name&gt;
+    &lt;description&gt;Description of my MachineTemplate&lt;/description&gt;
+    &lt;property key="test"&gt;value&lt;/property&gt;
+    &lt;machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-small" /&gt;
+    &lt;machineImage href="http://localhost:3001/cimi/machine_images/img1" /&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete"
+          href="http://localhost:3001/cimi/machine_templates/2" /&gt;
+  &lt;/MachineTemplate&gt;
+&lt;/Collection&gt;
+</pre>
+  </div>
+
+  <div class="tab-pane" id="single-template">
+
+<h4>Retrieve a single Machine Template</h4>
+<p>Example request:</p>
+<pre>
+GET /cimi/machine_templates/2 HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+</pre>
+
+<p>Server response:</p>
+<pre>
+HTTP/1.1 200 OK
+Content-Type: application/xml
+CIMI-Specification-Version: 1.0.1
+Content-Length: 607
+ETag: 8f720ffacb6439a6920a5f5b0ec7bbfc
+Cache-Control: max-age=0, private, must-revalidate
+Date: Thu, 03 Jan 2013 15:06:14 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;MachineTemplate xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/MachineTemplate"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machine_templates/2&lt;/id&gt;
+  &lt;name&gt;my_template_2&lt;/name&gt;
+  &lt;description&gt;Description of my MachineTemplate&lt;/description&gt;
+  &lt;property key="test"&gt;value&lt;/property&gt;
+  &lt;machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-small" /&gt;
+  &lt;machineImage href="http://localhost:3001/cimi/machine_images/img1" /&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete"
+          href="http://localhost:3001/cimi/machine_templates/2" /&gt;
+&lt;/MachineTemplate&gt;
+</pre>
+  </div>
+
+  <div class="tab-pane" id="create-template">
+
+<h4>Create a new Machine Template</h4>
+<p>Example request:</p>
+<pre>
+POST /cimi/machine_templates HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Content-Type: application/xml
+Accept: application/xml
+Content-Length: 334
+
+&lt;MachineTemplateCreate&gt;
+  &lt;name&gt;myXmlTestMachineTemplate1&lt;/name&gt;
+  &lt;description&gt;Description of my MachineTemplate&lt;/description&gt;
+  &lt;property key="test"&gt;value&lt;/property&gt;
+  &lt;machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-xlarge"/&gt;
+  &lt;machineImage href="http://localhost:3001/cimi/machine_images/img3"/&gt;
+&lt;/MachineTemplateCreate&gt;
+</pre>
+
+<p>Server response:</p>
+<pre>
+HTTP/1.1 201 Created
+Content-Type: application/xml
+Location: http://localhost:3001/cimi/machine_templates/1
+CIMI-Specification-Version: 1.0.1
+Content-Length: 620
+ETag: e848e33fa0886e6c3d2df3cb674485d7
+Cache-Control: max-age=0, private, must-revalidate
+Date: Thu, 03 Jan 2013 14:48:03 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;MachineTemplate xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/MachineTemplate"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machine_templates/1&lt;/id&gt;
+  &lt;name&gt;myXmlTestMachineTemplate1&lt;/name&gt;
+  &lt;description&gt;Description of my MachineTemplate&lt;/description&gt;
+  &lt;property key="test"&gt;value&lt;/property&gt;
+  &lt;machineConfig href="http://localhost:3001/cimi/machine_configurations/m1-xlarge" /&gt;
+  &lt;machineImage href="http://localhost:3001/cimi/machine_images/img3" /&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete" href="http://localhost:3001/cimi/machine_templates/1" /&gt;
+&lt;/MachineTemplate&gt;
+
+</pre>
+  </div>
+
+  <div class="tab-pane" id="delete-template">
+
+<h4>Delete a Machine Template</h4>
+<p>Example request:</p>
+<pre>
+DELETE /cimi/machine_templates/2 HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
+Host: localhost:3001
+Accept: application/xml
+</pre>
+
+<p>Server response:</p>
+<pre>
+HTTP/1.1 200 OK
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 1; mode=block
+X-Content-Type-Options: nosniff
+Content-Type: text/html;charset=utf-8
+CIMI-Specification-Version: 1.0.1
+Content-Length: 0
+Date: Thu, 03 Jan 2013 15:06:38 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+</pre>
+  </div>
+</div>
+
+      <footer class="footer">
+        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
+        <div class='row'>
+          <div class='span3'>
+            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
+          </div>
+          <div class='span9'>
+            <strong>Apache Deltacloud</strong> is a top-level project at the <a
+              href="http://www.apache.org">Apache Software Foundation</a>,
+            having graduated from the ASF Incubator in October
+            2011. Through a collaborative and meritocratic development process, Apache
+            projects deliver enterprise-grade, freely available software products that
+            attract large communities of users. 
+          </div>
+        </div>
+      </footer>
+
+    </div> <!-- /container -->
+
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+  </body>
+</html>


Mime
View raw message