deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject svn commit: r1436451 [1/4] - in /deltacloud/trunk/site: content/ content/cimi-curl/ content/cimi-rest/ output/ output/cimi-curl/ output/cimi-rest/
Date Mon, 21 Jan 2013 16:18:04 GMT
Author: marios
Date: Mon Jan 21 16:18:03 2013
New Revision: 1436451

URL: http://svn.apache.org/viewvc?rev=1436451&view=rev
Log:
SITE: CIMI Docs (REST API) and cURL examples

Signed-off-by: marios <marios@redhat.com>
TrackedAt: http://tracker-mfojtik.rhcloud.com/patch/51c1d08a76e235371681a2a87704f82df6496d33

Added:
    deltacloud/trunk/site/content/cimi-curl/
    deltacloud/trunk/site/content/cimi-curl/cimi-curl-machines.md
    deltacloud/trunk/site/content/cimi-curl/cimi-curl-resource_metadata.md
    deltacloud/trunk/site/content/cimi-curl/cimi-curl-volumes.md
    deltacloud/trunk/site/content/cimi-rest/
    deltacloud/trunk/site/content/cimi-rest/cimi-rest-collections.md
      - copied, changed from r1435248, deltacloud/trunk/site/content/cimi-rest-collections.md
    deltacloud/trunk/site/content/cimi-rest/cimi-rest-entry-point.md
      - copied, changed from r1435248, deltacloud/trunk/site/content/cimi-rest-entry-point.md
    deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-configs.md
    deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-images.md
      - copied, changed from r1435248, deltacloud/trunk/site/content/cimi-rest-machine-images.md
    deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-templates.md
    deltacloud/trunk/site/content/cimi-rest/cimi-rest-resource-metadata.md
    deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-configs.md
    deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-images.md
    deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-templates.md
    deltacloud/trunk/site/content/cimi-rest/cimi-rest-volumes.md
    deltacloud/trunk/site/output/cimi-curl/
    deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-curl.html
    deltacloud/trunk/site/output/cimi-curl/cimi-curl-resource_metadata.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-rest.html
    deltacloud/trunk/site/output/cimi-curl/cimi-curl-volumes.html
    deltacloud/trunk/site/output/cimi-rest/
    deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-rest-collections.html
    deltacloud/trunk/site/output/cimi-rest/cimi-rest-entry-point.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-rest-entry-point.html
    deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-configs.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-rest-entry-point.html
    deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-images.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-rest-machine-images.html
    deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-templates.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-rest-machine-images.html
    deltacloud/trunk/site/output/cimi-rest/cimi-rest-resource-metadata.html
    deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-configs.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-rest-machine-images.html
    deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-images.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-rest-machine-images.html
    deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-templates.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-rest-machine-images.html
    deltacloud/trunk/site/output/cimi-rest/cimi-rest-volumes.html
      - copied, changed from r1435248, deltacloud/trunk/site/output/cimi-rest-machine-images.html
Removed:
    deltacloud/trunk/site/content/cimi-rest-collections.md
    deltacloud/trunk/site/content/cimi-rest-entry-point.md
    deltacloud/trunk/site/content/cimi-rest-machine-images.md
    deltacloud/trunk/site/output/cimi-rest-collections.html
    deltacloud/trunk/site/output/cimi-rest-entry-point.html
    deltacloud/trunk/site/output/cimi-rest-machine-images.html
Modified:
    deltacloud/trunk/site/content/cimi-curl.md
    deltacloud/trunk/site/content/cimi-rest.md
    deltacloud/trunk/site/output/cimi-curl.html
    deltacloud/trunk/site/output/cimi-rest.html

Modified: deltacloud/trunk/site/content/cimi-curl.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-curl.md?rev=1436451&r1=1436450&r2=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/content/cimi-curl.md (original)
+++ deltacloud/trunk/site/content/cimi-curl.md Mon Jan 21 16:18:03 2013
@@ -11,96 +11,48 @@ title: CIMI cURL Examples
 
     <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>
-
-<br/>
-
-<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>
-
-<p>Create a new Machine Image from an existing Machine, with message body in JSON:</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>
+      <pre>
+curl -v -X DELETE --user "username:password" -H "Accept: application/xml" http://localhost:3001/cimi/machine_images/my_image
+      </pre>
 
+<p>
+Select a CIMI resource from the right-hand navigation bar to see cURL examples for that resource.
+</p>
 
-<p>Alternatively, specifying the message body in XML:</p>
+ </div>
 
-<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">
 
+<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>
 
-<p>Delete a Machine Image:</p>
+  </div>
 
-<pre>curl -X DELETE --user "user:pass" http://localhost:3001/cimi/machine_images/my_image </pre>
+</div>
 

Added: deltacloud/trunk/site/content/cimi-curl/cimi-curl-machines.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-curl/cimi-curl-machines.md?rev=1436451&view=auto
==============================================================================
--- deltacloud/trunk/site/content/cimi-curl/cimi-curl-machines.md (added)
+++ deltacloud/trunk/site/content/cimi-curl/cimi-curl-machines.md Mon Jan 21 16:18:03 2013
@@ -0,0 +1,196 @@
+---
+site_name: Deltacloud API
+title: CIMI cURL Examples - Machine Resources
+---
+
+<br/>
+
+<div class="row">
+
+  <div class="span8">
+
+    <h3 id="command">cURL examples for CIMI Machine resources</h3>
+
+<ul class="nav nav-pills">
+  <li class="active"><a href="#machines" data-toggle="tab">Working with Machines</a></li>
+  <li><a href="#machine-images" data-toggle="tab">Working with MachineImages</a></li>
+  <li><a href="#machine-configs" data-toggle="tab">Working with MachineConfigurations</a></li>
+  <li><a href="#machine-templates" data-toggle="tab">Working with MachineTemplates</a></li>
+  <li><a href="#machine-volumes" data-toggle="tab">Working with Machine Volumes</a></li>
+</ul>
+
+
+  </div>
+
+  <div class="span4">
+
+<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 class="active"><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>
+
+</div>
+
+<div class="tab-content">
+
+  <div class="tab-pane active" id="machines">
+
+<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>
+
+<br/>
+
+<hr/>
+
+</div>
+
+<div class="tab-pane" id="machine-images">
+
+<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>
+
+<p>Create a new Machine Image from an existing Machine, with message body in JSON:</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>
+
+
+<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>
+
+<p>Delete a Machine Image:</p>
+
+<pre>curl -X DELETE --user "user:pass" http://localhost:3001/cimi/machine_images/my_image </pre>
+
+<br/>
+
+<hr/>
+
+</div>
+
+<div class="tab-pane" id="machine-configs">
+
+<h4 id="machine-configs">Working with Machine Configurations</h4>
+
+<p>Retrieve the Machine Configuration Collection:</p>
+
+<pre>
+curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machine_configurations
+</pre>
+
+<p>Retrieve a specific Machine Configuration:</p>
+
+<pre>
+curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machine_configurations/m1-large
+</pre>
+</div>
+
+
+<div class="tab-pane" id="machine-templates">
+
+<h4>Working with Machine Templates</h4>
+<p>Retrieve the Machine Template Collection:</p>
+
+<pre>
+curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machine_templates
+</pre>
+
+<p>Retrieve a specific Machine Template:</p>
+
+<pre>
+curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/machine_templates/m1-large
+</pre>
+
+<p> Create a Machine Template with XML body: </p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -X POST -d '&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;' -H "Content-Type: application/xml"  -H "Accept: application/xml" http://localhost:3001/cimi/machine_templates
+</pre>
+
+<p> Create a Machine Template with JSON body: </p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -X POST -d '{"resourceURI": "http://schemas.dmtf.org/cimi/1/MachineTemplateCreate","name": "myMachineDemoTemplate","description": "My very loved machine template","machineConfig": { "href": "http://localhost:3001/cimi/machine_configurations/m1-xlarge" },"machineImage": { "href": "http://localhost:3001/cimi/machine_images/img3" },"properties": { "foo": "bar","life": "is life"}}' -H "Content-Type: application/json"  -H "Accept: application/json" http://localhost:3001/cimi/machine_templates
+</pre>
+
+<p> Delete a Machine Template: </p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" -X DELETE http://localhost:3001/cimi/machine_templates/2
+</pre>
+
+</div>
+
+<div class="tab-pane" id="machine-volumes">
+
+<h4>Working with Machine Volumes </h4>
+<p>Retrieve the Machine Volume Collection of a given Machine resource:</p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/machines/inst1/volumes
+</pre>
+
+<p>Attach a Volume to a Machine, with XML body:</p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -X POST -d '<MachineVolume xmlns="http://schemas.dmtf.org/cimi/1/MachineVolume"><initialLocation> /dev/sdf </initialLocation> <volume href="http://localhost:3001/cimi/volumes/vol3"/></MachineVolume>'  http://localhost:3001/cimi/machines/inst1/volume_attach
+</pre>
+
+<p>Attach a Volume to a Machine, with JSON body:</p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Content-Type: application/json" -H "Accept: application/xml" -X POST -d '{"resourceURI":"http://schemas.dmtf.org/cimi/1/MachineVolume", "initialLocation": "/dev/sdf", "volume": {"href":"http://localhost:3001/cimi/volumes/vol2"}}' http://localhost:3001/cimi/machines/inst1/volume_attach
+</pre>
+
+<p>Detach a Volume from a Machine:</p>
+
+<pre>
+curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" -X DELETE http://localhost:3001/cimi/machines/inst1/volumes/vol2
+</pre>
+
+</div>

Added: deltacloud/trunk/site/content/cimi-curl/cimi-curl-resource_metadata.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-curl/cimi-curl-resource_metadata.md?rev=1436451&view=auto
==============================================================================
--- deltacloud/trunk/site/content/cimi-curl/cimi-curl-resource_metadata.md (added)
+++ deltacloud/trunk/site/content/cimi-curl/cimi-curl-resource_metadata.md Mon Jan 21 16:18:03 2013
@@ -0,0 +1,45 @@
+---
+site_name: Deltacloud API
+title: CIMI cURL Examples - Resource Metadata Resources
+---
+
+<br/>
+
+<div class="row">
+
+  <div class="span8">
+
+    <h3 id="command">cURL examples for CIMI Resource Metadata resources</h3>
+
+  </div>
+
+  <div class="span4">
+
+<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 class="active"><a href="/cimi-curl/cimi-curl-resource_metadata.html">ResourceMetadata</a></li>
+  </ul>
+  <br/>
+</ul>
+
+  </div>
+
+</div>
+
+
+  <p> Retrieve the Resource Metadata collection in xml format:<p>
+
+  <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/resource_metadata</pre>
+
+  <p> Retrieve the Resource Metadata resource corresponding to the Cloud Entry Point resource, in json format:</p>
+
+  <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/resource_metadata/cloud_entry_point </pre>
+
+  <p> Retrieve the Resource Metadata resource corresponding to the Machine resource, in xml format:</p>
+
+  <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/json" http://localhost:3001/cimi/resource_metadata/machine </pre>

Added: deltacloud/trunk/site/content/cimi-curl/cimi-curl-volumes.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-curl/cimi-curl-volumes.md?rev=1436451&view=auto
==============================================================================
--- deltacloud/trunk/site/content/cimi-curl/cimi-curl-volumes.md (added)
+++ deltacloud/trunk/site/content/cimi-curl/cimi-curl-volumes.md Mon Jan 21 16:18:03 2013
@@ -0,0 +1,172 @@
+---
+site_name: Deltacloud API
+title: CIMI cURL Examples - Volume Resources
+---
+
+<br/>
+
+<div class="row">
+
+  <div class="span8">
+
+    <h3 id="command">cURL examples for CIMI Volume resources</h3>
+
+<ul class="nav nav-pills">
+  <li class="active"><a href="#volumes" data-toggle="tab">Working with Volumes</a></li>
+  <li><a href="#volume-images" data-toggle="tab">Working with VolumeImages</a></li>
+  <li><a href="#volume-configs" data-toggle="tab">Working with VolumeConfigurations</a></li>
+  <li><a href="#volume-templates" data-toggle="tab">Working with VolumeTemplates</a></li>
+</ul>
+
+
+  </div>
+
+  <div class="span4">
+
+<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 class="active"><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>
+
+</div>
+
+<div class="tab-content">
+
+  <div class="tab-pane active" id="volumes">
+
+    <hr/>
+
+    <h4>Working with Volumes</h4>
+
+    <p>Retrieve the Volume Collection in json format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/volumes </pre>
+
+    <p>Retrieve a specific Volume in xml format: </p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/xml" http://localhost:3001/cimi/volumes/volume1 </pre>
+
+    <p>Create Volume - with VolumeConfiguration by reference, XML body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Accept:application/xml" -X POST -d '&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;' http://localhost:3001//cimi/volumes
+     </pre>
+
+    <p>Create Volume - with VolumeConfiguration by reference, JSON body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Accept:application/xml" -X POST -d '{"name": "marios_new_volume", "description": "a new volume", "volumeTemplate": { "volumeConfig": {"href":"http://localhost:3001/cimi/volume_configurations/2" }}}' http://localhost:3001//cimi/volumes
+    </pre>
+
+    <p>Create Volume - with VolumeConfiguration by value, XML body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Accept:application/xml" -X POST -d '&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;' http://localhost:3001//cimi/volumes
+    </pre>
+
+    <p>Create Volume - with VolumeConfiguration by value, JSON body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Accept:application/xml"  -X POST -d '{"name": "marios_new_volume", "description": "a new volume", "volumeTemplate": { "volumeConfig": {"type":"http://schemas.dmtf.org/cimi/1/mapped", "capacity": 1024 }}}'   http://localhost:3001/cimi/volumes
+    </pre>
+
+    <p>Delete a Volume</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" -X DELETE http://localhost:3001/cimi/volumes/volume94275
+    </pre>
+
+  </div>
+
+  <div class="tab-pane" id="volume-images">
+
+    <hr/>
+
+    <h4>Working with Volume Images</h4>
+
+    <p>Retrieve the Volume Image Collection in xml format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/xml" http://localhost:3001/cimi/volume_images</pre>
+
+    <p>Retrieve a specific Volume Image in json format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/volume_images/vol_image1 </pre>
+
+    <p>Create a Volume Image from an existing Volume, XML body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -X POST -d '&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;' http://localhost:3001/cimi/volume_images
+    </pre>
+
+    <p>Create a Volume Image from an existing Volume, JSON body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Content-Type: application/json" -H "Accept: application/xml" -X POST -d  '{ "resourceURI": "http://schemas.dmtf.org/cimi/1/VolumeImage","name": "some_name", "description": "marios first volume image", "imageLocation": { "href": "http://localhost:3001/cimi/volumes/vol1"}}' http://localhost:3001/cimi/volume_images</pre>
+
+    <p>Delete a Volume Image:</p>
+
+    <pre>curl -v -X DELETE --user "mockuser:mockpassword" http://localhost:3001/cimi/volume_images/store_snapshot_1358516615</pre>
+
+  </div>
+
+
+  <div class="tab-pane" id="volume-configs">
+
+    <hr/>
+
+    <h4>Working with Volume Configurations</h4>
+
+    <p>Retrieve the Volume Configuration Collection in json format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/volume_configurations </pre>
+
+    <p>Retrieve a specific Volume Configuration in xml format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/xml" http://localhost:3001/cimi/volume_configurations/volume_config1 </pre>
+
+    <p>Create a new Volume Configuration with XML body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -X POST -d '&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;type&gt;http://schemas.dmtf.org/cimi/1/mapped&lt;/type&gt; &lt;capacity&gt;10&lt;/capacity&gt;&lt;/VolumeConfigurationCreate&gt;' http://localhost:3001/cimi/volume_configurations
+    </pre>
+
+    <p>Create a new Volume Configuration with JSON body:</p>
+
+   <pre>curl -v --user "mockuser:mockpassword" -H "Content-Type: application/json" -H "Accept: application/xml" -X POST -d '{ "resourceURI": "http://schemas.dmtf.org/cimi/1/VolumeConfiguration","name": "marios_volume_config", "description": "a volume configuration", "type": "http://schemas.dmtf.org/cimi/1/mapped", "format": "ext3", "capacity": 11}' http://localhost:3001/cimi/volume_configurations</pre>
+
+    <p>Delete a Volume Configuration:</p>
+
+    <pre>curl -v -X DELETE --user "mockuser:mockpassword" http://localhost:3001/cimi/volume_configurations/4 </pre>
+
+  </div>
+
+
+  <div class="tab-pane" id="volume-templates">
+
+    <hr/>
+
+    <h4>Working with Volume Templates</h4>
+
+    <p>Retrieve the Volume Template Collection in json format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/json" http://localhost:3001/cimi/volume_templates </pre>
+
+    <p>Retrieve a specific Volume Template in xml format:</p>
+
+    <pre> curl --user "user:pass" -H "Accept: application/xml" http://localhost:3001/cimi/volume_templates/vol_template123</pre>
+
+    <p>Create a Volume Template with XML body:</p>
+
+    <pre>curl --user "mockuser:mockpassword" -H "Content-Type: application/xml" -H "Accept: application/xml" -X POST -d '&lt;VolumeTemplate xmlns="http://schemas.dmtf.org/cimi/1"&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;/volumeConfig&gt; &lt;/VolumeTemplate&gt;' http://localhost:3001/cimi/volume_templates</pre>
+
+    <p>Create a Volume Template with JSON body:</p>
+
+    <pre>curl -v --user "mockuser:mockpassword" -H "Content-Type: application/json" -H "Accept: application/xml" -X POST -d '{ "resourceURI": "http://schemas.dmtf.org/cimi/1/VolumeTemplate","name": "marios_vol_template", "description": "my first volume template", "volumeConfig": { "href": "http://localhost:3001/cimi/volume_configs/1"} }' http://localhost:3001/cimi/volume_templates </pre>
+
+    <p>Delete a Volume Template:</p>
+
+    <pre>curl -v -X DELETE --user "mockuser:mockpassword" http://localhost:3001/cimi/volume_templates/vol_template123</pre>
+
+  </div>
+</div>

Modified: deltacloud/trunk/site/content/cimi-rest.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-rest.md?rev=1436451&r1=1436450&r2=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/content/cimi-rest.md (original)
+++ deltacloud/trunk/site/content/cimi-rest.md Mon Jan 21 16:18:03 2013
@@ -26,13 +26,25 @@ Apache Deltacloud exposes the DMTF <a hr
 
   <div class="span3">
 
+
 <ul class="nav nav-list well">
   <li class="nav-header">
     CIMI REST API
   </li>
   <li class="active"><a href="/cimi-rest.html">Introduction</a></li>
-  <li><a href="/cimi-rest-entry-point.html">Cloud Entry Point</a></li>
-  <li><a href="/cimi-rest-collections.html">CIMI Resources</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>
+
 </ul>
 
   </div>
@@ -42,6 +54,11 @@ Apache Deltacloud exposes the DMTF <a hr
 This page shows examples of interactions with the CIMI interface exposed by a Deltacloud server. The examples here cover the CIMI resources and collections that are currently supported in Deltacloud; we are constantly improving our CIMI implementation. If you come across any bugs or inconsistencies we'd be very happy 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>
 
 <h3 id="cimi_rest_introduction">Starting Deltacloud with the CIMI interface</h3>

Copied: deltacloud/trunk/site/content/cimi-rest/cimi-rest-collections.md (from r1435248, deltacloud/trunk/site/content/cimi-rest-collections.md)
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-rest/cimi-rest-collections.md?p2=deltacloud/trunk/site/content/cimi-rest/cimi-rest-collections.md&p1=deltacloud/trunk/site/content/cimi-rest-collections.md&r1=1435248&r2=1436451&rev=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/content/cimi-rest-collections.md (original)
+++ deltacloud/trunk/site/content/cimi-rest/cimi-rest-collections.md Mon Jan 21 16:18:03 2013
@@ -13,11 +13,14 @@ title: CIMI Resource Collections - Machi
 <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 bold and italic type are taken from the CIMI 1.0.1 specification, available from the DMTF <a href="http://dmtf.org/cloud">Cloud Management Initiative</a> (DSP0263).
+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>
@@ -35,12 +38,28 @@ A Machine Collection resource represents
     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><a href="/cimi-rest-collections.html">CIMI Resources</a></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/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 class="active"><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><a href="/cimi-rest/cimi-rest-machine-templates.html">MachineTemplate</a></li>
+  </ul>
 
 </ul>
 
@@ -53,6 +72,7 @@ A Machine Collection resource represents
   <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>
@@ -300,5 +320,135 @@ Server: thin 1.5.0 codename Knife
 
   </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>

Copied: deltacloud/trunk/site/content/cimi-rest/cimi-rest-entry-point.md (from r1435248, deltacloud/trunk/site/content/cimi-rest-entry-point.md)
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-rest/cimi-rest-entry-point.md?p2=deltacloud/trunk/site/content/cimi-rest/cimi-rest-entry-point.md&p1=deltacloud/trunk/site/content/cimi-rest-entry-point.md&r1=1435248&r2=1436451&rev=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/content/cimi-rest-entry-point.md (original)
+++ deltacloud/trunk/site/content/cimi-rest/cimi-rest-entry-point.md Mon Jan 21 16:18:03 2013
@@ -28,8 +28,19 @@ A deltacloud server exposes the CIMI Clo
     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><a href="/cimi-rest-collections.html">CIMI Resources</a></li>
+  <li class="active"><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>
+
 </ul>
 
   </div>

Added: deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-configs.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-configs.md?rev=1436451&view=auto
==============================================================================
--- deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-configs.md (added)
+++ deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-configs.md Mon Jan 21 16:18:03 2013
@@ -0,0 +1,181 @@
+---
+site_name: Deltacloud API
+title: CIMI Resource Collections - Machine Configuration
+---
+
+<br/>
+
+<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/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 class="active"><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="#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>
+

Copied: deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-images.md (from r1435248, deltacloud/trunk/site/content/cimi-rest-machine-images.md)
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-images.md?p2=deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-images.md&p1=deltacloud/trunk/site/content/cimi-rest-machine-images.md&r1=1435248&r2=1436451&rev=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/content/cimi-rest-machine-images.md (original)
+++ deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-images.md Mon Jan 21 16:18:03 2013
@@ -19,17 +19,34 @@ A Machine Image Collection resource repr
   </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><a href="/cimi-rest-collections.html">CIMI Resources</a></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/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>
 

Added: deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-templates.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-templates.md?rev=1436451&view=auto
==============================================================================
--- deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-templates.md (added)
+++ deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-templates.md Mon Jan 21 16:18:03 2013
@@ -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>

Added: deltacloud/trunk/site/content/cimi-rest/cimi-rest-resource-metadata.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-rest/cimi-rest-resource-metadata.md?rev=1436451&view=auto
==============================================================================
--- deltacloud/trunk/site/content/cimi-rest/cimi-rest-resource-metadata.md (added)
+++ deltacloud/trunk/site/content/cimi-rest/cimi-rest-resource-metadata.md Mon Jan 21 16:18:03 2013
@@ -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>

Added: deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-configs.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-configs.md?rev=1436451&view=auto
==============================================================================
--- deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-configs.md (added)
+++ deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-configs.md Mon Jan 21 16:18:03 2013
@@ -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>



Mime
View raw message