deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [4/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/content/cimi-rest/cimi-rest-machine-images.md
----------------------------------------------------------------------
diff --git a/site/content/cimi-rest/cimi-rest-machine-images.md b/site/content/cimi-rest/cimi-rest-machine-images.md
new file mode 100644
index 0000000..749d94e
--- /dev/null
+++ b/site/content/cimi-rest/cimi-rest-machine-images.md
@@ -0,0 +1,256 @@
+---
+site_name: Deltacloud API
+title: CIMI Resource Collections - Machine Image
+---
+
+<br/>
+
+<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/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/cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="/cimi-rest/cimi-rest-collections.html">Machine</a></li>
+      <li><a href="/cimi-rest/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/cimi-rest-collections.html">Machine</a></li>
+    <li class="active"><a href="/cimi-rest/cimi-rest-machine-images.html">MachineImage</a></li>
+    <li><a href="/cimi-rest/cimi-rest-machine-configs.html">MachineConfiguration</a></li>
+    <li><a href="/cimi-rest/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>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/content/cimi-rest/cimi-rest-machine-templates.md
----------------------------------------------------------------------
diff --git a/site/content/cimi-rest/cimi-rest-machine-templates.md b/site/content/cimi-rest/cimi-rest-machine-templates.md
new file mode 100644
index 0000000..a9a253f
--- /dev/null
+++ b/site/content/cimi-rest/cimi-rest-machine-templates.md
@@ -0,0 +1,244 @@
+---
+site_name: Deltacloud API
+title: CIMI Resource Collections - Machine Template
+---
+
+<br/>
+
+<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 ===> 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/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/cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="/cimi-rest/cimi-rest-collections.html">Machine</a></li>
+      <li><a href="/cimi-rest/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/cimi-rest-collections.html">Machine</a></li>
+    <li><a href="/cimi-rest/cimi-rest-machine-images.html">MachineImage</a></li>
+    <li><a href="/cimi-rest/cimi-rest-machine-configs.html">MachineConfiguration</a></li>
+    <li class="active"><a href="/cimi-rest/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>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/content/cimi-rest/cimi-rest-resource-metadata.md
----------------------------------------------------------------------
diff --git a/site/content/cimi-rest/cimi-rest-resource-metadata.md b/site/content/cimi-rest/cimi-rest-resource-metadata.md
new file mode 100644
index 0000000..df1fe32
--- /dev/null
+++ b/site/content/cimi-rest/cimi-rest-resource-metadata.md
@@ -0,0 +1,487 @@
+---
+site_name: Deltacloud API
+title: CIMI Resource Collections - Resource Metadata
+---
+
+<br/>
+
+<div class="row">
+  <div class="span9">
+
+<h3 id="cimi-resource-metadata">Resource Metadata</h3>
+<p>
+<strong><em>
+ResourceMetadata may be used to:
+<ul>
+<li>Express constraints on the existing CIMI defined resource attributes (e.g., express a maximum for
+the 'cpu' attribute of the MachineConfiguration resource) </li>
+<li> Introduce new attributes for CIMI defined resources together with any constraints governing these
+(e.g., a new 'location' attribute for the Volume resource that takes values from a defined set of strings)</li>
+<li> Introduce new operations for any of the CIMI defined resources (e.g., define a new 'compress'
+operation for the Volume resource)</li>
+<li> Express any Provider specific capabilities or features (e.g., the length of time that a Job resource
+will be retained after Job completion and before this is deleted)</li>
+</ul>
+
+Implementations of this specification should allow for Consumers to discover the metadata associated
+with each supported resource. Doing so allows for the discovery of Provider defined constraints on the
+CIMI defined attributes as well as discovery of any new extension attributes or operations that the
+Provider may have defined. ResourceMetadata can also be used to express any Provider specific
+capabilities or features. The mechanism by which this metadata is made available will be protocol
+specific.
+</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/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/cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="/cimi-rest/cimi-rest-collections.html">Machine</a></li>
+      <li><a href="/cimi-rest/cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+  </li>
+  <hr/>
+  <li class="nav-header">
+    Resource Metadata
+  </li>
+
+</ul>
+
+  </div>
+
+</div>
+
+
+<ul class="nav nav-pills">
+  <li class="active"><a href="#resource-metadata" data-toggle="tab">Retrieve the ResourceMetadata Collection</a></li>
+  <li><a href="#resource-metadata-capabilities" data-toggle="tab">ResourceMetadata Capabilities</a></li>
+</ul>
+
+
+<div class="tab-content">
+  <div class="tab-pane active" id="resource-metadata">
+
+<h4>Retrieve the ResourceMetadata Collection</h4>
+
+<p>Example request:</p>
+
+<pre>
+GET /cimi/resource_metadata HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu) libcurl/7.24.0 NSS/3.13.5.0 zlib/1.2.5 libidn/1.24 libssh2/1.4.1
+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: 1675
+ETag: 97a131617573093b156505f77202bf57
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 11 Jan 2013 15:29:14 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/ResourceMetadataCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/resource_metadata&lt;/id&gt;
+  &lt;count&gt;2&lt;/count&gt;
+  &lt;ResourceMetadata&gt;
+    &lt;id&gt;http://localhost:3001/cimi/resource_metadata/cloud_entry_point&lt;/id&gt;
+    &lt;name&gt;CloudEntryPoint&lt;/name&gt;
+    &lt;typeUri&gt;http://schemas.dmtf.org/cimi/1/CloudEntryPoint&lt;/typeUri&gt;
+    &lt;attribute name="driver" namespace="http://deltacloud.org/cimi/CloudEntryPoint/driver"
+          type="text" required="true" /&gt;
+    &lt;attribute name="provider" namespace="http://deltacloud.org/cimi/CloudEntryPoint/provider"
+          type="text" required="true" /&gt;
+  &lt;/ResourceMetadata&gt;
+  &lt;ResourceMetadata&gt;
+    &lt;id&gt;http://localhost:3001/cimi/resource_metadata/machine&lt;/id&gt;
+    &lt;name&gt;Machine&lt;/name&gt;
+    &lt;typeUri&gt;http://schemas.dmtf.org/cimi/1/Machine&lt;/typeUri&gt;
+    &lt;attribute name="realm" namespace="http://deltacloud.org/cimi/Machine/realm"
+           type="text" required="false"&gt;
+      &lt;constraint&gt;
+        &lt;value&gt;us&lt;/value&gt;
+      &lt;/constraint&gt;
+      &lt;constraint&gt;
+        &lt;value&gt;eu&lt;/value&gt;
+      &lt;/constraint&gt;
+    &lt;/attribute&gt;
+    &lt;attribute name="machine_image"
+          namespace="http://deltacloud.org/cimi/Machine/machine_image" type="URI"
+          required="false" /&gt;
+    &lt;capability name="DefaultInitialState"
+          uri="http://schemas.dmtf.org/cimi/1/capability/Machine/DefaultInitialState"
+          description="Indicates what the default initial state of a new Machine "&gt;
+          STARTED
+    &lt;/capability&gt;
+    &lt;capability name="InitialStates"
+          uri="http://schemas.dmtf.org/cimi/1/capability/Machine/InitialStates"
+          description="Indicates the list of allowable initial states"&gt;
+          STARTED,STOPPED
+    &lt;/capability&gt;
+  &lt;/ResourceMetadata&gt;
+&lt;/Collection&gt;
+</pre>
+
+  </div>
+
+  <div class="tab-pane" id="resource-metadata-capabilities">
+
+<h4>ResourceMetadata Capabilities</h4>
+<br/>
+<p>
+<strong><em>
+The following table describes the capability URIs defined by this specification. Providers may define new
+URIs and it is recommended that these URIs be dereferencable such that Consumers can discover the
+details of the new capability. The "Resource Name" column contains the name of the resource that may
+contain the specified capability within its ResourceMetadata. The "Capability Name" column contains the
+name of the specified capability and shall be unique within the scope of the corresponding resource. Each
+capability's URI shall be constructed by appending the "Resource Name", a slash(/), and the "Capability
+Name" to "http://schemas.dmtf.org/cimi/1/capability/". For example, the Machine's "InitialState" capability
+would have a URI of:
+
+<pre> http://schemas.dmtf.org/cimi/1/capability/Machine/InitialState </pre>
+
+Note that capabilities that apply to the Provider in general, and are not specific to any one resource, are
+associated with the Cloud Entry Point resource (in case a capability would apply only to the
+CloudEntryPoint resource itself, its definition would say so).
+</em></strong>
+</p>
+<br/>
+
+<table class="table-bordered table-striped table-condensed">
+  <thead>
+    <tr>
+      <th>
+        Resource Name
+      </th>
+      <th>
+        Capability Name
+      </th>
+      <th>
+        Description
+      </th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>CloudEntryPoint  </td>
+      <td>ExpandParameter  </td>
+      <td> Indicated whether the $expand query parameter is
+supported by the Provider.
+</td>
+    </tr>
+    <tr>
+      <td>CloudEntryPoint
+ </td>
+      <td>FilterParameter
+ </td>
+      <td>Indicates whether the $filter query parameter is
+supported by the Provider.
+ </td>
+    </tr>
+    <tr>
+      <td>CloudEntryPoint
+ </td>
+      <td>firstParameter
+ </td>
+      <td>Indicates whether the $first and $last query parameters
+are supported by the Provider. Note that either both
+shall be supported or neither shall be supported.
+ </td>
+    </tr>
+    <tr>
+      <td>CloudEntryPoint
+ </td>
+      <td>SelectParameter
+ </td>
+      <td>Indicated whether the $select query parameter is
+supported by the Provider.
+ </td>
+    </tr>
+    <tr>
+      <td>System
+ </td>
+      <td>SystemComponentTemplateByValue
+ </td>
+      <td>Indicates that the Provider supports specifying
+Component Templates by-value in SystemTemplates.
+ </td>
+    </tr>
+    <tr>
+      <td>Machine
+ </td>
+      <td>DefaultInitialState
+ </td>
+      <td>Indicates what the default initial state of a new Machine
+will be unless explicitly set by the "initialState" attribute
+ </td>
+    </tr>
+    <tr>
+      <td>Machine
+ </td>
+      <td>InitialStates
+ </td>
+      <td>Indicates the list of allowable initial states that
+Consumer may choose from when creating a new
+Machine.
+ </td>
+    </tr>
+    <tr>
+      <td>Machine
+ </td>
+      <td>MachineConfigByValue
+ </td>
+      <td>Indicates that the Provider supports specifying Machine
+Configurations by-value in Machine create operations. If
+true the MachineTemplateByValue capability shall also
+be specified with a value of true.
+ </td>
+    </tr>
+    <tr>
+      <td>Machine
+ </td>
+      <td>MachineCredentialByValue
+ </td>
+      <td>Indicates that the Provider supports specifying
+Credential by-value in Machine create operations. If true
+the MachineTemplateByValue capability shall also be
+specified with a value of true.
+ </td>
+    </tr>
+    <tr>
+      <td>Machine
+ </td>
+      <td>MachineImageByValue
+ </td>
+      <td>Indicates that the Provider supports specifying Machine
+Images by-value in Machine create operations. If true
+the MachineTemplateByValue capability shall also be
+specified with a value of true.
+ </td>
+    </tr>
+    <tr>
+      <td>Machine
+ </td>
+      <td>MachineVolumeTemplatesByValue
+ </td>
+      <td>Indicates that the Provider supports specifying
+VolumeTemplates by-value in Machine create
+operations. If true the MachineTemplateByValue
+capability shall also be specified with a value of true.
+ </td>
+    </tr>
+    <tr>
+      <td>Machine
+ </td>
+      <td>MachineStopForce
+ </td>
+      <td>Indicates that the Provider supports specifying the
+"force" option on the stop and restart operations.
+ </td>
+    </tr>
+    <tr>
+      <td>Machine
+ </td>
+      <td>MachineStopForceDefault
+ </td>
+      <td>Indicates the default way in which the Provider will
+stop/restart a Machine. When set to "true", the Provider
+will forcefully stop the Machine, as opposed to a value
+of "false," which indicates that the Provider will attempt
+to gracefully stop the Machine.
+ </td>
+    </tr>
+    <tr>
+      <td>Machine
+ </td>
+      <td>RestoreFromImage
+ </td>
+      <td>Indicates that the Provider supports restoring Machines
+from Machine Images that are not SNAPSHOT Machine
+Images.
+ </td>
+    </tr>
+    <tr>
+      <td>Machine
+ </td>
+      <td>UserData
+ </td>
+      <td>Indicates which userData injection method will be used.
+See 5.14.1 for more information.
+ </td>
+    </tr>
+    <tr>
+      <td>Credential
+ </td>
+      <td>CredentialTemplateByValue
+ </td>
+      <td>Indicates that the Provider supports specifying
+Credential Templates by-value in Credential create
+operations.
+ </td>
+    </tr>
+    <tr>
+      <td>Volume
+ </td>
+      <td>SharedVolumeSupport
+ </td>
+      <td>Indicates that the Provider supports the sharing of
+volume resources across Machines. The value specified
+is of type "boolean."
+ </td>
+    </tr>
+    <tr>
+      <td>Volume
+ </td>
+      <td>VolumeConfigByValue
+ </td>
+      <td>Indicates that the Provider supports specifying Volume
+Configurations by-value in the Volume create operation.
+If true, the VolumeTemplateByValue capability shall
+also be specified with a value of true.
+ </td>
+    </tr>
+    <tr>
+      <td>Volume
+ </td>
+      <td>VolumeImageByValue
+ </td>
+      <td>Indicates that the Provider supports specifying Volume
+Images by-value in the Volume create operation. If true
+the VolumeTemplateByValue capability shall also be
+specified with a value of true.
+ </td>
+    </tr>
+    <tr>
+      <td>Volume
+ </td>
+      <td>VolumeSnapshot
+ </td>
+      <td>Indicates that the Provider supports creating a new
+VolumeImage by referencing an existing Volume.
+ </td>
+    </tr>
+    <tr>
+      <td>Volume
+ </td>
+      <td>VolumeTemplateByValue
+ </td>
+      <td>Indicates that the Provider supports specifying Volume
+Templates by-value in Volume create operations.
+ </td>
+    </tr>
+    <tr>
+      <td>Network
+ </td>
+      <td>NetworkConfigByValue
+ </td>
+      <td>Indicates that the Provider supports specifying Network
+Configurations by-value in the Network create
+operation.
+ </td>
+    </tr>
+    <tr>
+      <td>Network
+ </td>
+      <td>NetworkTemplateByValue
+ </td>
+      <td>Indicates that the Provider supports specifying Network
+Templates by-value in the Network create operation.
+ </td>
+    </tr>
+    <tr>
+      <td>NetworkPort
+ </td>
+      <td>NetworkPortConfigByValue
+ </td>
+      <td>Indicates that the Provider supports specifying
+NetworkPort Configurations by-value in the NetworkPort
+create operation.
+ </td>
+    </tr>
+    <tr>
+      <td>NetworkPort
+ </td>
+      <td>NetworkPortTemplateByValue
+ </td>
+      <td>Indicates that the Provider supports specifying
+NetworkPort Templates by-value in the NetworkPort
+create operation.
+ </td>
+    </tr>
+    <tr>
+      <td>ForwardingGroup
+ </td>
+      <td>MixedNetwork
+ </td>
+      <td>Indicates whether ForwardingGroups can support both
+private and public connection at the same time.
+ </td>
+    </tr>
+    <tr>
+      <td>Job
+ </td>
+      <td>JobRetention
+ </td>
+      <td>If the Provider supports Job resources as specified in
+this document, this capability indicates in minutes how
+long a job will live in the system before its deleted. In
+this case, the value attribute provides the number of
+minutes (e.g., 30 min). The value specified is of type
+"integer."
+ </td>
+    </tr>
+    <tr>
+      <td>Meter
+ </td>
+      <td>MeterConfigByValue
+ </td>
+      <td>Indicates that the Provider supports specifying
+MeterConfigurations by-value in the Meter create
+operation.
+ </td>
+    </tr>
+    <tr>
+      <td>Meter
+ </td>
+      <td>MeterTemplateByValue
+ </td>
+      <td>Indicates that the Provider supports specifying Meter
+Templates by-value in the Meter create operation.
+ </td>
+    </tr>
+    <tr>
+      <td>EventLog
+ </td>
+      <td>Linked
+ </td>
+      <td>Indicates that the Provider shall delete EventLogs that
+are associated with resources when the resource is
+deleted.
+ </td>
+    </tr>
+  </tbody>
+</table>
+
+  </div>
+</div>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/content/cimi-rest/cimi-rest-volume-configs.md
----------------------------------------------------------------------
diff --git a/site/content/cimi-rest/cimi-rest-volume-configs.md b/site/content/cimi-rest/cimi-rest-volume-configs.md
new file mode 100644
index 0000000..3d44a03
--- /dev/null
+++ b/site/content/cimi-rest/cimi-rest-volume-configs.md
@@ -0,0 +1,248 @@
+---
+site_name: Deltacloud API
+title: CIMI Resource Collections - Volume Configuration
+---
+
+<br/>
+
+<div class="row">
+  <div class="span9">
+
+<h3 id="cimi-volume-config">Volume Configuration</h3>
+<p>
+<strong><em>
+The Volume Configuration resource represents the set of configuration values needed to create a Volume
+with certain characteristics. Volume Configurations are created by Providers and may, at the Providers
+discretion, be created by Consumers.
+<br/>
+<br/>
+A Volume Configuration Collection resource represents the collection of Volume 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/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/cimi-rest-resource-metadata.html">Resource Metadata</a></li>
+      <li><a href="/cimi-rest/cimi-rest-collections.html">Machine</a></li>
+      <li><a href="/cimi-rest/cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+  </li>
+  <hr/>
+  <li class="nav-header">
+    Volume Resources
+  </li>
+  <ul class="nav nav-list">
+    <li><a href="/cimi-rest/cimi-rest-volumes.html">Volume</a></li>
+    <li><a href="/cimi-rest/cimi-rest-volume-images.html">VolumeImage</a></li>
+    <li class="active"><a href="/cimi-rest/cimi-rest-volume-configs.html">VolumeConfiguration</a></li>
+    <li><a href="/cimi-rest/cimi-rest-volume-templates.html">VolumeTemplate</a></li>
+  </ul>
+
+</ul>
+
+  </div>
+
+</div>
+
+
+<ul class="nav nav-pills">
+  <li class="active"><a href="#volume-config-collection" data-toggle="tab">Retrieve the Volume Configuration Collection</a></li>
+  <li><a href="#single-volume-config" data-toggle="tab">Retrieve a single Volume Configuration</a></li>
+  <li><a href="#create-volume-config" data-toggle="tab">Create a Volume Configuration</a></li>
+  <li><a href="#delete-volume-config" data-toggle="tab">Delete a Volume Configuration</a></li>
+</ul>
+
+<hr>
+
+<div class="tab-content">
+
+  <div class="tab-pane active" id="volume-config-collection">
+
+<h4>Retrieve the Volume Configuration Collection</h4>
+
+<p>Example request:</p>
+
+<pre>
+GET /cimi/volume_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: 1112
+ETag: 5aee339b405efd86f41f33105c62623e
+Cache-Control: max-age=0, private, must-revalidate
+Date: Wed, 09 Jan 2013 16:08:51 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/VolumeConfigurationCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volume_configurations&lt;/id&gt;
+  &lt;count&gt;2&lt;/count&gt;
+  &lt;VolumeConfiguration&gt;
+    &lt;id&gt;http://localhost:3001/cimi/volume_configurations/6&lt;/id&gt;
+    &lt;name&gt;marios_volume_config&lt;/name&gt;
+    &lt;description&gt;a volume configuration&lt;/description&gt;
+    &lt;format&gt;qcow2&lt;/format&gt;
+    &lt;capacity&gt;10485760&lt;/capacity&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete"
+          href="http://localhost:3001/cimi/volume_configurations/6" /&gt;
+  &lt;/VolumeConfiguration&gt;
+  &lt;VolumeConfiguration&gt;
+    &lt;id&gt;http://localhost:3001/cimi/volume_configurations/7&lt;/id&gt;
+    &lt;name&gt;YAVC&lt;/name&gt;
+    &lt;description&gt; yet another volume configuration&lt;/description&gt;
+    &lt;format&gt;ext3&lt;/format&gt;
+    &lt;capacity&gt;1073741824&lt;/capacity&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete"
+          href="http://localhost:3001/cimi/volume_configurations/7" /&gt;
+  &lt;/VolumeConfiguration&gt;
+  &lt;operation rel="add" href="http://localhost:3001/cimi/volume_configurations" /&gt;
+&lt;/Collection&gt;
+</pre>
+
+  </div>
+
+  <div class="tab-pane" id="single-volume-config">
+
+<h4>Retrieve a single Volume Configuration</h4>
+
+<p>Example request:</p>
+
+<pre>
+GET /cimi/volume_configurations/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: 386
+ETag: 72e733ff826d0a3e486df8de3fe8c57c
+Cache-Control: max-age=0, private, must-revalidate
+Date: Thu, 10 Jan 2013 08:51:03 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;VolumeConfiguration xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/VolumeConfiguration"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volume_configurations/2&lt;/id&gt;
+  &lt;name&gt;volume-2&lt;/name&gt;
+  &lt;description&gt;Volume configuration with 2097152 kibibytes&lt;/description&gt;
+  &lt;created&gt;2013-01-10T10:51:03+02:00&lt;/created&gt;
+  &lt;capacity&gt;2097152&lt;/capacity&gt;
+&lt;/VolumeConfiguration&gt;
+</pre>
+
+  </div>
+  <div class="tab-pane" id="create-volume-config">
+
+<h4>Create a Volume Configuration</h4>
+
+<p>Example request:</p>
+<pre>
+POST /cimi/volume_configurations 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: 183
+
+&lt;VolumeConfigurationCreate&gt;
+  &lt;name&gt;marios_volume_config&lt;/name&gt;
+  &lt;description&gt;a volume configuration&lt;/description&gt;
+  &lt;format&gt;qcow2&lt;/format&gt;
+  &lt;capacity&gt;10&lt;/capacity&gt;
+&lt;/VolumeConfigurationCreate&gt;
+</pre>
+
+<p>Server response:</p>
+
+<pre>
+HTTP/1.1 201 Created
+Content-Type: application/xml
+Location: http://localhost:3001/cimi/volume_configurations/6
+CIMI-Specification-Version: 1.0.1
+Content-Length: 481
+ETag: 536caa3e459fc2aa9a0796f317317369
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 11 Jan 2013 13:25:35 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;VolumeConfiguration xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/VolumeConfiguration"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volume_configurations/6&lt;/id&gt;
+  &lt;name&gt;marios_volume_config&lt;/name&gt;
+  &lt;description&gt;a volume configuration&lt;/description&gt;
+  &lt;format&gt;qcow2&lt;/format&gt;
+  &lt;capacity&gt;10485760&lt;/capacity&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete"
+          href="http://localhost:3001/cimi/volume_configurations/6" /&gt;
+&lt;/VolumeConfiguration&gt;
+</pre>
+
+  </div>
+
+  <div class="tab-pane" id="delete-volume-config">
+
+<h4>Delete a Volume Configuration</h4>
+
+<p>Example request:</p>
+
+<pre>
+DELETE /cimi/volume_configurations/7 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, 11 Jan 2013 13:27:35 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+</pre>
+  </div>
+
+</div>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/content/cimi-rest/cimi-rest-volume-images.md
----------------------------------------------------------------------
diff --git a/site/content/cimi-rest/cimi-rest-volume-images.md b/site/content/cimi-rest/cimi-rest-volume-images.md
new file mode 100644
index 0000000..0e64d9b
--- /dev/null
+++ b/site/content/cimi-rest/cimi-rest-volume-images.md
@@ -0,0 +1,256 @@
+---
+site_name: Deltacloud API
+title: CIMI Resource Collections - Volume Image
+---
+
+<br/>
+
+<div class="row">
+  <div class="span9">
+
+<h3 id="cimi-volume-image">Volume Image</h3>
+<p>
+<strong><em>
+This resource represents an image that could be placed on a pre-loaded volume.
+<br/>
+<br/>
+A Volume Image Collection resource represents the collection of Volume 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/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/cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="/cimi-rest/cimi-rest-collections.html">Machine</a></li>
+      <li><a href="/cimi-rest/cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+  </li>
+  <hr/>
+  <li class="nav-header">
+    Volume Resources
+  </li>
+  <ul class="nav nav-list">
+    <li><a href="/cimi-rest/cimi-rest-volumes.html">Volume</a></li>
+    <li class="active"><a href="/cimi-rest/cimi-rest-volume-images.html">VolumeImage</a></li>
+    <li><a href="/cimi-rest/cimi-rest-volume-configs.html">VolumeConfiguration</a></li>
+    <li><a href="/cimi-rest/cimi-rest-volume-templates.html">VolumeTemplate</a></li>
+  </ul>
+
+</ul>
+
+  </div>
+
+</div>
+
+<ul class="nav nav-pills">
+  <li class="active"><a href="#volume-image-collection" data-toggle="tab">Retrieve the Volume Image Collection</a></li>
+  <li><a href="#single-volume-image" data-toggle="tab">Retrieve a single Volume Image</a></li>
+  <li><a href="#create-volume-image" data-toggle="tab">Create a Volume Image</a></li>
+  <li><a href="#delete-volume-image" data-toggle="tab">Delete a Volume Image</a></li>
+</ul>
+
+<hr>
+
+<div class="tab-content">
+
+  <div class="tab-pane active" id="volume-image-collection">
+
+<h4>Retrieve the Volume Image Collection</h4>
+
+<p>Example request:</p>
+
+<pre>
+GET /cimi/volume_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: 1095
+ETag: ae3be87f858bb7c9b1000e5409c497f9
+Cache-Control: max-age=0, private, must-revalidate
+Date: Mon, 07 Jan 2013 15:18:00 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/VolumeImageCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volume_images&lt;/id&gt;
+  &lt;count&gt;3&lt;/count&gt;
+  &lt;VolumeImage&gt;
+    &lt;id&gt;http://localhost:3001/cimi/volume_images/snap1&lt;/id&gt;
+    &lt;name&gt;snap1&lt;/name&gt;
+    &lt;description&gt;snap1&lt;/description&gt;
+    &lt;created&gt;2009-07-29T18:15:24Z&lt;/created&gt;
+    &lt;imageLocation href="http://localhost:3001/cimi/volumes/vol1" /&gt;
+    &lt;bootable&gt;false&lt;/bootable&gt;
+  &lt;/VolumeImage&gt;
+  &lt;VolumeImage&gt;
+    &lt;id&gt;http://localhost:3001/cimi/volume_images/snap3&lt;/id&gt;
+    &lt;name&gt;snap3&lt;/name&gt;
+    &lt;description&gt;snap3&lt;/description&gt;
+    &lt;created&gt;2009-07-29T18:15:24Z&lt;/created&gt;
+    &lt;imageLocation href="http://localhost:3001/cimi/volumes/vol2" /&gt;
+    &lt;bootable&gt;false&lt;/bootable&gt;
+  &lt;/VolumeImage&gt;
+  &lt;VolumeImage&gt;
+    &lt;id&gt;http://localhost:3001/cimi/volume_images/snap2&lt;/id&gt;
+    &lt;name&gt;snap2&lt;/name&gt;
+    &lt;description&gt;snap2&lt;/description&gt;
+    &lt;created&gt;2009-07-29T18:15:24Z&lt;/created&gt;
+    &lt;imageLocation href="http://localhost:3001/cimi/volumes/vol2" /&gt;
+    &lt;bootable&gt;false&lt;/bootable&gt;
+  &lt;/VolumeImage&gt;
+&lt;/Collection&gt;
+</pre>
+
+  </div>
+
+
+  <div class="tab-pane active" id="single-volume-image">
+
+<h4>Retrieve a single Volume Image</h4>
+
+<p>Example request:</p>
+
+<pre>
+GET /cimi/volume_images/snap2 HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu) libcurl/7.24.0 NSS/3.13.5.0 zlib/1.2.5 libidn/1.24 libssh2/1.4.1
+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: 377
+ETag: 134b5cae11297fd59b2a783a0ee430ed
+Cache-Control: max-age=0, private, must-revalidate
+Date: Tue, 08 Jan 2013 13:40:54 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;VolumeImage xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/VolumeImage"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volume_images/snap1&lt;/id&gt;
+  &lt;name&gt;snap1&lt;/name&gt;
+  &lt;description&gt;snap1&lt;/description&gt;
+  &lt;created&gt;2009-07-29T18:15:24Z&lt;/created&gt;
+  &lt;imageLocation href="http://localhost:3001/cimi/volumes/vol1" /&gt;
+  &lt;bootable&gt;false&lt;/bootable&gt;
+&lt;/VolumeImage&gt;
+</pre>
+
+  </div>
+
+  <div class="tab-pane active" id="create-volume-image">
+
+<h4>Create a Volume Image</h4>
+
+<p>A new Volume Image can be created from an existing Volume, by referencing the Volume
+resource with the imageLocation attribute in the message body. This is illustrated in
+the example below.</p>
+
+<p>Example request:</p>
+
+<pre>
+POST /cimi/volume_images HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu) libcurl/7.24.0 NSS/3.13.5.0 zlib/1.2.5 libidn/1.24 libssh2/1.4.1
+Host: localhost:3001
+Content-Type: application/xml
+Accept: application/xml
+Content-Length: 210
+
+&lt;VolumeImage xmlns="http://schemas.dmtf.org/cimi/1"&gt;
+  &lt;name&gt; my_vol_image &lt;/name&gt;
+  &lt;description&gt; marios first volume image &lt;/description&gt;
+  &lt;imageLocation href="http://localhost:3001/cimi/volumes/vol1"/&gt;
+&lt;/VolumeImage&gt;
+</pre>
+
+<p>Server response:</p>
+
+<pre>
+HTTP/1.1 201 Created
+Content-Type: application/xml
+Location: http://localhost:3001/cimi/volume_images/store_snapshot_1357663577
+CIMI-Specification-Version: 1.0.1
+Content-Length: 429
+ETag: 5d4bdca8ed98295d1c463012bb8ff427
+Cache-Control: max-age=0, private, must-revalidate
+Date: Tue, 08 Jan 2013 16:46:17 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;VolumeImage xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/VolumeImage"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volume_images/store_snapshot_1357663577&lt;/id&gt;
+  &lt;name&gt;my_vol_image&lt;/name&gt;
+  &lt;description&gt;marios first volume image&lt;/description&gt;
+  &lt;created&gt;2013-01-08T18:46:17+02:00&lt;/created&gt;
+  &lt;imageLocation href="http://localhost:3001/cimi/volumes/vol1" /&gt;
+  &lt;bootable&gt;false&lt;/bootable&gt;
+&lt;/VolumeImage&gt;
+</pre>
+
+  </div>
+
+  <div class="tab-pane active" id="delete-volume-image">
+
+<h4>Delete a Volume Image</h4>
+
+<p>Example request:</p>
+
+<pre>
+DELETE /cimi/volume_images/snap1 HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu) libcurl/7.24.0 NSS/3.13.5.0 zlib/1.2.5 libidn/1.24 libssh2/1.4.1
+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: Wed, 09 Jan 2013 15:45:32 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+</pre>
+
+  </div>
+
+</div>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/content/cimi-rest/cimi-rest-volume-templates.md
----------------------------------------------------------------------
diff --git a/site/content/cimi-rest/cimi-rest-volume-templates.md b/site/content/cimi-rest/cimi-rest-volume-templates.md
new file mode 100644
index 0000000..4062791
--- /dev/null
+++ b/site/content/cimi-rest/cimi-rest-volume-templates.md
@@ -0,0 +1,244 @@
+---
+site_name: Deltacloud API
+title: CIMI Resource Collections - Volume Template
+---
+
+<br/>
+
+<div class="row">
+  <div class="span9">
+
+<h3 id="cimi-volume-template">Volume Template</h3>
+<p>
+<strong><em>
+This resource captures the configuration values for realizing a Volume. A Volume Template may be used
+to create multiple Volumes.
+<br/>
+<br/>
+A Volume Template Collection resource represents the collection of VolumeTemplate resources within a
+Provider.
+</em></strong>
+</p>
+
+<p>The Volume Template in another example of the template pattern used by CIMI, as explained in the introduction of the <a href="/cimi-rest/cimi-rest-machine-templates.html">Machine Template</a> resource. That is, in general, CIMI a resource is instantiated with the use of a template and a template itself usually consists of an image and a configuration.</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/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/cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="/cimi-rest/cimi-rest-collections.html">Machine</a></li>
+      <li><a href="/cimi-rest/cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+  </li>
+  <hr/>
+  <li class="nav-header">
+    Volume Resources
+  </li>
+  <ul class="nav nav-list">
+    <li><a href="/cimi-rest/cimi-rest-volumes.html">Volume</a></li>
+    <li><a href="/cimi-rest/cimi-rest-volume-images.html">VolumeImage</a></li>
+    <li><a href="/cimi-rest/cimi-rest-volume-configs.html">VolumeConfiguration</a></li>
+    <li class="active"><a href="/cimi-rest/cimi-rest-volume-templates.html">VolumeTemplate</a></li>
+  </ul>
+
+</ul>
+
+  </div>
+
+</div>
+
+<ul class="nav nav-pills">
+  <li class="active"><a href="#volume-template-collection" data-toggle="tab">Retrieve the Volume Template Collection</a></li>
+  <li><a href="#single-volume-template" data-toggle="tab">Retrieve a single Volume Template</a></li>
+  <li><a href="#create-volume-template" data-toggle="tab">Create a Volume Template</a></li>
+  <li><a href="#delete-volume-template" data-toggle="tab">Delete a Volume Template</a></li>
+
+</ul>
+
+<hr>
+
+<div class="tab-content">
+
+  <div class="tab-pane active" id="volume-template-collection">
+
+<h4>Retrieve the Volume Template Collection</h4>
+
+<p>Example request:</p>
+
+<pre>
+GET /cimi/volume_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: 1045
+ETag: 3ca6eecb1450ebe3a9fa6714bff542c1
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 11 Jan 2013 13:02:47 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/VolumeTemplateCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volume_templates&lt;/id&gt;
+  &lt;count&gt;2&lt;/count&gt;
+  &lt;VolumeTemplate&gt;
+    &lt;id&gt;http://localhost:3001/cimi/volume_templates/3&lt;/id&gt;
+    &lt;name&gt;marios_vol_template&lt;/name&gt;
+    &lt;description&gt;my first volume template&lt;/description&gt;
+    &lt;volumeConfig href="http://localhost:3001/cimi/volume_configs/1" /&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete"
+          href="http://localhost:3001/cimi/volume_templates/3" /&gt;
+  &lt;/VolumeTemplate&gt;
+  &lt;VolumeTemplate&gt;
+    &lt;id&gt;http://localhost:3001/cimi/volume_templates/4&lt;/id&gt;
+    &lt;name&gt;YAVT&lt;/name&gt;
+    &lt;description&gt;yet another volume template&lt;/description&gt;
+    &lt;volumeConfig href="http://localhost:3001/cimi/volume_configs/6" /&gt;
+    &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete"
+          href="http://localhost:3001/cimi/volume_templates/4" /&gt;
+  &lt;/VolumeTemplate&gt;
+  &lt;operation rel="add" href="http://localhost:3001/cimi/volume_templates" /&gt;
+&lt;/Collection&gt;
+</pre>
+
+  </div>
+
+  <div class="tab-pane" id="single-volume-template">
+
+<h4>Retrieve a single Volume Template</h4>
+
+<p>Example request:</p>
+
+<pre>
+GET /cimi/volume_templates/3 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: 470
+ETag: a527b1170f798affc88a0ea0fa4ede7a
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 11 Jan 2013 13:05:42 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;VolumeTemplate xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/VolumeTemplate"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volume_templates/3&lt;/id&gt;
+  &lt;name&gt;marios_vol_template&lt;/name&gt;
+  &lt;description&gt;my first volume template&lt;/description&gt;
+  &lt;volumeConfig href="http://localhost:3001/cimi/volume_configs/1" /&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete"
+          href="http://localhost:3001/cimi/volume_templates/3" /&gt;
+&lt;/VolumeTemplate&gt;
+</pre>
+
+  </div>
+  <div class="tab-pane" id="create-volume-template">
+
+<h4>Create a Volume Template</h4>
+
+<p>Example request:</p>
+
+<pre>
+POST /cimi/volume_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: 232
+
+&lt;VolumeTemplate xmlns="http://schemas.dmtf.org/cimi/1"&gt;
+  &lt;name&gt; YAVT &lt;/name&gt;
+  &lt;description&gt; yet another volume template &lt;/description&gt;
+  &lt;volumeConfig href="http://localhost:3001/cimi/volume_configs/6"&gt; &lt;/volumeConfig&gt;
+&lt;/VolumeTemplate&gt;
+</pre>
+
+<p>Server response:</p>
+
+<pre>
+HTTP/1.1 201 Created
+Content-Type: application/xml
+Location: http://localhost:3001/cimi/volume_templates/5
+CIMI-Specification-Version: 1.0.1
+Content-Length: 458
+ETag: 66d7d08c49a5e81923ac124d71af50ad
+Cache-Control: max-age=0, private, must-revalidate
+Date: Fri, 11 Jan 2013 13:07:00 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;VolumeTemplate xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/VolumeTemplate"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volume_templates/5&lt;/id&gt;
+  &lt;name&gt;YAVT&lt;/name&gt;
+  &lt;description&gt;yet another volume template&lt;/description&gt;
+  &lt;volumeConfig href="http://localhost:3001/cimi/volume_configs/6" /&gt;
+  &lt;operation rel="http://schemas.dmtf.org/cimi/1/action/delete"
+          href="http://localhost:3001/cimi/volume_templates/5" /&gt;
+&lt;/VolumeTemplate&gt;
+</pre>
+
+  </div>
+  <div class="tab-pane" id="delete-volume-template">
+
+<h4>Delete a Volume Template</h4>
+
+<p>Example request:</p>
+
+<pre>
+DELETE /cimi/volume_templates/5 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, 11 Jan 2013 13:07:34 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+</pre>
+
+  </div>
+</div>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/content/cimi-rest/cimi-rest-volumes.md
----------------------------------------------------------------------
diff --git a/site/content/cimi-rest/cimi-rest-volumes.md b/site/content/cimi-rest/cimi-rest-volumes.md
new file mode 100644
index 0000000..3142957
--- /dev/null
+++ b/site/content/cimi-rest/cimi-rest-volumes.md
@@ -0,0 +1,314 @@
+---
+site_name: Deltacloud API
+title: CIMI Resource Collections - Volume
+---
+
+<br/>
+
+<div class="row">
+  <div class="span9">
+
+<h3 id="cimi-machine-image">Volume</h3>
+<p>
+<strong><em>
+A Volume represents storage at either the block or the file-system level. Volumes can be connected to
+Machines. Once connected, Volumes can be accessed by processes on that Machine.
+<br/>
+A Volume Collection resource represents the collection of Volumes 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/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/cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="/cimi-rest/cimi-rest-collections.html">Machine</a></li>
+      <li><a href="/cimi-rest/cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+  </li>
+  <hr/>
+  <li class="nav-header">
+    Volume Resources
+  </li>
+  <ul class="nav nav-list">
+    <li class="active"><a href="/cimi-rest/cimi-rest-volumes.html">Volume</a></li>
+    <li><a href="/cimi-rest/cimi-rest-volume-images.html">VolumeImage</a></li>
+    <li><a href="/cimi-rest/cimi-rest-volume-configs.html">VolumeConfiguration</a></li>
+    <li><a href="/cimi-rest/cimi-rest-volume-templates.html">VolumeTemplate</a></li>
+  </ul>
+
+</ul>
+
+  </div>
+
+</div>
+
+<ul class="nav nav-pills">
+  <li class="active"><a href="#volume-collection" data-toggle="tab">Retrieve the Volume Collection</a></li>
+  <li><a href="#single-volume" data-toggle="tab">Retrieve a single Volume</a></li>
+  <li><a href="#create-volume" data-toggle="tab">Create a Volume</a></li>
+  <li><a href="#delete-volume" data-toggle="tab">Delete a Volume</a></li>
+</ul>
+
+<hr>
+
+<div class="tab-content">
+  <div class="tab-pane active" id="volume-collection">
+
+<h4>Retrieve the Volume Collection</h4>
+
+<p>Example request:</p>
+<pre>
+GET /cimi/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: 1521
+ETag: 5e589664c1b03a34ad42ffe606bd61f1
+Cache-Control: max-age=0, private, must-revalidate
+ Date: Fri, 04 Jan 2013 16:43: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/VolumeCollection"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volumes&lt;/id&gt;
+  &lt;count&gt;3&lt;/count&gt;
+  &lt;Volume&gt;
+    &lt;id&gt;http://localhost:3001/cimi/volumes/vol3&lt;/id&gt;
+    &lt;name&gt;vol3&lt;/name&gt;
+    &lt;description&gt;Description of Volume&lt;/description&gt;
+    &lt;created&gt;2009-07-30T14:35:11Z&lt;/created&gt;
+    &lt;state&gt;IN-USE&lt;/state&gt;
+    &lt;type&gt;http://schemas.dmtf.org/cimi/1/mapped&lt;/type&gt;
+    &lt;capacity&gt;1048576&lt;/capacity&gt;
+    &lt;bootable&gt;false&lt;/bootable&gt;
+    &lt;operation rel="delete" href="http://localhost:3001/cimi/volumes/vol3" /&gt;
+  &lt;/Volume&gt;
+  &lt;Volume&gt;
+    &lt;id&gt;http://localhost:3001/cimi/volumes/vol2&lt;/id&gt;
+    &lt;name&gt;vol2&lt;/name&gt;
+    &lt;description&gt;Description of Volume&lt;/description&gt;
+    &lt;created&gt;2009-07-30T14:35:11Z&lt;/created&gt;
+    &lt;state&gt;AVAILABLE&lt;/state&gt;
+    &lt;type&gt;http://schemas.dmtf.org/cimi/1/mapped&lt;/type&gt;
+    &lt;capacity&gt;1048576&lt;/capacity&gt;
+    &lt;bootable&gt;false&lt;/bootable&gt;
+    &lt;operation rel="delete" href="http://localhost:3001/cimi/volumes/vol2" /&gt;
+  &lt;/Volume&gt;
+  &lt;Volume&gt;
+    &lt;id&gt;http://localhost:3001/cimi/volumes/vol1&lt;/id&gt;
+    &lt;name&gt;vol1&lt;/name&gt;
+    &lt;description&gt;Description of Volume&lt;/description&gt;
+    &lt;created&gt;2009-07-30T14:35:11Z&lt;/created&gt;
+    &lt;state&gt;AVAILABLE&lt;/state&gt;
+    &lt;type&gt;http://schemas.dmtf.org/cimi/1/mapped&lt;/type&gt;
+    &lt;capacity&gt;1048576&lt;/capacity&gt;
+    &lt;bootable&gt;false&lt;/bootable&gt;
+    &lt;operation rel="delete" href="http://localhost:3001/cimi/volumes/vol1" /&gt;
+  &lt;/Volume&gt;
+  &lt;operation rel="add" href="http://localhost:3001/cimi/volumes" /&gt;
+&lt;/Collection&gt;
+</pre>
+
+  </div>
+
+  <div class="tab-pane active" id="single-volume">
+
+<h4>Retrieve a single Volume</h4>
+
+<p>Example request:</p>
+<pre>
+GET /cimi/volumes/vol1 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: 490
+ETag: a4be42f0743b1a6efbd2ed431667e7d4
+Cache-Control: max-age=0, private, must-revalidate
+Date: Mon, 07 Jan 2013 13:57:46 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Volume xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/Volume"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volumes/vol1&lt;/id&gt;
+  &lt;name&gt;vol1&lt;/name&gt;
+  &lt;description&gt;Description of Volume&lt;/description&gt;
+  &lt;created&gt;2009-07-30T14:35:11Z&lt;/created&gt;
+  &lt;state&gt;AVAILABLE&lt;/state&gt;
+  &lt;type&gt;http://schemas.dmtf.org/cimi/1/mapped&lt;/type&gt;
+  &lt;capacity&gt;1048576&lt;/capacity&gt;
+  &lt;bootable&gt;false&lt;/bootable&gt;
+  &lt;operation rel="delete" href="http://localhost:3001/cimi/volumes/vol1" /&gt;
+&lt;/Volume&gt;
+
+
+</pre>
+
+  </div>
+
+
+  <div class="tab-pane active" id="create-volume">
+
+<h4>Create a Volume</h4>
+
+<p>Using VolumeTemplate with VolumeConfiguration by reference - Example request:</p>
+<pre>
+POST //cimi/volumes 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: 224
+
+&lt;VolumeCreate&gt;
+  &lt;name&gt; marios_new_volume &lt;/name&gt;
+  &lt;description&gt; a new volume &lt;/description&gt;
+  &lt;volumeTemplate&gt;
+    &lt;volumeConfig
+      href="http://localhost:3001/cimi/volume_configurations/2"&gt;
+    &lt;/volumeConfig&gt;
+  &lt;/volumeTemplate&gt;
+&lt;/VolumeCreate&gt;
+</pre>
+
+<p>Server response:</p>
+<pre>
+HTTP/1.1 201 Created
+Content-Type: application/xml
+Location: http://localhost:3001/cimi/volumes/Volume1357567397
+CIMI-Specification-Version: 1.0.1
+Content-Length: 523
+ETag: 56c05e34776373022cefda3c3c4467cb
+Cache-Control: max-age=0, private, must-revalidate
+Date: Mon, 07 Jan 2013 14:03:17 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Volume xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/Volume"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volumes/Volume1357567397&lt;/id&gt;
+  &lt;name&gt;marios_new_volume&lt;/name&gt;
+  &lt;description&gt;a new volume&lt;/description&gt;
+  &lt;created&gt;2013-01-07T16:03:17+02:00&lt;/created&gt;
+  &lt;state&gt;AVAILABLE&lt;/state&gt;
+  &lt;type&gt;http://schemas.dmtf.org/cimi/1/mapped&lt;/type&gt;
+  &lt;capacity&gt;2097152&lt;/capacity&gt;
+  &lt;bootable&gt;false&lt;/bootable&gt;
+  &lt;operation rel="delete" href="http://localhost:3001/cimi/volumes/Volume1357567397" /&gt;
+&lt;/Volume&gt;
+</pre>
+
+<br/>
+<p>Using VolumeTemplate with VolumeConfiguration by value - Example request:</p>
+<pre>
+POST /cimi/volumes HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu) libcurl/7.24.0 NSS/3.13.5.0 zlib/1.2.5 libidn/1.24 libssh2/1.4.1
+Host: localhost:3001
+Accept:application/xml
+Content-Type: application/xml
+Content-Length: 239
+
+&lt;VolumeCreate&gt;
+  &lt;name&gt; marios_volume &lt;/name&gt;
+  &lt;description&gt; a new volume &lt;/description&gt;
+  &lt;volumeTemplate&gt;
+    &lt;volumeConfig&gt;
+      &lt;type&gt;http://schemas.dmtf.org/cimi/1/mapped&lt;/type&gt;
+      &lt;capacity&gt; 1024 &lt;/capacity&gt;
+    &lt;/volumeConfig&gt;
+  &lt;/volumeTemplate&gt;
+&lt;/VolumeCreate&gt;
+</pre>
+
+<p>Server response:</p>
+
+<pre>
+HTTP/1.1 201 Created
+Content-Type: application/xml
+Location: http://localhost:3001/cimi/volumes/Volume1357567628
+CIMI-Specification-Version: 1.0.1
+Content-Length: 516
+ETag: d82624fda83c895cbeaebb08fff005c6
+Cache-Control: max-age=0, private, must-revalidate
+Date: Mon, 07 Jan 2013 14:07:08 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+&lt;Volume xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/Volume"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/volumes/Volume1357567628&lt;/id&gt;
+  &lt;name&gt;marios_volume&lt;/name&gt;
+  &lt;description&gt;a new volume&lt;/description&gt;
+  &lt;created&gt;2013-01-07T16:07:08+02:00&lt;/created&gt;
+  &lt;state&gt;AVAILABLE&lt;/state&gt;
+  &lt;type&gt;http://schemas.dmtf.org/cimi/1/mapped&lt;/type&gt;
+  &lt;capacity&gt;1024&lt;/capacity&gt;
+  &lt;bootable&gt;false&lt;/bootable&gt;
+  &lt;operation rel="delete" href="http://localhost:3001/cimi/volumes/Volume1357567628" /&gt;
+&lt;/Volume&gt;
+</pre>
+
+  </div>
+
+  <div class="tab-pane active" id="delete-volume">
+
+<h4>Retrieve the Volume Collection</h4>
+
+<p>Example request:</p>
+<pre>
+DELETE /cimi/volumes/Volume1357567628 HTTP/1.1
+Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
+User-Agent: curl/7.24.0 (i686-redhat-linux-gnu) libcurl/7.24.0 NSS/3.13.5.0 zlib/1.2.5 libidn/1.24 libssh2/1.4.1
+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: Mon, 07 Jan 2013 14:16:21 GMT
+Connection: keep-alive
+Server: thin 1.5.0 codename Knife
+
+</pre>
+
+  </div>
+
+</div>

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d3b146f1/site/output/cimi-curl.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-curl.html b/site/output/cimi-curl.html
index 7db7ce2..a4ed0d4 100644
--- a/site/output/cimi-curl.html
+++ b/site/output/cimi-curl.html
@@ -102,90 +102,48 @@
 
     <h3 id="command">Working with cURL against the Deltacloud CIMI frontend</h3>
 
-    <p> The <a href="http://curl.haxx.se/docs/">cURL documentation</a> is pretty comprehensive, but the following are some general points to remember for using cURL against Deltacloud. All the examples on this page assume the deltacloud server is running at localhost:3001: </p>
+    <p> The <a href="http://curl.haxx.se/docs/">cURL documentation</a> is pretty comprehensive, but the following are some general points to remember for using cURL against the Deltacloud CIMI frontend. All the examples on this page assume the Deltacloud server is running at localhost:3001: </p>
 
   <ul>
 <li>
       Credentials are specified with <strong> --user "name:password"  </strong>
     </li>
     <li>
-      Request headers are specified with <strong> -H "header: value" </strong>. For the "Accept" header Deltacloud offers a convenient way of specifying the desired response format; you can include the <strong>"?format="</strong> parameter into the request URL rather than setting the Accept header
+      Request headers are specified with <strong> -H "header: value" </strong>.
     </li>
     <li>
       HTTP verbs are specified with <strong>-X VERB</strong>
     </li>
     <li>
       The <strong> -i </strong> flag will show you the response headers and the <strong> -v </strong> flag will show you request and response headers as well as info about cURL activity:
-      <pre>
-curl -v -X DELETE --user "username:password" -H "Accept: application/xml" http://localhost:3001/cimi/images/my_image
-      </pre>
     </li>
   </ul>
-</div>
-
-  <div class="span4">
-
-    <ul class="nav nav-list well">
-<li class="nav-header">cURL as a deltacloud client</li>
-      <li><a href="#machines">Work with Machines</a></li>
-      <li><a href="#machine-images">Work with Machine Images</a></li>
-    </ul>
-</div>
-</div>
-
-<hr><h4 id="machines">Working with Machines</h4>
-
-<p>Retrieve the Machine Collection in json format:</p>
-
-<pre> curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machines </pre>
-
-<p>Create a new Machine with the message body in XML format:</p>
-
-<pre>
-curl -v --user "mockuser:mockpassword" -X POST -H "Content-Type: application/xml" -H "Accept: application/xml" -d '&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>Alternatively, specifying the message body in JSON:</p>
-<pre>
- curl -v --user "user:password" -X POST -H "Content-Type: application/json" -H "Accept: application/xml" -d '{ "resourceURI": "http://schemas.dmtf.org/cimi/1/MachineCreate", "name": "myMachine3", "description": "My very first json machine", "machineTemplate": { "machineConfig": { "href": "http://localhost:3001/cimi/machine_configurations/m1.small" }, "machineImage": { "href": "http://localhost:3001/cimi/machine_images/ami-48aa4921" } } }' http://localhost:3001/cimi/machines
-</pre>
-
-<p>Perform a Machine operation - stop - with the message body in XML format:</p>
-
 <pre>
-curl -v -X POST --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -d '&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;'  http://localhost:3001/cimi/machines/inst3/stop
-</pre>
-
-<p>Alternatively, specifying the message body in JSON:</p>
-<pre>
- curl -v -X POST --user "user:password" -H "Accept: application/json" -H "Content-Type: application/json" -d '{"resourceURI": "http://www.dmtf.org/cimi/1/Action", "action":"http://www.dmtf.org/cimi/action/stop"}' http://localhost:3001/cimi/machines/i-5feb7c20/stop
-</pre>
-
-<p><br></p>
-
-<hr><h4 id="machine-images">Working with Machine Images</h4>
-
-<p>Retrieve the Machine Image Collection:</p>
-
-<pre>
-curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machine_images
-</pre>
+curl -v -X DELETE --user "username:password" -H "Accept: application/xml" http://localhost:3001/cimi/machine_images/my_image
+      </pre>
 
-<p>Create a new Machine Image from an existing Machine, with message body in JSON:</p>
+<p>
+Select a CIMI resource from the right-hand navigation bar to see cURL examples for that resource.
+</p>
 
-<pre>
-curl --user "mockuser:mockpassword" -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{"resourceURI":"http://schemas.dmtf.org/cimi/1/MachineImage", "name":"new_image","description":"my new machine image","type":"IMAGE", "imageLocation":"http://localhost:3001/cimi/machines/inst1"}' http://localhost:3001/cimi/machine_images
-</pre>
+ </div>
 
-<p>Alternatively, specifying the message body in XML:</p>
-
-<pre>
-curl -v --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -X POST -d "&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;" http://localhost:3001/cimi/machine_images
-</pre>
+  <div class="span4">
 
-<p>Delete a Machine Image:</p>
+<ul class="nav nav-list well">
+<li class="nav-header">
+      <a href="cimi-curl.html">curl for CIMI Resources</a>
+  </li>
+  <ul class="nav nav-list">
+<li><a href="cimi-curl/cimi-curl-machines.html">Machine</a></li>
+    <li><a href="cimi-curl/cimi-curl-volumes.html">Volume</a></li>
+    <li><a href="cimi-curl/cimi-curl-resource_metadata.html">ResourceMetadata</a></li>
+  </ul>
+<br>
+</ul>
+</div>
 
-<pre>curl -X DELETE --user "user:pass" http://localhost:3001/cimi/machine_images/my_image </pre>
+</div>
 
       <footer class="footer">
         <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>


Mime
View raw message