You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2013/02/21 16:51:10 UTC
svn commit: r1448691 [1/2] - in /deltacloud/trunk/site: content/ output/
output/cimi-curl/ output/cimi-rest/
Author: mfojtik
Date: Thu Feb 21 15:51:08 2013
New Revision: 1448691
URL: http://svn.apache.org/r1448691
Log:
Fixed conflict
Modified:
deltacloud/trunk/site/content/download.md
deltacloud/trunk/site/content/index.md
deltacloud/trunk/site/output/about.html
deltacloud/trunk/site/output/addresses.html
deltacloud/trunk/site/output/api-docs.html
deltacloud/trunk/site/output/api-entry-point.html
deltacloud/trunk/site/output/blob-storage.html
deltacloud/trunk/site/output/cimi-curl.html
deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html
deltacloud/trunk/site/output/cimi-curl/cimi-curl-resource_metadata.html
deltacloud/trunk/site/output/cimi-curl/cimi-curl-volumes.html
deltacloud/trunk/site/output/cimi-rest.html
deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html
deltacloud/trunk/site/output/cimi-rest/cimi-rest-entry-point.html
deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-configs.html
deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-images.html
deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-templates.html
deltacloud/trunk/site/output/cimi-rest/cimi-rest-resource-metadata.html
deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-configs.html
deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-images.html
deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-templates.html
deltacloud/trunk/site/output/cimi-rest/cimi-rest-volumes.html
deltacloud/trunk/site/output/clients.html
deltacloud/trunk/site/output/command-tools.html
deltacloud/trunk/site/output/compute-resources.html
deltacloud/trunk/site/output/contact.html
deltacloud/trunk/site/output/contribute.html
deltacloud/trunk/site/output/credentials.html
deltacloud/trunk/site/output/curl-examples.html
deltacloud/trunk/site/output/download.html
deltacloud/trunk/site/output/drivers.html
deltacloud/trunk/site/output/firewalls.html
deltacloud/trunk/site/output/getting-sources.html
deltacloud/trunk/site/output/hardware-profiles.html
deltacloud/trunk/site/output/how-to-contribute.html
deltacloud/trunk/site/output/images.html
deltacloud/trunk/site/output/index.html
deltacloud/trunk/site/output/install-deltacloud.html
deltacloud/trunk/site/output/instance-states.html
deltacloud/trunk/site/output/instances.html
deltacloud/trunk/site/output/join-deltacloud.html
deltacloud/trunk/site/output/keys.html
deltacloud/trunk/site/output/libdeltacloud.html
deltacloud/trunk/site/output/load-balancers.html
deltacloud/trunk/site/output/rest-api.html
deltacloud/trunk/site/output/ruby-client.html
deltacloud/trunk/site/output/run-deltacloud-server.html
deltacloud/trunk/site/output/send-patch.html
deltacloud/trunk/site/output/storage-resources.html
deltacloud/trunk/site/output/storage-snapshots.html
deltacloud/trunk/site/output/supported-providers.html
deltacloud/trunk/site/output/usage.html
deltacloud/trunk/site/output/use-the-api.html
deltacloud/trunk/site/output/write-new-driver.html
Modified: deltacloud/trunk/site/content/download.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/download.md?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/content/download.md (original)
+++ deltacloud/trunk/site/content/download.md Thu Feb 21 15:51:08 2013
@@ -5,7 +5,7 @@ title: Download
<br/>
<h3>Download</h3>
<p>
- Version <b>1.1.0</b> of Apache Deltacloud is available. See the
+ Version <b>1.1.1</b> of Apache Deltacloud is available. See the
<a href="https://git-wip-us.apache.org/repos/asf?p=deltacloud.git;a=blob;f=NEWS">release notes</a>.
</p>
<p>
@@ -21,44 +21,44 @@ title: Download
<tr>
<td><strong>server-gem</strong></td>
<td>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.0.gem">deltacloud-core-1.1.0.gem</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.1.gem">deltacloud-core-1.1.1.gem</a>
(
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.0.gem.asc">PGP</a>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.0.gem.md5">MD5</a>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.0.gem.sha1">SHA1</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.1.gem.asc">PGP</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.1.gem.md5">MD5</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.1.gem.sha1">SHA1</a>
)
</td>
</tr>
<tr>
<td><strong>server-sources</strong></td>
<td>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.0.tgz">deltacloud-core-1.1.0.tgz</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.1.tgz">deltacloud-core-1.1.1.tgz</a>
(
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.0.tgz.asc">PGP</a>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.0.tgz.md5">MD5</a>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.0.tgz.sha1">SHA1</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.1.tgz.asc">PGP</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.1.tgz.md5">MD5</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.1.tgz.sha1">SHA1</a>
)
</td>
</tr>
<tr>
<td><strong>client-gem</strong></td>
<td>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.0.gem">deltacloud-client-1.1.0.gem</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.1.gem">deltacloud-client-1.1.1.gem</a>
(
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.0.gem.asc">PGP</a>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.0.gem.md5">MD5</a>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.0.gem.sha1">SHA1</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.1.gem.asc">PGP</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.1.gem.md5">MD5</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.1.gem.sha1">SHA1</a>
)
</td>
</tr>
<tr>
<td><strong>client-sources</strong></td>
<td>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.0.tgz">deltacloud-client-1.1.0.tgz</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.1.tgz">deltacloud-client-1.1.1.tgz</a>
(
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.0.tgz.asc">PGP</a>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.0.tgz.md5">MD5</a>
- <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.0.tgz.sha1">SHA1</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.1.tgz.asc">PGP</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.1.tgz.md5">MD5</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.1.tgz.sha1">SHA1</a>
)
</td>
</tr>
@@ -104,15 +104,15 @@ title: Download
</p>
<pre>
$ pgpk -a KEYS
-$ pgpv deltacloud-core-1.1.0.tar.gz.asc
+$ pgpv deltacloud-core-1.1.1.tar.gz.asc
</pre>
or
<pre>
$ pgp -ka KEYS
-$ pgp deltacloud-core-1.1.0.tar.gz.asc
+$ pgp deltacloud-core-1.1.1.tar.gz.asc
</pre>
or
<pre>
$ gpg --import KEYS
-$ gpg --verify deltacloud-core-1.1.0.tar.gz.asc
+$ gpg --verify deltacloud-core-1.1.1.tar.gz.asc
</pre>
Modified: deltacloud/trunk/site/content/index.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/index.md?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/content/index.md (original)
+++ deltacloud/trunk/site/content/index.md Thu Feb 21 15:51:08 2013
@@ -44,7 +44,7 @@ title: Deltacloud API
<blockquote>
<p>
<strong>Current release:</strong><br>
- <a class="btn btn-info" href="/download.html"><b>deltacloud-core-1.1.0</b></a><br/>
+ <a class="btn btn-info" href="/download.html"><b>deltacloud-core-1.1.1</b></a><br/>
<small>More about <a href="/install-deltacloud.html">installation</a>...</small>
</p>
<br/>
Modified: deltacloud/trunk/site/output/about.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/about.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/about.html (original)
+++ deltacloud/trunk/site/output/about.html Thu Feb 21 15:51:08 2013
@@ -99,8 +99,11 @@
<div class="span4">
-<br><h3>About Deltacloud</h3>
-<br><p>Deltacloud provides the API server and drivers necessary for connecting to cloud providers.</p>
+<br>
+
+<h3>About Deltacloud</h3>
+<br>
+<p>Deltacloud provides the API server and drivers necessary for connecting to cloud providers.</p>
<p>Deltacloud maintains <strong>long-term stability</strong> for scripts, tools and applications and <strong>backward compatibility</strong> across different versions.</p>
@@ -109,21 +112,33 @@
<p>All of this means you can start an instance on an internal cloud and with the same code start another on EC2 or RHEV-M.</p>
</div>
-<br><div class="span8">
+<br>
+
+<div class="span8">
<img src="assets/img/diagram-soa.png" alt="Deltacloud API SOA diagram" align="center">
</div>
<div class="span12">
-<br><br><h3>How does Deltacloud work?</h3>
-<br><p>Deltacloud contains a cloud abstraction API - whether the <a href="rest-api.html">Deltacloud</a> classic API, the DMTF <a href="cimi-rest.html">CIMI API</a> or even the EC2 API. The API works as a wrapper around a large number of clouds, abstracting their differences. For every cloud <a href="supported-providers.html" rel="tooltip" title="currently supported providers">provider</a> there is a driver "speaking" that cloud provider's native API, freeing you from dealing with the particulars of each cloud's API.</p>
+<br>
+<br>
+<h3>How does Deltacloud work?</h3>
+<br>
+<p>Deltacloud contains a cloud abstraction API - whether the <a href="rest-api.html">Deltacloud</a> classic API, the DMTF <a href="cimi-rest.html">CIMI API</a> or even the EC2 API. The API works as a wrapper around a large number of clouds, abstracting their differences. For every cloud <a href="supported-providers.html" rel="tooltip" title="currently supported providers">provider</a> there is a driver "speaking" that cloud provider's native API, freeing you from dealing with the particulars of each cloud's API.</p>
<p>Install Deltacloud and start the <strong>deltacloudd</strong> daemon server. You can use your favourite HTTP client to talk to the server using the <a href="rest-api.html">Deltacloud REST API</a>, the DMTF <a href="cimi-rest.html">CIMI API</a> or even the EC2 API. Deltacloud even comes with an HTML interface so you can simply use your web browser to control your cloud infrastructure straight out of the box. The HTML interface is written with the <a href="http://jquerymobile.com/">jQuery mobile</a> framework, so it is compatible with your mobile or tablet devices.</p>
-<br><img src="assets/img/deltacloud_concept.gif" alt="Deltacloud concept scheme"><br><a class="btn btn-inverse btn-large" style="float: right" href="install-deltacloud.html">Get Deltacloud</a>
+<br>
+
+<img src="assets/img/deltacloud_concept.gif" alt="Deltacloud concept scheme">
+
+<br>
+
+<a class="btn btn-inverse btn-large" style="float: right" href="install-deltacloud.html">Get Deltacloud</a>
</div>
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/addresses.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/addresses.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/addresses.html (original)
+++ deltacloud/trunk/site/output/addresses.html Thu Feb 21 15:51:08 2013
@@ -110,35 +110,43 @@ The addresses collection represents IP a
This collection is currently implemented for Amazon EC2 and Fujitsu GCP drivers. For EC2, IP address management corresponds to Amazon's 'Elastic IP' feature.
</p>
-<br><p>
+<br>
+
+<p>
The addresses collection supports these operations:
</p>
<ul>
-<li>creating an address</li>
+ <li>creating an address</li>
<li>destroying an address</li>
<li>association an address with a running instance</li>
<li>dissociating an address from a running instance</li>
</ul>
-<br><br><ul class="nav nav-pills">
-<li class="active"><a href="#tab1" data-toggle="tab">Get a list of all addresses</a></li>
+
+<br>
+<br>
+
+<ul class="nav nav-pills">
+ <li class="active"><a href="#tab1" data-toggle="tab">Get a list of all addresses</a></li>
<li><a href="#tab2" data-toggle="tab">Get the details of an address</a></li>
<li><a href="#tab3" data-toggle="tab">Create/delete an address</a></li>
<li><a href="#tab4" data-toggle="tab">Associate/disassociate an address</a></li>
</ul>
+
<hr>
-</div>
+
+ </div>
<div class="span3">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
REST API
</li>
<li><a href="rest-api.html">Introduction</a></li>
<li><a href="api-entry-point.html">API entry point</a></li>
<li><a href="compute-resources.html">Compute resources</a></li>
<ul class="nav nav-list">
-<li><a href="compute-resources.html">Realms</a></li>
+ <li><a href="compute-resources.html">Realms</a></li>
<li><a href="hardware-profiles.html">Hardware profiles</a></li>
<li><a href="images.html">Images</a></li>
<li><a href="instance-states.html">Instance states</a></li>
@@ -148,9 +156,10 @@ The addresses collection supports these
<li class="active"><a href="#addresses">Addresses</a></li>
<li><a href="load-balancers.html">Load balancers</a></li>
</ul>
-<li><a href="storage-resources.html">Storage resources</a></li>
+ <li><a href="storage-resources.html">Storage resources</a></li>
</ul>
-</div>
+
+ </div>
</div>
<div class="tab-content">
@@ -364,6 +373,7 @@ Content-Length: 0
<p><br></p>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/api-docs.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/api-docs.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/api-docs.html (original)
+++ deltacloud/trunk/site/output/api-docs.html Thu Feb 21 15:51:08 2013
@@ -97,6 +97,7 @@
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/api-entry-point.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/api-entry-point.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/api-entry-point.html (original)
+++ deltacloud/trunk/site/output/api-entry-point.html Thu Feb 21 15:51:08 2013
@@ -112,22 +112,24 @@ Any part of the official API can be reac
<li>images</li>
<li>realms</li>
</ul>
-</div>
+
+ </div>
<div class="span3">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
REST API
</li>
<li><a href="rest-api.html">Introduction</a></li>
<li class="active"><a href="#api-entry">API entry point</a></li>
<ul class="nav nav-list">
-<li><a href="#feature">Features</a></li>
+ <li><a href="#feature">Features</a></li>
</ul>
-<li><a href="compute-resources.html">Compute resources</a></li>
+ <li><a href="compute-resources.html">Compute resources</a></li>
<li><a href="storage-resources.html">Storage resources</a></li>
</ul>
-</div>
+
+ </div>
</div>
<ul style="margin-top:0px">
@@ -139,7 +141,9 @@ Any part of the official API can be reac
<li>load balancers</li>
<li>addresses</li>
<li>firewalls</li>
-</ul><p>Example request:</p>
+</ul>
+
+<p>Example request:</p>
<pre>
GET /api?format=xml HTTP/1.1
@@ -227,90 +231,95 @@ These features are available to each col
</p>
<table class="table table-striped table-condensed">
-<thead><tr>
-<th>Feature</th>
+ <thead>
+ <tr>
+ <th>Feature</th>
<th>Collection</th>
<th>Operation</th>
<th>Description</th>
- </tr></thead>
-<tbody>
-<tr>
-<td>owner_id</td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>owner_id</td>
<td>Images</td>
<td>GET /api/images</td>
<td>allows filtering of the image list by owner_id</td>
</tr>
-<tr>
-<td>user_name</td>
+ <tr>
+ <td>user_name</td>
<td>Instances</td>
<td>POST /api/instances</td>
<td>accepts a user-defined name on instance creation</td>
</tr>
-<tr>
-<td>user_data</td>
+ <tr>
+ <td>user_data</td>
<td>Instances</td>
<td>POST /api/instances</td>
<td>provide user-defined data that is accessible by the running instance</td>
</tr>
-<tr>
-<td>user_iso</td>
+ <tr>
+ <td>user_iso</td>
<td>Instances</td>
<td>POST /api/instances</td>
<td>provides a base64 encoded gzipped ISO file accessible as CD-ROM drive by the running instnace</td>
</tr>
-<tr>
-<td>user_files</td>
+ <tr>
+ <td>user_files</td>
<td>Instances</td>
<td>POST /api/instances</td>
<td>accept files that will be placed into the launched instance</td>
</tr>
-<tr>
-<td>firewalls</td>
+ <tr>
+ <td>firewalls</td>
<td>Instances</td>
<td>POST /api/instances</td>
<td>put the instance into one or more firewalls on launch</td>
</tr>
-<tr>
-<td>authentication_key</td>
+ <tr>
+ <td>authentication_key</td>
<td>Instances</td>
<td>POST /api/instances</td>
<td>provides the authentication key to access the instance</td>
</tr>
-<tr>
-<td>authentication_password</td>
+ <tr>
+ <td>authentication_password</td>
<td>Instances</td>
<td>POST /api/instances</td>
<td>provides the password to access the running instance</td>
</tr>
-<tr>
-<td>instance_count</td>
+ <tr>
+ <td>instance_count</td>
<td>Instances</td>
<td>POST /api/instances</td>
<td>specifies the number of instances to launch in one operation</td>
</tr>
-<tr>
-<td>attach_snapshot</td>
+ <tr>
+ <td>attach_snapshot</td>
<td>Instances</td>
<td>POST /api/instances</td>
<td>attaches a storage snapshot to an instance as a storage volume</td>
</tr>
-<tr>
-<td>sandboxing</td>
+ <tr>
+ <td>sandboxing</td>
<td>Instances</td>
<td>POST /api/instances</td>
<td>launches an instance from a sandbox image (Gogrid specific)</td>
</tr>
-<tr>
-<td>bucket_location</td>
+ <tr>
+ <td>bucket_location</td>
<td>Buckets</td>
<td>POST /api/buckets</td>
<td>specifies a location that the bucket should be created in (e.g. specific cloud-provider datacenter)</td>
</tr>
-</tbody>
-</table><p><a class="btn btn-inverse btn-large" style="float: right" href="compute-resources.html">Compute resources <i class="icon-arrow-right icon-white" style="vertical-align:baseline"> </i></a></p>
+ </tbody>
+</table>
+
+<p><a class="btn btn-inverse btn-large" style="float: right" href="compute-resources.html">Compute resources <i class="icon-arrow-right icon-white" style="vertical-align:baseline"> </i></a></p>
<p><br></p>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/blob-storage.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/blob-storage.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/blob-storage.html (original)
+++ deltacloud/trunk/site/output/blob-storage.html Thu Feb 21 15:51:08 2013
@@ -111,10 +111,11 @@ A bucket has
</p>
<ul>
-<li>a <strong>name</strong>;</li>
+ <li>a <strong>name</strong>;</li>
<li>a <strong>size</strong> (denotes the number of blobs it contains); and</li>
<li>a list of <strong>links to each blob</strong>.</li>
</ul>
+
<p>
A blob has:
</p>
@@ -123,7 +124,7 @@ A blob has:
<div class="span3">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
REST API
</li>
<li><a href="rest-api.html">Introduction</a></li>
@@ -131,27 +132,30 @@ A blob has:
<li><a href="compute-resources.html">Compute resources</a></li>
<li><a href="storage-resources.html">Storage resources</a></li>
<ul class="nav nav-list">
-<li><a href="storage-resources.html#volumes">Storage volumes</a></li>
+ <li><a href="storage-resources.html#volumes">Storage volumes</a></li>
<li><a href="storage-snapshots.html">Storage snaphots</a></li>
<li class="active"><a href="#blob">Blob storage</a></li>
</ul>
</ul>
-</div>
+
+ </div>
</div>
<ul>
-<li>a <strong>content_length</strong>;</li>
+ <li>a <strong>content_length</strong>;</li>
<li>a <strong>content_type</strong>;</li>
<li>a <strong>last_modified</strong> timestamp;</li>
<li>a structure containing <strong>user_metadata</strong>;</li>
<li>a link to the blob <strong>content</strong>; and</li>
<li>a name of the bucket in which this blob exists.</li>
-</ul><p><br></p>
+</ul>
+
+<p><br></p>
<div class="tabbable">
<ul class="nav nav-pills">
-<li class="active"><a href="#tab1" data-toggle="tab">Get a list of all buckets</a></li>
+ <li class="active"><a href="#tab1" data-toggle="tab">Get a list of all buckets</a></li>
<li><a href="#tab2" data-toggle="tab">Get the details of a bucket</a></li>
<li><a href="#tab3" data-toggle="tab">Create/delete a bucket</a></li>
<li><a href="#tab4" data-toggle="tab">Get the details of a blob</a></li>
@@ -159,7 +163,9 @@ A blob has:
<li>Â Â Â </li>
<li><a href="#tab6" data-toggle="tab">Get/update blob metadata</a></li>
</ul>
+
<hr>
+
<div class="tab-content">
<div class="tab-pane tab-fade active" id="tab1">
@@ -586,6 +592,7 @@ X-Deltacloud-Blobmeta-paint: Stannite_Gr
</div>
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-curl.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-curl.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-curl.html (original)
+++ deltacloud/trunk/site/output/cimi-curl.html Thu Feb 21 15:51:08 2013
@@ -106,7 +106,7 @@
<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>
+ <li>
Credentials are specified with <strong> --user "name:password" </strong>
</li>
<li>
@@ -119,7 +119,8 @@
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:
</li>
</ul>
-<pre>
+
+ <pre>
curl -v -X DELETE --user "username:password" -H "Accept: application/xml" http://localhost:3001/cimi/machine_images/my_image
</pre>
@@ -132,20 +133,22 @@ Select a CIMI resource from the right-ha
<div class="span4">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <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-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>
+ <br>
</ul>
-</div>
+
+ </div>
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html (original)
+++ deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html Thu Feb 21 15:51:08 2013
@@ -104,28 +104,31 @@
<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 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>
<div class="span4">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <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 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>
+ <br>
</ul>
-</div>
+
+ </div>
</div>
@@ -134,6 +137,7 @@
<div class="tab-pane active" id="machines">
<hr>
+
<h4 id="machines">Working with Machines</h4>
<p>Retrieve the Machine Collection in json format:</p>
@@ -162,7 +166,10 @@ 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>
-<br><hr>
+<br>
+
+<hr>
+
</div>
<div class="tab-pane" id="machine-images">
@@ -192,7 +199,10 @@ curl -v --user "mockuser:mockpassword" -
<pre>curl -X DELETE --user "user:pass" http://localhost:3001/cimi/machine_images/my_image </pre>
-<br><hr>
+<br>
+
+<hr>
+
</div>
<div class="tab-pane" id="machine-configs">
@@ -260,7 +270,7 @@ curl -v --user "mockuser:mockpassword" -
<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
+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>
@@ -278,6 +288,7 @@ curl -v --user "mockuser:mockpassword" -
</div>
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-curl/cimi-curl-resource_metadata.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-curl/cimi-curl-resource_metadata.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-curl/cimi-curl-resource_metadata.html (original)
+++ deltacloud/trunk/site/output/cimi-curl/cimi-curl-resource_metadata.html Thu Feb 21 15:51:08 2013
@@ -108,17 +108,18 @@
<div class="span4">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <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><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>
+ <br>
</ul>
-</div>
+
+ </div>
</div>
@@ -134,6 +135,8 @@
<pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/resource_metadata/machine </pre>
+
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: 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=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-curl/cimi-curl-volumes.html (original)
+++ deltacloud/trunk/site/output/cimi-curl/cimi-curl-volumes.html Thu Feb 21 15:51:08 2013
@@ -104,27 +104,30 @@
<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 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>
<div class="span4">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <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><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>
+ <br>
</ul>
-</div>
+
+ </div>
</div>
@@ -133,7 +136,8 @@
<div class="tab-pane active" id="volumes">
<hr>
-<h4>Working with Volumes</h4>
+
+ <h4>Working with Volumes</h4>
<p>Retrieve the Volume Collection in json format:</p>
@@ -173,7 +177,8 @@
<div class="tab-pane" id="volume-images">
<hr>
-<h4>Working with Volume Images</h4>
+
+ <h4>Working with Volume Images</h4>
<p>Retrieve the Volume Image Collection in xml format:</p>
@@ -202,7 +207,8 @@
<div class="tab-pane" id="volume-configs">
<hr>
-<h4>Working with Volume Configurations</h4>
+
+ <h4>Working with Volume Configurations</h4>
<p>Retrieve the Volume Configuration Collection in json format:</p>
@@ -231,7 +237,8 @@
<div class="tab-pane" id="volume-templates">
<hr>
-<h4>Working with Volume Templates</h4>
+
+ <h4>Working with Volume Templates</h4>
<p>Retrieve the Volume Template Collection in json format:</p>
@@ -256,6 +263,7 @@
</div>
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-rest.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest.html (original)
+++ deltacloud/trunk/site/output/cimi-rest.html Thu Feb 21 15:51:08 2013
@@ -120,7 +120,7 @@ Apache Deltacloud exposes the DMTF <a hr
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li class="active"><a href="cimi-rest.html">Introduction</a></li>
@@ -131,14 +131,15 @@ Apache Deltacloud exposes the DMTF <a hr
<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-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>
+ </li>
</ul>
-</div>
+
+ </div>
</div>
<p>
@@ -149,10 +150,13 @@ This page shows examples of interactions
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>
+<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:
-<br><br></p>
+<br>
+<br></p>
<pre>
[user@name ~]$ deltacloudd -i ec2 -f cimi
@@ -169,6 +173,7 @@ The example above shows the deltacloud s
<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>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html Thu Feb 21 15:51:08 2013
@@ -109,7 +109,11 @@ In the following sections, the textual d
</p>
<hr>
-<br><br><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.
@@ -122,7 +126,7 @@ A Machine Collection resource represents
<div class="span3">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li><a href="../cimi-rest.html">Introduction</a></li>
@@ -133,39 +137,48 @@ A Machine Collection resource represents
<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-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>
+ </li>
<hr>
-<li class="nav-header">
+ <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 class="active"><a href="cimi-rest-collections.html">Machine</a></li>
<li><a href="cimi-rest-machine-images.html">MachineImage</a></li>
<li><a href="cimi-rest-machine-configs.html">MachineConfiguration</a></li>
<li><a href="cimi-rest-machine-templates.html">MachineTemplate</a></li>
</ul>
+
</ul>
-</div>
+
+ </div>
</div>
<ul class="nav nav-pills">
-<li class="active"><a href="#tab1" data-toggle="tab">Retrieve the Machine Collection</a></li>
+ <li class="active"><a href="#tab1" data-toggle="tab">Retrieve the Machine Collection</a></li>
<li><a href="#single-machine" data-toggle="tab">Retrieve a single Machine</a></li>
<li><a href="#create-machine" data-toggle="tab">Create a new Machine</a></li>
<li><a href="#machine-action" data-toggle="tab">Perform a Machine Operation</a></li>
<li><a href="#machine-volumes" data-toggle="tab">Work with Machine Volumes</a></li>
-</ul><hr><div class="tab-content">
+</ul>
+
+<hr>
+
+<div class="tab-content">
<div class="tab-pane active" id="tab1">
<h4>Retrieve the Machine Collection</h4>
Note the 'add' URI of the Machine Collection resource in the example response below. This is the URI that is used for creating a new Machine (adding to the Machine Collection).
-<br><br><p>Example request:</p>
+<br>
+<br>
+
+<p>Example request:</p>
<pre>
GET /cimi/machines HTTP/1.1
@@ -444,8 +457,10 @@ Server: thin 1.5.0 codename Knife
</Collection>
</pre>
-<br><hr>
-<p>Attach a Volume to a Machine - aka add a new MachineVolume to the MachineVolumeCollection of a specific Machine resource </p>
+<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>
@@ -491,8 +506,10 @@ Server: thin 1.5.0 codename Knife
</pre>
-<br><hr>
-<p>Detach a Volume from a Machine - aka remove a MachineVolume from the MachineVolumeCollection of a specific Machine resource </p>
+<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>
@@ -528,6 +545,7 @@ Server: thin 1.5.0 codename Knife
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-rest/cimi-rest-entry-point.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-entry-point.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-entry-point.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-entry-point.html Thu Feb 21 15:51:08 2013
@@ -116,7 +116,7 @@ A deltacloud server exposes the CIMI Clo
<div class="span3">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li><a href="../cimi-rest.html">Introduction</a></li>
@@ -127,14 +127,15 @@ A deltacloud server exposes the CIMI Clo
<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-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>
+ </li>
</ul>
-</div>
+
+ </div>
</div>
@@ -192,6 +193,7 @@ Server: thin 1.5.0 codename Knife
</CloudEntryPoint>
</pre>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-configs.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-configs.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-configs.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-configs.html Thu Feb 21 15:51:08 2013
@@ -116,7 +116,7 @@ resources within a Provider
<div class="span3">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li><a href="../cimi-rest.html">Introduction</a></li>
@@ -127,30 +127,36 @@ resources within a Provider
<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-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>
+ </li>
<hr>
-<li class="nav-header">
+ <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-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>
</div>
<ul class="nav nav-pills">
-<li class="active"><a href="#config-collection" data-toggle="tab">Retrieve the Machine Configuration Collection</a></li>
+ <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">
+</ul>
+
+<hr>
+
+<div class="tab-content">
<div class="tab-pane active" id="config-collection">
<h4>Retrieve the Machine Configuration Collection</h4>
@@ -265,6 +271,7 @@ Server: thin 1.5.0 codename Knife
</div>
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-images.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-images.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-images.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-images.html Thu Feb 21 15:51:08 2013
@@ -103,7 +103,7 @@
<h3 id="cimi-machine-image">Machine Image</h3>
<p>
<strong><em>
-This resource represents the information necessary for hardware virtualized resources to create a Machine Instance; it contains configuration data such as startup instructions, including possible combinations of the following items, depending on the 'type' of Machine Image created: the software image, installation software, both a disk image and a set of software and parameters. <br><br>
+This resource represents the information necessary for hardware virtualized resources to create a Machine Instance; it contains configuration data such as startup instructions, including possible combinations of the following items, depending on the 'type' of Machine Image created: the software image, installation software, both a disk image and a set of software and parameters. <br> <br>
A Machine Image Collection resource represents the collection of Machine Image resources within a Provider.
</em></strong>
</p>
@@ -113,7 +113,7 @@ A Machine Image Collection resource repr
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li><a href="../cimi-rest.html">Introduction</a></li>
@@ -124,31 +124,37 @@ A Machine Image Collection resource repr
<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-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>
+ </li>
<hr>
-<li class="nav-header">
+ <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-collections.html">Machine</a></li>
<li class="active"><a href="cimi-rest-machine-images.html">MachineImage</a></li>
<li><a href="cimi-rest-machine-configs.html">MachineConfiguration</a></li>
<li><a href="cimi-rest-machine-templates.html">MachineTemplate</a></li>
</ul>
+
</ul>
-</div>
+
+ </div>
</div>
<ul class="nav nav-pills">
-<li class="active"><a href="#image-collection" data-toggle="tab">Retrieve the Machine Image Collection</a></li>
+ <li class="active"><a href="#image-collection" data-toggle="tab">Retrieve the Machine Image Collection</a></li>
<li><a href="#single-image" data-toggle="tab">Retrieve a single Machine Image</a></li>
<li><a href="#create-image" data-toggle="tab">Create or Delete a Machine Image</a></li>
-</ul><hr><div class="tab-content">
+</ul>
+
+<hr>
+
+<div class="tab-content">
<div class="tab-pane active" id="image-collection">
<h4>Retrieve the Machine Image Collection</h4>
@@ -308,7 +314,9 @@ Server: thin 1.5.0 codename Knife
</MachineImage>
</pre>
-<br><hr>
+<br>
+<hr>
+
<h4>Delete a Machine Image</h4>
<p>Example request:</p>
@@ -339,6 +347,7 @@ Server: thin 1.5.0 codename Knife
</div>
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-templates.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-templates.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-templates.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-machine-templates.html Thu Feb 21 15:51:08 2013
@@ -126,7 +126,7 @@ A CIMI client (a <strong>consumer</stron
<div class="span3">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li><a href="../cimi-rest.html">Introduction</a></li>
@@ -137,32 +137,38 @@ A CIMI client (a <strong>consumer</stron
<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-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>
+ </li>
<hr>
-<li class="nav-header">
+ <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-collections.html">Machine</a></li>
<li><a href="cimi-rest-machine-images.html">MachineImage</a></li>
<li><a href="cimi-rest-machine-configs.html">MachineConfiguration</a></li>
<li class="active"><a href="cimi-rest-machine-templates.html">MachineTemplate</a></li>
</ul>
+
</ul>
-</div>
+
+ </div>
</div>
<ul class="nav nav-pills">
-<li class="active"><a href="#template-collection" data-toggle="tab">Retrieve the Machine Template Collection</a></li>
+ <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">
+</ul>
+
+<hr>
+
+<div class="tab-content">
<div class="tab-pane active" id="template-collection">
<h4>Retrieve the Machine Template Collection</h4>
@@ -329,6 +335,7 @@ Server: thin 1.5.0 codename Knife
</div>
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-rest/cimi-rest-resource-metadata.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-resource-metadata.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-resource-metadata.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-resource-metadata.html Thu Feb 21 15:51:08 2013
@@ -129,7 +129,7 @@ specific.
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li><a href="../cimi-rest.html">Introduction</a></li>
@@ -140,25 +140,28 @@ specific.
<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-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>
+ </li>
<hr>
-<li class="nav-header">
+ <li class="nav-header">
Resource Metadata
</li>
</ul>
-</div>
+
+ </div>
</div>
<ul class="nav nav-pills">
-<li class="active"><a href="#resource-metadata" data-toggle="tab">Retrieve the ResourceMetadata Collection</a></li>
+ <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">
+</ul>
+
+<div class="tab-content">
<div class="tab-pane active" id="resource-metadata">
<h4>Retrieve the ResourceMetadata Collection</h4>
@@ -234,7 +237,8 @@ Server: thin 1.5.0 codename Knife
<div class="tab-pane" id="resource-metadata-capabilities">
<h4>ResourceMetadata Capabilities</h4>
-<br><p>
+<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
@@ -252,9 +256,12 @@ associated with the Cloud Entry Point re
CloudEntryPoint resource itself, its definition would say so).
</em></strong>
</p>
-<br><table class="table-bordered table-striped table-condensed">
-<thead><tr>
-<th>
+<br>
+
+<table class="table-bordered table-striped table-condensed">
+ <thead>
+ <tr>
+ <th>
Resource Name
</th>
<th>
@@ -263,17 +270,18 @@ CloudEntryPoint resource itself, its def
<th>
Description
</th>
- </tr></thead>
-<tbody>
-<tr>
-<td>CloudEntryPoint </td>
+ </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
+ <tr>
+ <td>CloudEntryPoint
</td>
<td>FilterParameter
</td>
@@ -281,8 +289,8 @@ supported by the Provider.
supported by the Provider.
</td>
</tr>
-<tr>
-<td>CloudEntryPoint
+ <tr>
+ <td>CloudEntryPoint
</td>
<td>firstParameter
</td>
@@ -291,8 +299,8 @@ are supported by the Provider. Note that
shall be supported or neither shall be supported.
</td>
</tr>
-<tr>
-<td>CloudEntryPoint
+ <tr>
+ <td>CloudEntryPoint
</td>
<td>SelectParameter
</td>
@@ -300,8 +308,8 @@ shall be supported or neither shall be s
supported by the Provider.
</td>
</tr>
-<tr>
-<td>System
+ <tr>
+ <td>System
</td>
<td>SystemComponentTemplateByValue
</td>
@@ -309,8 +317,8 @@ supported by the Provider.
Component Templates by-value in SystemTemplates.
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>DefaultInitialState
</td>
@@ -318,8 +326,8 @@ Component Templates by-value in SystemTe
will be unless explicitly set by the "initialState" attribute
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>InitialStates
</td>
@@ -328,8 +336,8 @@ Consumer may choose from when creating a
Machine.
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>MachineConfigByValue
</td>
@@ -339,8 +347,8 @@ true the MachineTemplateByValue capabili
be specified with a value of true.
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>MachineCredentialByValue
</td>
@@ -350,8 +358,8 @@ the MachineTemplateByValue capability sh
specified with a value of true.
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>MachineImageByValue
</td>
@@ -361,8 +369,8 @@ the MachineTemplateByValue capability sh
specified with a value of true.
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>MachineVolumeTemplatesByValue
</td>
@@ -372,8 +380,8 @@ operations. If true the MachineTemplateB
capability shall also be specified with a value of true.
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>MachineStopForce
</td>
@@ -381,8 +389,8 @@ capability shall also be specified with
"force" option on the stop and restart operations.
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>MachineStopForceDefault
</td>
@@ -393,8 +401,8 @@ of "false," which indicates that the Pro
to gracefully stop the Machine.
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>RestoreFromImage
</td>
@@ -403,8 +411,8 @@ from Machine Images that are not SNAPSHO
Images.
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>UserData
</td>
@@ -412,8 +420,8 @@ Images.
See 5.14.1 for more information.
</td>
</tr>
-<tr>
-<td>Credential
+ <tr>
+ <td>Credential
</td>
<td>CredentialTemplateByValue
</td>
@@ -422,8 +430,8 @@ Credential Templates by-value in Credent
operations.
</td>
</tr>
-<tr>
-<td>Volume
+ <tr>
+ <td>Volume
</td>
<td>SharedVolumeSupport
</td>
@@ -432,8 +440,8 @@ volume resources across Machines. The va
is of type "boolean."
</td>
</tr>
-<tr>
-<td>Volume
+ <tr>
+ <td>Volume
</td>
<td>VolumeConfigByValue
</td>
@@ -443,8 +451,8 @@ If true, the VolumeTemplateByValue capab
also be specified with a value of true.
</td>
</tr>
-<tr>
-<td>Volume
+ <tr>
+ <td>Volume
</td>
<td>VolumeImageByValue
</td>
@@ -454,8 +462,8 @@ the VolumeTemplateByValue capability sha
specified with a value of true.
</td>
</tr>
-<tr>
-<td>Volume
+ <tr>
+ <td>Volume
</td>
<td>VolumeSnapshot
</td>
@@ -463,8 +471,8 @@ specified with a value of true.
VolumeImage by referencing an existing Volume.
</td>
</tr>
-<tr>
-<td>Volume
+ <tr>
+ <td>Volume
</td>
<td>VolumeTemplateByValue
</td>
@@ -472,8 +480,8 @@ VolumeImage by referencing an existing V
Templates by-value in Volume create operations.
</td>
</tr>
-<tr>
-<td>Network
+ <tr>
+ <td>Network
</td>
<td>NetworkConfigByValue
</td>
@@ -482,8 +490,8 @@ Configurations by-value in the Network c
operation.
</td>
</tr>
-<tr>
-<td>Network
+ <tr>
+ <td>Network
</td>
<td>NetworkTemplateByValue
</td>
@@ -491,8 +499,8 @@ operation.
Templates by-value in the Network create operation.
</td>
</tr>
-<tr>
-<td>NetworkPort
+ <tr>
+ <td>NetworkPort
</td>
<td>NetworkPortConfigByValue
</td>
@@ -501,8 +509,8 @@ NetworkPort Configurations by-value in t
create operation.
</td>
</tr>
-<tr>
-<td>NetworkPort
+ <tr>
+ <td>NetworkPort
</td>
<td>NetworkPortTemplateByValue
</td>
@@ -511,8 +519,8 @@ NetworkPort Templates by-value in the Ne
create operation.
</td>
</tr>
-<tr>
-<td>ForwardingGroup
+ <tr>
+ <td>ForwardingGroup
</td>
<td>MixedNetwork
</td>
@@ -520,8 +528,8 @@ create operation.
private and public connection at the same time.
</td>
</tr>
-<tr>
-<td>Job
+ <tr>
+ <td>Job
</td>
<td>JobRetention
</td>
@@ -533,8 +541,8 @@ minutes (e.g., 30 min). The value specif
"integer."
</td>
</tr>
-<tr>
-<td>Meter
+ <tr>
+ <td>Meter
</td>
<td>MeterConfigByValue
</td>
@@ -543,8 +551,8 @@ MeterConfigurations by-value in the Mete
operation.
</td>
</tr>
-<tr>
-<td>Meter
+ <tr>
+ <td>Meter
</td>
<td>MeterTemplateByValue
</td>
@@ -552,8 +560,8 @@ operation.
Templates by-value in the Meter create operation.
</td>
</tr>
-<tr>
-<td>EventLog
+ <tr>
+ <td>EventLog
</td>
<td>Linked
</td>
@@ -562,10 +570,12 @@ are associated with resources when the r
deleted.
</td>
</tr>
-</tbody>
+ </tbody>
</table>
+
+ </div>
</div>
-</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
Modified: deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-configs.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-configs.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-configs.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-configs.html Thu Feb 21 15:51:08 2013
@@ -106,7 +106,8 @@
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>
+<br>
+<br>
A Volume Configuration Collection resource represents the collection of Volume Configuration resources
within a Provider.
</em></strong>
@@ -117,7 +118,7 @@ within a Provider.
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li><a href="../cimi-rest.html">Introduction</a></li>
@@ -128,32 +129,38 @@ within a Provider.
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
-<li><a href="cimi-rest-resource-metadata.html">Resource Metadata</a></li>
+ <li><a href="cimi-rest-resource-metadata.html">Resource Metadata</a></li>
<li><a href="cimi-rest-collections.html">Machine</a></li>
<li><a href="cimi-rest-volumes.html">Volume</a></li>
</ul>
-</li>
+ </li>
<hr>
-<li class="nav-header">
+ <li class="nav-header">
Volume Resources
</li>
<ul class="nav nav-list">
-<li><a href="cimi-rest-volumes.html">Volume</a></li>
+ <li><a href="cimi-rest-volumes.html">Volume</a></li>
<li><a href="cimi-rest-volume-images.html">VolumeImage</a></li>
<li class="active"><a href="cimi-rest-volume-configs.html">VolumeConfiguration</a></li>
<li><a href="cimi-rest-volume-templates.html">VolumeTemplate</a></li>
</ul>
+
</ul>
-</div>
+
+ </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 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">
+</ul>
+
+<hr>
+
+<div class="tab-content">
<div class="tab-pane active" id="volume-config-collection">
@@ -331,6 +338,7 @@ Server: thin 1.5.0 codename Knife
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-images.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-images.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-images.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-images.html Thu Feb 21 15:51:08 2013
@@ -104,7 +104,8 @@
<p>
<strong><em>
This resource represents an image that could be placed on a pre-loaded volume.
-<br><br>
+<br>
+<br>
A Volume Image Collection resource represents the collection of Volume Image resources within a
Provider.
</em></strong>
@@ -115,7 +116,7 @@ Provider.
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li><a href="../cimi-rest.html">Introduction</a></li>
@@ -126,32 +127,38 @@ Provider.
<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-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>
+ </li>
<hr>
-<li class="nav-header">
+ <li class="nav-header">
Volume Resources
</li>
<ul class="nav nav-list">
-<li><a href="cimi-rest-volumes.html">Volume</a></li>
+ <li><a href="cimi-rest-volumes.html">Volume</a></li>
<li class="active"><a href="cimi-rest-volume-images.html">VolumeImage</a></li>
<li><a href="cimi-rest-volume-configs.html">VolumeConfiguration</a></li>
<li><a href="cimi-rest-volume-templates.html">VolumeTemplate</a></li>
</ul>
+
</ul>
-</div>
+
+ </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 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">
+</ul>
+
+<hr>
+
+<div class="tab-content">
<div class="tab-pane active" id="volume-image-collection">
@@ -340,6 +347,7 @@ Server: thin 1.5.0 codename Knife
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-templates.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-templates.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-templates.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-volume-templates.html Thu Feb 21 15:51:08 2013
@@ -105,7 +105,8 @@
<strong><em>
This resource captures the configuration values for realizing a Volume. A Volume Template may be used
to create multiple Volumes.
-<br><br>
+<br>
+<br>
A Volume Template Collection resource represents the collection of VolumeTemplate resources within a
Provider.
</em></strong>
@@ -117,7 +118,7 @@ Provider.
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li><a href="../cimi-rest.html">Introduction</a></li>
@@ -128,33 +129,39 @@ Provider.
<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-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>
+ </li>
<hr>
-<li class="nav-header">
+ <li class="nav-header">
Volume Resources
</li>
<ul class="nav nav-list">
-<li><a href="cimi-rest-volumes.html">Volume</a></li>
+ <li><a href="cimi-rest-volumes.html">Volume</a></li>
<li><a href="cimi-rest-volume-images.html">VolumeImage</a></li>
<li><a href="cimi-rest-volume-configs.html">VolumeConfiguration</a></li>
<li class="active"><a href="cimi-rest-volume-templates.html">VolumeTemplate</a></li>
</ul>
+
</ul>
-</div>
+
+ </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 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">
+</ul>
+
+<hr>
+
+<div class="tab-content">
<div class="tab-pane active" id="volume-template-collection">
@@ -328,6 +335,7 @@ Server: thin 1.5.0 codename Knife
</div>
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/cimi-rest/cimi-rest-volumes.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest/cimi-rest-volumes.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-volumes.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-volumes.html Thu Feb 21 15:51:08 2013
@@ -115,7 +115,7 @@ A Volume Collection resource represents
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
CIMI REST API
</li>
<li><a href="../cimi-rest.html">Introduction</a></li>
@@ -126,32 +126,38 @@ A Volume Collection resource represents
<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-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>
+ </li>
<hr>
-<li class="nav-header">
+ <li class="nav-header">
Volume Resources
</li>
<ul class="nav nav-list">
-<li class="active"><a href="cimi-rest-volumes.html">Volume</a></li>
+ <li class="active"><a href="cimi-rest-volumes.html">Volume</a></li>
<li><a href="cimi-rest-volume-images.html">VolumeImage</a></li>
<li><a href="cimi-rest-volume-configs.html">VolumeConfiguration</a></li>
<li><a href="cimi-rest-volume-templates.html">VolumeTemplate</a></li>
</ul>
+
</ul>
-</div>
+
+ </div>
</div>
<ul class="nav nav-pills">
-<li class="active"><a href="#volume-collection" data-toggle="tab">Retrieve the Volume Collection</a></li>
+ <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">
+</ul>
+
+<hr>
+
+<div class="tab-content">
<div class="tab-pane active" id="volume-collection">
<h4>Retrieve the Volume Collection</h4>
@@ -314,7 +320,8 @@ Server: thin 1.5.0 codename Knife
</Volume>
</pre>
-<br><p>Using VolumeTemplate with VolumeConfiguration by value - Example request:</p>
+<br>
+<p>Using VolumeTemplate with VolumeConfiguration by value - Example request:</p>
<pre>
POST /cimi/volumes HTTP/1.1
Authorization: Basic bW9ja3VzZXI6bW9ja3Bhc3N3b3Jk
@@ -398,6 +405,7 @@ Server: thin 1.5.0 codename Knife
</div>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/clients.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/clients.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/clients.html (original)
+++ deltacloud/trunk/site/output/clients.html Thu Feb 21 15:51:08 2013
@@ -97,6 +97,7 @@
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/command-tools.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/command-tools.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/command-tools.html (original)
+++ deltacloud/trunk/site/output/command-tools.html Thu Feb 21 15:51:08 2013
@@ -103,10 +103,14 @@
<p>The deltacloud core developers use (almost exclusively) <a href="http://curl.haxx.se/">cURL</a> as a command line client for working with a deltacloud server. You can find more information on working with cURL against deltacloud <a href="curl-examples.html">here</a>.</p>
-<hr><p><br></p>
+<hr>
+
+<p><br></p>
<h1> /deprecated: </h1>
<p><br></p>
-<hr><p><br></p>
+<hr>
+
+<p><br></p>
<h3 id="command">Using Deltacloud command tool</h3>
@@ -115,7 +119,7 @@
</p><pre>$ deltacloudc collection operation [options]</pre>
<dl>
-<dt>Collection</dt>
+ <dt>Collection</dt>
<dd>
refers to the Deltacloud object collections, such as Instances, Images, Buckets, Realms etc., as described in a greater detail in the <a href="rest-api.html">Deltacloud REST API documentation</a>.
</dd>
@@ -127,7 +131,9 @@
<dd>
are listed by invoking <strong>deltacloudc -h</strong>. The important option is <strong>-u</strong>, which specifies the API_URL, where the Deltacloud server is running. The API_URL takes the form of <strong>http://[user]:[password]@[api_url]:[port]/[api]</strong>. Alternatively, you can set the API_URL environment variable (e.g., export API_URL=http://mockuser:mockpassword@localhost:3001/api). If your username or your password contains special characters, it's necessary to use options <strong>-U</strong> and <strong>-P</strong> in addition to the option <strong>-u</strong>. Check the <a href="supported-providers.html#credentials"> list of credentials</a> you need for each back-end cloud provider.
</dd>
-</dl><p>
+</dl>
+
+<p>
The following examples assume that the Deltacloud server is running on your local machine port 3001 (the <strong>deltacloudd</strong> server daemon defaults to 'localhost:3001') and that it was started with the 'mock' provider (i.e. deltacloudd -i mock ).</p>
<p> List all <strong>collections</strong> available in the current driver:</p>
@@ -146,6 +152,8 @@ The following examples assume that the D
<pre>$ deltacloudc blob create -i 'my_new_blob' -b 'bucket1' -f /home/marios/file.txt</pre>
+
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/compute-resources.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/compute-resources.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/compute-resources.html (original)
+++ deltacloud/trunk/site/output/compute-resources.html Thu Feb 21 15:51:08 2013
@@ -122,14 +122,14 @@ To list all realms use call <strong>GET
<div class="span3">
<ul class="nav nav-list well">
-<li class="nav-header">
+ <li class="nav-header">
REST API
</li>
<li><a href="rest-api.html">Introduction</a></li>
<li><a href="api-entry-point.html">API entry point</a></li>
<li class="active"><a href="compute-resources.html">Compute resources</a></li>
<ul class="nav nav-list">
-<li><a href="#realms">Realms</a></li>
+ <li><a href="#realms">Realms</a></li>
<li><a href="hardware-profiles.html">Hardware profiles</a></li>
<li><a href="images.html">Images</a></li>
<li><a href="instance-states.html">Instance states</a></li>
@@ -139,9 +139,10 @@ To list all realms use call <strong>GET
<li><a href="addresses.html">Addresses</a></li>
<li><a href="load-balancers.html">Load balancers</a></li>
</ul>
-<li><a href="storage-resources.html">Storage resources</a></li>
+ <li><a href="storage-resources.html">Storage resources</a></li>
</ul>
-</div>
+
+ </div>
</div>
<p>Example request:</p>
@@ -220,6 +221,7 @@ Content-Length: 182
<p><br></p>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/contact.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/contact.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/contact.html (original)
+++ deltacloud/trunk/site/output/contact.html Thu Feb 21 15:51:08 2013
@@ -106,9 +106,13 @@
</li>
<li>The <a href="http://webchat.freenode.net/">#deltacloud</a> irc channel on Freenode is a place where the developers hang out and where you can usually get the fastest answers to your questions.
</li>
-</ul><p>Please don't hesitate to get in touch if you have any questions about the project, if you've had any issues with installing or using Deltacloud or even just to tell us how great you think Deltacloud is!</p>
+</ul>
-<hr><h2>Deltacloud Community Calls</h2>
+<p>Please don't hesitate to get in touch if you have any questions about the project, if you've had any issues with installing or using Deltacloud or even just to tell us how great you think Deltacloud is!</p>
+
+<hr>
+
+<h2>Deltacloud Community Calls</h2>
<p>We are trying to establish regular community calls - right now they are held weekly every Thursday - at @ 1700 CET (Prague, Brno, GMT+1) - which means 0800 PST (US West Coast, GMT-8) or 1100 EST (US East Coast, GMT-5). These calls are open to anyone that is interested in Deltacloud - please contact us if youâd like to join the next call.</p>
@@ -127,42 +131,52 @@ The âwhite boxâ unit tests rev
<p>An introduction/overview of sinatra-rabbit</p>
-<p><br><a href="http://www.youtube.com/watch?v=HzRbBA8BJ-Q">Deltacloud Community Call #10</a></p>
+<p><br>
+<a href="http://www.youtube.com/watch?v=HzRbBA8BJ-Q">Deltacloud Community Call #10</a></p>
<p>How to use Deltacloud driver âfeaturesâ</p>
-<p><br><a href="http://youtu.be/XWSG2knVvZI">Deltacloud Community Call #9</a></p>
+<p><br>
+<a href="http://youtu.be/XWSG2knVvZI">Deltacloud Community Call #9</a></p>
<p>Demo of how to use CIMI $select and $expand parameters - Introduction/overview of a deltacloud driver</p>
-<p><br><a href="http://youtu.be/KvN0xEVc_N0">Deltacloud Community Call #8</a></p>
+<p><br>
+<a href="http://youtu.be/KvN0xEVc_N0">Deltacloud Community Call #8</a></p>
<p>Deep dive into a Deltacloud API call, a look at the Deltacloud server gemspec - gems used as clients to cloud providers</p>
-<p><br><a href="http://www.youtube.com/watch?v=YbAsWrj6UEY">Deltacloud Community Call #7</a></p>
+<p><br>
+<a href="http://www.youtube.com/watch?v=YbAsWrj6UEY">Deltacloud Community Call #7</a></p>
<p>The Deltacloud website - how it works, how to submit changes etc - Deltacloud exceptions and error handling introduction, how to catch provider errors and raise specific HTTP response codes.</p>
-<p><br><a href="http://www.youtube.com/watch?v=oP__wuCqFxQ">Deltacloud Community Call #5</a></p>
+<p><br>
+<a href="http://www.youtube.com/watch?v=oP__wuCqFxQ">Deltacloud Community Call #5</a></p>
<p>How to file bug reports for Deltacloud - process, what to report, following up and CIMI resourceMetadata (implementation, why it is important?) - testing scenarios.</p>
-<p><br><a href="http://www.youtube.com/watch?v=TGYTrVRxcGE">Deltacloud Community Call #4</a></p>
+<p><br>
+<a href="http://www.youtube.com/watch?v=TGYTrVRxcGE">Deltacloud Community Call #4</a></p>
<p>Debugging deltacloud - how to chase a bug - common steps, debugging tools. Mailing list questions: i) ovirt and the User Level API, ii) Plans for CIMI back-end driver?</p>
-<p><br><a href="http://www.youtube.com/watch?v=YOMK8jrhGoo">Deltacloud Community Call #3</a></p>
+<p><br>
+<a href="http://www.youtube.com/watch?v=YOMK8jrhGoo">Deltacloud Community Call #3</a></p>
<p>Adding state to Deltacloud for the CIMI frontend - Datamapper</p>
-<p><br><a href="http://www.youtube.com/watch?v=CMf73mtsIfs">Deltacloud Community Call #2</a></p>
+<p><br>
+<a href="http://www.youtube.com/watch?v=CMf73mtsIfs">Deltacloud Community Call #2</a></p>
<p>Networking API discussion, Writing Deltacloud API tests</p>
-<p><br><a href="http://www.youtube.com/watch?v=cUC96SdQjaE">Deltacloud Community Call #1</a></p>
+<p><br>
+<a href="http://www.youtube.com/watch?v=cUC96SdQjaE">Deltacloud Community Call #1</a></p>
<p>Working with Deltacloud API clients, Contributing patches, review process, etc</p>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/contribute.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/contribute.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/contribute.html (original)
+++ deltacloud/trunk/site/output/contribute.html Thu Feb 21 15:51:08 2013
@@ -97,6 +97,7 @@
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>
Modified: deltacloud/trunk/site/output/credentials.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/credentials.html?rev=1448691&r1=1448690&r2=1448691&view=diff
==============================================================================
--- deltacloud/trunk/site/output/credentials.html (original)
+++ deltacloud/trunk/site/output/credentials.html Thu Feb 21 15:51:08 2013
@@ -98,16 +98,18 @@
<p><br></p>
<h3>Cloud provider credentials</h3>
<table class="table-bordered table-striped table-condensed">
-<thead><tr>
-<th>Cloud</th>
+ <thead>
+ <tr>
+ <th>Cloud</th>
<th>Driver</th>
<th>Username</th>
<th>Password</th>
<th>Notes</th>
- </tr></thead>
-<tbody>
-<tr>
-<td style="text-align:left">
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td style="text-align:left">
<strong>mock</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">mock</span></td>
@@ -115,8 +117,8 @@
<td style="text-align:left"><span style="font-size:x-small">mockpassword</span></td>
<td style="text-align:left">The mock driver doesn't talk to any cloud; it just pretends to be a cloud.</td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>Amazon EC2/S3</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">ec2</span></td>
@@ -124,8 +126,8 @@
<td style="text-align:left">Secret Access Key</td>
<td style="text-align:left">This information can be found on the <a href="http://aws-portal.amazon.com/gp/aws/developer/account/index.html?action=access-key">Security Credentials</a> page in your AWS account.</td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>Eucalyptus</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">eucalyptus</span></td>
@@ -133,8 +135,8 @@
<td style="text-align:left">Secret Access Key</td>
<td style="text-align:left"></td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>GoGrid</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">gogrid</span></td>
@@ -142,8 +144,8 @@
<td style="text-align:left">Shared Secret</td>
<td style="text-align:left">Go to <span style="font-size:x-small">My Account > API Keys</span> for <a href="https://my.gogrid.com/gogrid/com.servepath.gogrid.GoGrid/index.html">your account</a> and click on the key you want to use to find the shared secret.</td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>IBM SmartCloud</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">sbc</span></td>
@@ -151,8 +153,8 @@
<td style="text-align:left">Password</td>
<td style="text-align:left"></td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>Microsoft Azure (Storage Account only)</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">azure</span></td>
@@ -160,8 +162,8 @@
<td style="text-align:left">Primary Access Key</td>
<td style="text-align:left">The Storage Account Name is chosen when you create the service (e.g. name in http://name.blob.core.windows.net/). This and the access key are available from the service control panel.</td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>OpenNebula</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">opennebula</span></td>
@@ -169,8 +171,8 @@
<td style="text-align:left">OpenNebula password</td>
<td style="text-align:left">Set the environment variable OCCI_URL to the address on which OpenNebula's OCCI server is listening.</td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>Rackspace Cloud Servers/Cloud Files</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">rackspace</span></td>
@@ -178,8 +180,8 @@
<td style="text-align:left">API Key</td>
<td style="text-align:left">Obtain the key from the <a href="https://manage.rackspacecloud.com/APIAccess.do">API Access</a> page in your control panel.</td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>RHEV-M</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">rhevm</span></td>
@@ -189,8 +191,8 @@
<td style="text-align:left">RHEV-M password</td>
<td style="text-align:left">Set environment variable API_PROVIDER to the URL of the RHEV-M REST API endpoint. </td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>Rimuhosting</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">rimuhosting</span></td>
@@ -198,8 +200,8 @@
<td style="text-align:left">API Key</td>
<td style="text-align:left"></td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>Terremark</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">terremark</span></td>
@@ -207,8 +209,8 @@
<td style="text-align:left">Password</td>
<td style="text-align:left"></td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>VMware vSphere</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">vsphere</span></td>
@@ -216,8 +218,8 @@
<td style="text-align:left">vSphere user password</td>
<td style="text-align:left">Set environment variable API_PROVIDER to the hostname of the vSphere server.</td>
</tr>
-<tr>
-<td style="text-align:left">
+ <tr>
+ <td style="text-align:left">
<strong>OpenStack</strong>
</td>
<td style="text-align:left"><span style="font-size:x-small">openstack</span></td>
@@ -225,9 +227,10 @@
<td style="text-align:left">OpenStack user password</td>
<td style="text-align:left">Set environment variable API_PROVIDER to the URL of OpenStack API entrypoint.</td>
</tr>
-</tbody>
+ </tbody>
</table>
+
<footer class="footer">
<p class="pull-right"><span class='icon-circle-arrow-up'> </span><a href="#">Back to top</a></p>
<div class='row'>