deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject svn commit: r1436451 [2/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
Added: deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-images.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-images.md?rev=1436451&view=auto
==============================================================================
--- deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-images.md (added)
+++ deltacloud/trunk/site/content/cimi-rest/cimi-rest-volume-images.md Mon Jan 21 16:18:03 2013
@@ -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>

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

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

Modified: deltacloud/trunk/site/output/cimi-curl.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-curl.html?rev=1436451&r1=1436450&r2=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-curl.html (original)
+++ deltacloud/trunk/site/output/cimi-curl.html Mon Jan 21 16:18:03 2013
@@ -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>
-
-<p>Create a new Machine Image from an existing Machine, with message body in JSON:</p>
+curl -v -X DELETE --user "username:password" -H "Accept: application/xml" http://localhost:3001/cimi/machine_images/my_image
+      </pre>
 
-<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>
+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">
 
-<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>

Copied: deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html (from r1435248, deltacloud/trunk/site/output/cimi-curl.html)
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html?p2=deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html&p1=deltacloud/trunk/site/output/cimi-curl.html&r1=1435248&r2=1436451&rev=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-curl.html (original)
+++ deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html Mon Jan 21 16:18:03 2013
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>CIMI cURL Examples</title>
+    <title>CIMI cURL Examples - Machine Resources</title>
     <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
     <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -100,40 +100,40 @@
 
   <div class="span8">
 
-    <h3 id="command">Working with cURL against the Deltacloud CIMI frontend</h3>
+    <h3 id="command">cURL examples for CIMI Machine resources</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>
-
-  <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
-    </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>
+<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">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>
+<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-machines.html">Machine</a></li>
+    <li><a href="cimi-curl-volumes.html">Volume</a></li>
+    <li><a href="cimi-curl-resource_metadata.html">ResourceMetadata</a></li>
+  </ul>
+<br>
+</ul>
 </div>
+
 </div>
 
-<hr><h4 id="machines">Working with Machines</h4>
+<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>
 
@@ -161,9 +161,12 @@ curl -v -X POST --user "mockuser:mockpas
  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>
+<br><hr>
+</div>
+
+<div class="tab-pane" id="machine-images">
 
-<hr><h4 id="machine-images">Working with Machine Images</h4>
+<h4 id="machine-images">Working with Machine Images</h4>
 
 <p>Retrieve the Machine Image Collection:</p>
 
@@ -177,6 +180,7 @@ curl --user "user:pass" -H "Accept: appl
 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>
@@ -187,6 +191,92 @@ curl -v --user "mockuser:mockpassword" -
 
 <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"></volume></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>
+</div>
+
       <footer class="footer">
         <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
         <div class='row'>

Copied: deltacloud/trunk/site/output/cimi-curl/cimi-curl-resource_metadata.html (from r1435248, deltacloud/trunk/site/output/cimi-rest.html)
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-curl/cimi-curl-resource_metadata.html?p2=deltacloud/trunk/site/output/cimi-curl/cimi-curl-resource_metadata.html&p1=deltacloud/trunk/site/output/cimi-rest.html&r1=1435248&r2=1436451&rev=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest.html (original)
+++ deltacloud/trunk/site/output/cimi-curl/cimi-curl-resource_metadata.html Mon Jan 21 16:18:03 2013
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>CIMI REST Examples</title>
+    <title>CIMI cURL Examples - Resource Metadata Resources</title>
     <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
     <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -97,60 +97,41 @@
       <p><br></p>
 
 <div class="row">
-  <div class="span9">
 
-<h3 id="rest">The CIMI REST API</h3>
+  <div class="span8">
 
-<p>
-Apache Deltacloud exposes the DMTF <a href="http://dmtf.org/cloud">Cloud Infrastructure Management Interface</a> (CIMI) as an alternative to the native <a href="rest-api.html">Deltacloud API</a>. This means that clients can 'speak' the CIMI API to a Deltacloud server on the frontend, managing resources in any of the backend cloud providers <a href="drivers.html#drivers">supported by Deltacloud</a>.
-</p>
+    <h3 id="command">cURL examples for CIMI Resource Metadata resources</h3>
 
+  </div>
 
-<div class="alert alert-error">
-  <strong>Note: </strong>
-  <p>
-    This is <strong> NOT </strong> a definitive guide to the DMTF CIMI specification. The full CIMI spec is available from the DMTF <a href="http://dmtf.org/cloud">Cloud Management Initiative</a> (DSP0263).
-  </p>
-</div>
-
- </div>
-
-  <div class="span3">
+  <div class="span4">
 
 <ul class="nav nav-list well">
 <li class="nav-header">
-    CIMI REST API
+    <a href="../cimi-curl.html">curl for CIMI Resources</a>
   </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>
+  <ul class="nav nav-list">
+<li><a href="cimi-curl-machines.html">Machine</a></li>
+    <li><a href="cimi-curl-volumes.html">Volume</a></li>
+    <li class="active"><a href="cimi-curl-resource_metadata.html">ResourceMetadata</a></li>
+  </ul>
+<br>
 </ul>
 </div>
 
 </div>
-<p>
-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>
 
-<hr><h3 id="cimi_rest_introduction">Starting Deltacloud with the CIMI interface</h3>
+<p> Retrieve the Resource Metadata collection in xml format:</p><p>
 
-<p>The <strong> –frontends (-f)</strong> flag is used to specify which frontends a deltacloud server should expose:
-<br><br></p>
-<pre>
+  </p><pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/resource_metadata</pre>
 
-[user@name ~]$ deltacloudd -i ec2 -f cimi
-Starting Deltacloud API :: ec2 :: http://localhost:3001/cimi/cloudEntryPoint
+  <p> Retrieve the Resource Metadata resource corresponding to the Cloud Entry Point resource, in json format:</p>
 
-&gt;&gt; Thin web server (v1.5.0 codename Knife)
-&gt;&gt; Debugging ON
-&gt;&gt; Maximum connections set to 1024
-&gt;&gt; Listening on localhost:3001, CTRL+C to stop
+  <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/resource_metadata/cloud_entry_point </pre>
 
-</pre>
-<p><br>
-The example above shows the deltacloud server with the CIMI interface and the EC2 driver. You can even expose both the deltacloud and the CIMI frontends with a single server, e.g. <strong> -f cimi,deltacloud </strong>.</p>
+  <p> Retrieve the Resource Metadata resource corresponding to the Machine resource, in xml format:</p>
 
-<p>As can be seen above, starting deltacloud in this way will expose the CIMI <a href="cimi-rest-entry-point.html">cloud entry point</a> at localhost:3001/cimi/cloudEntryPoint.</p>
+  <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/json" http://localhost:3001/cimi/resource_metadata/machine </pre>
 
       <footer class="footer">
         <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>

Added: deltacloud/trunk/site/output/cimi-curl/cimi-curl-volumes.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-curl/cimi-curl-volumes.html?rev=1436451&view=auto
==============================================================================
--- deltacloud/trunk/site/output/cimi-curl/cimi-curl-volumes.html (added)
+++ deltacloud/trunk/site/output/cimi-curl/cimi-curl-volumes.html Mon Jan 21 16:18:03 2013
@@ -0,0 +1,291 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>CIMI cURL Examples - Volume Resources</title>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le JavaScript -->
+    <script src="/assets/js/jquery-1.7.1.min.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-dropdown.js" type="text/javascript"></script>
+    <script src="/assets/js/jquery.tweet.js" type="text/javascript"></script>
+    <script src="/assets/js/application.js" type="text/javascript"></script>
+    <script src="/assets/js/bootstrap-transition.js"></script>
+    <script src="/assets/js/bootstrap-alert.js"></script>
+    <script src="/assets/js/bootstrap-modal.js"></script>
+    <script src="/assets/js/bootstrap-scrollspy.js"></script>
+    <script src="/assets/js/bootstrap-tab.js"></script>
+    <script src="/assets/js/bootstrap-tooltip.js"></script>
+    <script src="/assets/js/bootstrap-popover.js"></script>
+    <script src="/assets/js/bootstrap-button.js"></script>
+    <script src="/assets/js/bootstrap-collapse.js"></script>
+    <script src="/assets/js/bootstrap-carousel.js"></script>
+    <script src="/assets/js/bootstrap-typeahead.js"></script>
+
+    <!-- Le styles -->
+    <link href="/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="/assets/css/application.css" rel="stylesheet">
+    <link rel="shortcut icon" href="/assets/img/favicon.ico">
+  </head>
+
+  <body>
+
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/"><img src="/assets/img/logo.png" width="152"
+            alt="Deltacloud API"/></a>
+          <ul class="nav top-nav">
+  <li><a href="/">Home</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/about.html">What is Deltacloud?</a></li>
+      <li><a href="/supported-providers.html">Supported Providers</a></li>
+    </ul>
+  </li>
+  <li><a href="/download.html">Download</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Installation<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/install-deltacloud.html">Install Deltacloud</a></li>
+      <li><a href="/run-deltacloud-server.html">Run the Deltacloud Server</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="/usage.html" class="dropdown-toggle" data-toggle="dropdown">Usage<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/usage.html#usingapi">Using API</a></li>
+      <li><a href="/usage.html#clients">Client Libraries</a></li>
+      <li><a href="/command-tools.html">Command Line Tools</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contribute<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/getting-sources.html">Getting Sources</a></li>
+      <li><a href="/how-to-contribute.html">How Can I Contribute?</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/rest-api.html">REST API</a></li>
+      <li><a href="/drivers.html">Drivers API</a></li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">CIMI<b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li><a href="/cimi-rest.html">CIMI REST API</a></li>
+      <li><a href="/cimi-curl.html">CIMI cURL Examples</a></li>
+    </ul>
+  </li>
+  <li><a href="/contact.html">Contact</a></li>
+</ul>
+
+        </div>
+      </div>
+
+    </div>
+
+    <div class="container content">
+
+      <p><br></p>
+
+<div class="row">
+
+  <div class="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-machines.html">Machine</a></li>
+    <li class="active"><a href="cimi-curl-volumes.html">Volume</a></li>
+    <li><a href="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>
+
+      <footer class="footer">
+        <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>
+        <div class='row'>
+          <div class='span3'>
+            <img src="/assets/img/asf.png" alt="Apache Software Foundation"/>
+          </div>
+          <div class='span9'>
+            <strong>Apache Deltacloud</strong> is a top-level project at the <a
+              href="http://www.apache.org">Apache Software Foundation</a>,
+            having graduated from the ASF Incubator in October
+            2011. Through a collaborative and meritocratic development process, Apache
+            projects deliver enterprise-grade, freely available software products that
+            attract large communities of users. 
+          </div>
+        </div>
+      </footer>
+
+    </div> <!-- /container -->
+
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.salasaga.org/aeolus/piwik/" : "http://stats.salasaga.org/aeolus/piwik/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 2);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://stats.salasaga.org/aeolus/piwik/piwik.php?idsite=2" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+  </body>
+</html>

Modified: deltacloud/trunk/site/output/cimi-rest.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest.html?rev=1436451&r1=1436450&r2=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest.html (original)
+++ deltacloud/trunk/site/output/cimi-rest.html Mon Jan 21 16:18:03 2013
@@ -117,13 +117,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>
 
@@ -132,6 +144,10 @@ 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>
 
 <p>The <strong> –frontends (-f)</strong> flag is used to specify which frontends a deltacloud server should expose:

Copied: deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html (from r1435248, deltacloud/trunk/site/output/cimi-rest-collections.html)
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html?p2=deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html&p1=deltacloud/trunk/site/output/cimi-rest-collections.html&r1=1435248&r2=1436451&rev=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest-collections.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html Mon Jan 21 16:18:03 2013
@@ -101,14 +101,14 @@
 
 <h3 id="cimi-entry-point">CIMI Resources and Collections</h3>
 
-<p> We are continually improving CIMI support in Deltacloud. If you come across any inconsistencies or errors in the Deltacloud CIMI implementation we'll be very glad to <a href="contact.html">hear about them</a>.</p>
+<p> 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>
-<h3 id="cimi-machine">Machine</h3>
+<br><br><h3 id="cimi-machine">Machine</h3>
 <p>
 <strong><em>
 An instantiated compute resource that encapsulates both CPU and Memory.
@@ -124,13 +124,29 @@ A Machine Collection resource represents
 <li class="nav-header">
     CIMI REST API
   </li>
-  <li><a href="cimi-rest.html">Introduction</a></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 class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      CIMI Resources
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+<li><a href="cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="cimi-rest-collections.html">Machine</a></li>
+      <li><a href="cimi-rest-volumes.html">Volume</a></li>
     </ul>
+</li>
+  <hr>
+<li class="nav-header">
+    Machine Resources
+  </li>
+  <ul class="nav nav-list">
+<li class="active"><a href="cimi-rest-collections.html">Machine</a></li>
+    <li><a href="cimi-rest-machine-images.html">MachineImage</a></li>
+    <li><a href="cimi-rest-machine-configs.html">MachineConfiguration</a></li>
+    <li><a href="cimi-rest-machine-templates.html">MachineTemplate</a></li>
+  </ul>
 </ul>
 </div>
 
@@ -141,6 +157,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><div class="tab-content">
   <div class="tab-pane active" id="tab1">
 
@@ -381,6 +398,132 @@ 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/output/cimi-rest/cimi-rest-entry-point.html (from r1435248, deltacloud/trunk/site/output/cimi-rest-entry-point.html)
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-entry-point.html?p2=deltacloud/trunk/site/output/cimi-rest/cimi-rest-entry-point.html&p1=deltacloud/trunk/site/output/cimi-rest-entry-point.html&r1=1435248&r2=1436451&rev=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest-entry-point.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-entry-point.html Mon Jan 21 16:18:03 2013
@@ -107,7 +107,7 @@ Entry Point implements a catalog of reso
 Templates, etc., that can be queried and browsed by the Consumer.</em></strong>
 </p>
 <p>
-A deltacloud server exposes the CIMI Cloud Entry Point at /cimi/cloudEntryPoint. When dereferencing this URI, the resources listed in the response include only those that are supported by the current deltacloud driver - whether the 'default' driver the server was started with, or that specified with the <a href="drivers.html">X-Deltacloud-Driver</a> header.
+A deltacloud server exposes the CIMI Cloud Entry Point at /cimi/cloudEntryPoint. When dereferencing this URI, the resources listed in the response include only those that are supported by the current deltacloud driver - whether the 'default' driver the server was started with, or that specified with the <a href="../drivers.html">X-Deltacloud-Driver</a> header.
 </p>
 
  </div>
@@ -118,9 +118,20 @@ A deltacloud server exposes the CIMI Clo
 <li class="nav-header">
     CIMI REST API
   </li>
-  <li><a href="cimi-rest.html">Introduction</a></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="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      CIMI Resources
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+<li><a href="cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="cimi-rest-collections.html">Machine</a></li>
+      <li><a href="cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+</li>
+
 </ul>
 </div>
 

Copied: deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-configs.html (from r1435248, deltacloud/trunk/site/output/cimi-rest-entry-point.html)
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-configs.html?p2=deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-configs.html&p1=deltacloud/trunk/site/output/cimi-rest-entry-point.html&r1=1435248&r2=1436451&rev=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest-entry-point.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-configs.html Mon Jan 21 16:18:03 2013
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>CIMI Cloud Entry Point</title>
+    <title>CIMI Resource Collections - Machine Configuration</title>
     <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
     <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -99,86 +99,170 @@
 <div class="row">
   <div class="span9">
 
-<h3 id="cimi-entry-point">The CIMI Cloud Entry Point</h3>
-
-<p>
-<strong><em>The Cloud Entry Point represents the entry point into the cloud defined by the CIMI Model. The Cloud
-Entry Point implements a catalog of resources, such as Systems, System Templates, Machines, Machine
-Templates, etc., that can be queried and browsed by the Consumer.</em></strong>
-</p>
+<h3 id="cimi-machine-config">Machine Configuration</h3>
 <p>
-A deltacloud server exposes the CIMI Cloud Entry Point at /cimi/cloudEntryPoint. When dereferencing this URI, the resources listed in the response include only those that are supported by the current deltacloud driver - whether the 'default' driver the server was started with, or that specified with the <a href="drivers.html">X-Deltacloud-Driver</a> header.
+<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>
   <div class="span3">
 
 <ul class="nav nav-list well">
 <li class="nav-header">
     CIMI REST API
   </li>
-  <li><a href="cimi-rest.html">Introduction</a></li>
-  <li class="active"><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
-  <li><a href="cimi-rest-collections.html">CIMI Resources</a></li>
+  <li><a href="../cimi-rest.html">Introduction</a></li>
+  <li><a href="cimi-rest-entry-point.html">Cloud Entry Point</a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      CIMI Resources
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+<li><a href="cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="cimi-rest-collections.html">Machine</a></li>
+      <li><a href="cimi-rest-volumes.html">Volume</a></li>
+    </ul>
+</li>
+  <hr>
+<li class="nav-header">
+    Machine Resources
+  </li>
+  <ul class="nav nav-list">
+<li><a href="cimi-rest-collections.html">Machine</a></li>
+    <li><a href="cimi-rest-machine-images.html">MachineImage</a></li>
+    <li class="active"><a href="cimi-rest-machine-configs.html">MachineConfiguration</a></li>
+    <li><a href="cimi-rest-machine-templates.html">MachineTemplate</a></li>
+  </ul>
 </ul>
 </div>
 
 </div>
 
-<p>
-Example request:
-</p>
+<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/cloudEntryPoint HTTP/1.1
- Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
- User-Agent: curl/7.24.0 (i686-redhat-linux-gnu)
- Host: localhost:3001
- Accept: application/xml
+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>
-Example response:
-</p>
+<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: 1754
-ETag: 503bc06f24d1a51eddc62b33b870c70f
+Content-Length: 508
+ETag: 33c094bbcec51437860280fd053f1023
 Cache-Control: max-age=0, private, must-revalidate
-Date: Thu, 27 Dec 2012 15:23:23 GMT
+Date: Wed, 02 Jan 2013 14:20:52 GMT
 Connection: keep-alive
 Server: thin 1.5.0 codename Knife
 
-&lt;CloudEntryPoint xmlns="http://schemas.dmtf.org/cimi/1" resourceURI="http://schemas.dmtf.org/cimi/1/CloudEntryPoint"&gt;
-  &lt;id&gt;http://localhost:3001/cimi/cloudEntryPoint&lt;/id&gt;
-  &lt;name&gt;mock&lt;/name&gt;
-  &lt;description&gt;Cloud Entry Point for the Deltacloud mock driver&lt;/description&gt;
-  &lt;created&gt;2012-12-27T17:23:23+02:00&lt;/created&gt;
-  &lt;baseURI&gt;http://localhost:3001/cimi/&lt;/baseURI&gt;
-  &lt;resourceMetadata href="http://localhost:3001/cimi/resource_metadata" /&gt;
-  &lt;machines href="http://localhost:3001/cimi/machines" /&gt;
-  &lt;machineTemplates href="http://localhost:3001/cimi/machine_templates" /&gt;
-  &lt;machineImages href="http://localhost:3001/cimi/machine_images" /&gt;
-  &lt;credentials href="http://localhost:3001/cimi/credentials" /&gt;
-  &lt;volumes href="http://localhost:3001/cimi/volumes" /&gt;
-  &lt;volumeImages href="http://localhost:3001/cimi/volume_images" /&gt;
-  &lt;networks href="http://localhost:3001/cimi/networks" /&gt;
-  &lt;networkTemplates href="http://localhost:3001/cimi/network_templates" /&gt;
-  &lt;networkPorts href="http://localhost:3001/cimi/network_ports" /&gt;
-  &lt;networkPortTemplates href="http://localhost:3001/cimi/network_port_templates" /&gt;
-  &lt;addresses href="http://localhost:3001/cimi/addresses" /&gt;
-  &lt;addressTemplates href="http://localhost:3001/cimi/address_templates" /&gt;
-  &lt;forwardingGroups href="http://localhost:3001/cimi/forwarding_groups" /&gt;
-  &lt;forwardingGroupTemplates href="http://localhost:3001/cimi/forwarding_group_templates" /&gt;
-  &lt;volumeConfigs href="http://localhost:3001/cimi/volume_configurations" /&gt;
-  &lt;machineConfigs href="http://localhost:3001/cimi/machine_configurations" /&gt;
-  &lt;networkConfigs href="http://localhost:3001/cimi/network_configurations" /&gt;
-  &lt;networkPortConfigs href="http://localhost:3001/cimi/network_port_configurations" /&gt;
-&lt;/CloudEntryPoint&gt;
+&lt;MachineConfiguration xmlns="http://schemas.dmtf.org/cimi/1"
+          resourceURI="http://schemas.dmtf.org/cimi/1/MachineConfiguration"&gt;
+  &lt;id&gt;http://localhost:3001/cimi/machine_configurations/m1-large&lt;/id&gt;
+  &lt;name&gt;m1-large&lt;/name&gt;
+  &lt;description&gt;Machine Configuration with 10485760 KiB of memory and 1 CPU&lt;/description&gt;
+  &lt;created&gt;2013-01-02T16:20:52+02:00&lt;/created&gt;
+  &lt;cpu&gt;1&lt;/cpu&gt;
+  &lt;memory&gt;10485760&lt;/memory&gt;
+  &lt;disk&gt;
+    &lt;capacity&gt;891289600&lt;/capacity&gt;
+    &lt;format&gt;unknown&lt;/format&gt;
+  &lt;/disk&gt;
+&lt;/MachineConfiguration&gt;
+
+
 </pre>
+  </div>
+</div>
 
       <footer class="footer">
         <p class="pull-right"><span class='icon-circle-arrow-up'>&nbsp;</span><a href="#">Back to top</a></p>

Copied: deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-images.html (from r1435248, deltacloud/trunk/site/output/cimi-rest-machine-images.html)
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-images.html?p2=deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-images.html&p1=deltacloud/trunk/site/output/cimi-rest-machine-images.html&r1=1435248&r2=1436451&rev=1436451&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest-machine-images.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-images.html Mon Jan 21 16:18:03 2013
@@ -110,17 +110,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.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 class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      CIMI Resources
+      <b class="caret"></b>
+    </a>
+    <ul class="dropdown-menu">
+<li><a href="cimi-rest-resource-metadata.html">ResourceMetadata</a></li>
+      <li><a href="cimi-rest-collections.html">Machine</a></li>
+      <li><a href="cimi-rest-volumes.html">Volume</a></li>
     </ul>
+</li>
+  <hr>
+<li class="nav-header">
+    Machine Resources
+  </li>
+  <ul class="nav nav-list">
+<li><a href="cimi-rest-collections.html">Machine</a></li>
+    <li class="active"><a href="cimi-rest-machine-images.html">MachineImage</a></li>
+    <li><a href="cimi-rest-machine-configs.html">MachineConfiguration</a></li>
+    <li><a href="cimi-rest-machine-templates.html">MachineTemplate</a></li>
+  </ul>
 </ul>
 </div>
 



Mime
View raw message