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/03/18 11:26:30 UTC
[4/4] git commit: Site: Update for 1.1.2 release
Updated Branches:
refs/heads/master a392bd905 -> d8e671a12
Site: Update for 1.1.2 release
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/d8e671a1
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/d8e671a1
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/d8e671a1
Branch: refs/heads/master
Commit: d8e671a129e90a22e4e38ccef6dbc5af1c967912
Parents: 476cfcb
Author: Michal Fojtik <mf...@redhat.com>
Authored: Mon Mar 18 11:26:13 2013 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Mon Mar 18 11:26:13 2013 +0100
----------------------------------------------------------------------
site/content/download.md | 40 ++--
site/content/index.md | 2 +-
site/output/about.html | 27 ++-
site/output/addresses.html | 28 ++-
site/output/api-docs.html | 1 +
site/output/api-entry-point.html | 81 +++---
site/output/blob-storage.html | 21 +-
site/output/cimi-curl.html | 15 +-
site/output/cimi-curl/cimi-curl-machines.html | 29 ++-
.../cimi-curl/cimi-curl-resource_metadata.html | 11 +-
site/output/cimi-curl/cimi-curl-volumes.html | 28 ++-
site/output/cimi-rest.html | 17 +-
site/output/cimi-rest/cimi-rest-collections.html | 46 +++-
site/output/cimi-rest/cimi-rest-entry-point.html | 10 +-
.../cimi-rest/cimi-rest-machine-configs.html | 23 +-
.../output/cimi-rest/cimi-rest-machine-images.html | 29 ++-
.../cimi-rest/cimi-rest-machine-templates.html | 23 +-
.../cimi-rest/cimi-rest-resource-metadata.html | 160 ++++++-----
.../output/cimi-rest/cimi-rest-volume-configs.html | 26 ++-
site/output/cimi-rest/cimi-rest-volume-images.html | 26 ++-
.../cimi-rest/cimi-rest-volume-templates.html | 26 ++-
site/output/cimi-rest/cimi-rest-volumes.html | 26 ++-
site/output/clients.html | 1 +
site/output/command-tools.html | 16 +-
site/output/compute-resources.html | 10 +-
site/output/contribute.html | 1 +
site/output/credentials.html | 65 +++---
site/output/curl-examples.html | 15 +-
site/output/download.html | 64 +++--
site/output/drivers.html | 210 ++++++++-------
site/output/firewalls.html | 26 ++-
site/output/getting-sources.html | 1 +
site/output/hardware-profiles.html | 13 +-
site/output/how-to-contribute.html | 7 +-
site/output/images.html | 21 +-
site/output/index.html | 17 +-
site/output/install-deltacloud.html | 7 +-
site/output/instance-states.html | 81 +++---
site/output/instances.html | 89 ++++---
site/output/join-deltacloud.html | 1 +
site/output/keys.html | 21 +-
site/output/libdeltacloud.html | 1 +
site/output/load-balancers.html | 21 +-
site/output/rest-api.html | 16 +-
site/output/ruby-client.html | 6 +-
site/output/run-deltacloud-server.html | 1 +
site/output/running-the-white-box-tests.html | 14 +-
site/output/send-patch.html | 19 +-
site/output/storage-resources.html | 25 ++-
site/output/storage-snapshots.html | 22 +-
site/output/supported-providers.html | 172 +++++++------
.../update-vcr-test-fixtures-data-example.html | 18 +-
site/output/usage.html | 12 +-
site/output/use-the-api.html | 1 +
site/output/white-box-tests-layout.html | 7 +-
site/output/white-box-tests.html | 10 +-
site/output/why-update-vcr-test-fixtures-data.html | 21 +-
site/output/write-new-driver.html | 32 ++-
58 files changed, 1051 insertions(+), 708 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/content/download.md
----------------------------------------------------------------------
diff --git a/site/content/download.md b/site/content/download.md
index e698c75..484842a 100644
--- a/site/content/download.md
+++ b/site/content/download.md
@@ -5,7 +5,7 @@ title: Download
<br/>
<h3>Download</h3>
<p>
- Version <b>1.1.1</b> of Apache Deltacloud is available. See the
+ Version <b>1.1.2</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.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.2.gem">deltacloud-core-1.1.2.gem</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>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.2.gem.asc">PGP</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.2.gem.md5">MD5</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.2.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.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.2.tgz">deltacloud-core-1.1.2.tgz</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>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.2.tgz.asc">PGP</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.2.tgz.md5">MD5</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-core-1.1.2.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.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.2.gem">deltacloud-client-1.1.2.gem</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>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.2.gem.asc">PGP</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.2.gem.md5">MD5</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.2.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.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.2.tgz">deltacloud-client-1.1.2.tgz</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>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.2.tgz.asc">PGP</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.2.tgz.md5">MD5</a>
+ <a href="http://www.apache.org/dyn/closer.cgi?path=deltacloud/stable/deltacloud-client-1.1.2.tgz.sha1">SHA1</a>
)
</td>
</tr>
@@ -104,15 +104,15 @@ title: Download
</p>
<pre>
$ pgpk -a KEYS
-$ pgpv deltacloud-core-1.1.1.tar.gz.asc
+$ pgpv deltacloud-core-1.1.2.tar.gz.asc
</pre>
or
<pre>
$ pgp -ka KEYS
-$ pgp deltacloud-core-1.1.1.tar.gz.asc
+$ pgp deltacloud-core-1.1.2.tar.gz.asc
</pre>
or
<pre>
$ gpg --import KEYS
-$ gpg --verify deltacloud-core-1.1.1.tar.gz.asc
+$ gpg --verify deltacloud-core-1.1.2.tar.gz.asc
</pre>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/content/index.md
----------------------------------------------------------------------
diff --git a/site/content/index.md b/site/content/index.md
index 2e3729a..491762b 100644
--- a/site/content/index.md
+++ b/site/content/index.md
@@ -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.1</b></a><br/>
+ <a class="btn btn-info" href="/download.html"><b>deltacloud-core-1.1.2</b></a><br/>
<small>More about <a href="/install-deltacloud.html">installation</a>...</small>
</p>
<br/>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/about.html
----------------------------------------------------------------------
diff --git a/site/output/about.html b/site/output/about.html
index 649a5d3..8161afb 100644
--- a/site/output/about.html
+++ b/site/output/about.html
@@ -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="drivers.html#drivers" 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="drivers.html#drivers" 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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/addresses.html
----------------------------------------------------------------------
diff --git a/site/output/addresses.html b/site/output/addresses.html
index 8ff7cf5..29b62a4 100644
--- a/site/output/addresses.html
+++ b/site/output/addresses.html
@@ -110,35 +110,43 @@ The addresses collection represents IP addresses and allows <strong>IP address m
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 operations:
<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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/api-docs.html
----------------------------------------------------------------------
diff --git a/site/output/api-docs.html b/site/output/api-docs.html
index c3a7d3d..e387ebe 100644
--- a/site/output/api-docs.html
+++ b/site/output/api-docs.html
@@ -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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/api-entry-point.html
----------------------------------------------------------------------
diff --git a/site/output/api-entry-point.html b/site/output/api-entry-point.html
index 64c014c..059bca3 100644
--- a/site/output/api-entry-point.html
+++ b/site/output/api-entry-point.html
@@ -112,22 +112,24 @@ Any part of the official API can be reached through the main entry point, by def
<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 reached through the main entry point, by def
<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 collection in the Deltacloud API:
</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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/blob-storage.html
----------------------------------------------------------------------
diff --git a/site/output/blob-storage.html b/site/output/blob-storage.html
index 284e64c..4c48388 100644
--- a/site/output/blob-storage.html
+++ b/site/output/blob-storage.html
@@ -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_Grey
</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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-curl.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-curl.html b/site/output/cimi-curl.html
index 7c961ce..d4e8319 100644
--- a/site/output/cimi-curl.html
+++ b/site/output/cimi-curl.html
@@ -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-hand navigation bar to see cURL examples f
<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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-curl/cimi-curl-machines.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-curl/cimi-curl-machines.html b/site/output/cimi-curl/cimi-curl-machines.html
index 2b5c02b..58eecd8 100644
--- a/site/output/cimi-curl/cimi-curl-machines.html
+++ b/site/output/cimi-curl/cimi-curl-machines.html
@@ -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:mockpassword" -H "Content-Type: application/xml
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" -H "Content-Type: application/xml" -H "Ac
<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" -H "Accept: application/xml" http://local
<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" -H "Accept: application/xml" -X DELETE ht
</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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-curl/cimi-curl-resource_metadata.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-curl/cimi-curl-resource_metadata.html b/site/output/cimi-curl/cimi-curl-resource_metadata.html
index f1e1389..d24486b 100644
--- a/site/output/cimi-curl/cimi-curl-resource_metadata.html
+++ b/site/output/cimi-curl/cimi-curl-resource_metadata.html
@@ -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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-curl/cimi-curl-volumes.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-curl/cimi-curl-volumes.html b/site/output/cimi-curl/cimi-curl-volumes.html
index 0d76746..aa95be7 100644
--- a/site/output/cimi-curl/cimi-curl-volumes.html
+++ b/site/output/cimi-curl/cimi-curl-volumes.html
@@ -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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest.html b/site/output/cimi-rest.html
index 18fc143..49c76ef 100644
--- a/site/output/cimi-rest.html
+++ b/site/output/cimi-rest.html
@@ -120,7 +120,7 @@ Apache Deltacloud exposes the DMTF <a href="http://dmtf.org/cloud">Cloud Infrast
<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 href="http://dmtf.org/cloud">Cloud Infrast
<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 with the CIMI interface exposed by a De
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 server with the CIMI interface and the EC
<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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest/cimi-rest-collections.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-collections.html b/site/output/cimi-rest/cimi-rest-collections.html
index 86fdea6..b8ee7f8 100644
--- a/site/output/cimi-rest/cimi-rest-collections.html
+++ b/site/output/cimi-rest/cimi-rest-collections.html
@@ -109,7 +109,11 @@ In the following sections, the textual definitions following the title of each r
</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 the collection of Machine resources wit
<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 the collection of Machine resources wit
<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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest/cimi-rest-entry-point.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-entry-point.html b/site/output/cimi-rest/cimi-rest-entry-point.html
index 436c43f..ce0de3f 100644
--- a/site/output/cimi-rest/cimi-rest-entry-point.html
+++ b/site/output/cimi-rest/cimi-rest-entry-point.html
@@ -116,7 +116,7 @@ A deltacloud server exposes the CIMI Cloud Entry Point at /cimi/cloudEntryPoint.
<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 Cloud Entry Point at /cimi/cloudEntryPoint.
<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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest/cimi-rest-machine-configs.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-machine-configs.html b/site/output/cimi-rest/cimi-rest-machine-configs.html
index de832a8..e6bbc60 100644
--- a/site/output/cimi-rest/cimi-rest-machine-configs.html
+++ b/site/output/cimi-rest/cimi-rest-machine-configs.html
@@ -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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest/cimi-rest-machine-images.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-machine-images.html b/site/output/cimi-rest/cimi-rest-machine-images.html
index f6256a5..5281608 100644
--- a/site/output/cimi-rest/cimi-rest-machine-images.html
+++ b/site/output/cimi-rest/cimi-rest-machine-images.html
@@ -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 represents the collection of Machine Image r
<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 represents the collection of Machine Image r
<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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest/cimi-rest-machine-templates.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-machine-templates.html b/site/output/cimi-rest/cimi-rest-machine-templates.html
index e16fc85..939ef26 100644
--- a/site/output/cimi-rest/cimi-rest-machine-templates.html
+++ b/site/output/cimi-rest/cimi-rest-machine-templates.html
@@ -126,7 +126,7 @@ A CIMI client (a <strong>consumer</strong> in CIMI terminology) uses a Machine T
<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</strong> in CIMI terminology) uses a Machine T
<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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest/cimi-rest-resource-metadata.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-resource-metadata.html b/site/output/cimi-rest/cimi-rest-resource-metadata.html
index 0490e2a..37b13cc 100644
--- a/site/output/cimi-rest/cimi-rest-resource-metadata.html
+++ b/site/output/cimi-rest/cimi-rest-resource-metadata.html
@@ -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 resource (in case a capability would apply
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 definition would say so).
<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 either both
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 supported.
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 SystemTemplates.
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 new
Machine.
</td>
</tr>
-<tr>
-<td>Machine
+ <tr>
+ <td>Machine
</td>
<td>MachineConfigByValue
</td>
@@ -339,8 +347,8 @@ true the MachineTemplateByValue capability shall also
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 shall also be
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 shall also be
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 MachineTemplateByValue
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 a value of true.
"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 Provider will attempt
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 SNAPSHOT Machine
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 Credential create
operations.
</td>
</tr>
-<tr>
-<td>Volume
+ <tr>
+ <td>Volume
</td>
<td>SharedVolumeSupport
</td>
@@ -432,8 +440,8 @@ volume resources across Machines. The value specified
is of type "boolean."
</td>
</tr>
-<tr>
-<td>Volume
+ <tr>
+ <td>Volume
</td>
<td>VolumeConfigByValue
</td>
@@ -443,8 +451,8 @@ If true, the VolumeTemplateByValue capability shall
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 shall also be
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 Volume.
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 create
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 the NetworkPort
create operation.
</td>
</tr>
-<tr>
-<td>NetworkPort
+ <tr>
+ <td>NetworkPort
</td>
<td>NetworkPortTemplateByValue
</td>
@@ -511,8 +519,8 @@ NetworkPort Templates by-value in the NetworkPort
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 specified is of type
"integer."
</td>
</tr>
-<tr>
-<td>Meter
+ <tr>
+ <td>Meter
</td>
<td>MeterConfigByValue
</td>
@@ -543,8 +551,8 @@ MeterConfigurations by-value in the Meter create
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 resource is
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>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest/cimi-rest-volume-configs.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-volume-configs.html b/site/output/cimi-rest/cimi-rest-volume-configs.html
index 14cd456..5215a93 100644
--- a/site/output/cimi-rest/cimi-rest-volume-configs.html
+++ b/site/output/cimi-rest/cimi-rest-volume-configs.html
@@ -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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest/cimi-rest-volume-images.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-volume-images.html b/site/output/cimi-rest/cimi-rest-volume-images.html
index 7bcb190..b0506e2 100644
--- a/site/output/cimi-rest/cimi-rest-volume-images.html
+++ b/site/output/cimi-rest/cimi-rest-volume-images.html
@@ -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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest/cimi-rest-volume-templates.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-volume-templates.html b/site/output/cimi-rest/cimi-rest-volume-templates.html
index 85fef9c..3f74a4c 100644
--- a/site/output/cimi-rest/cimi-rest-volume-templates.html
+++ b/site/output/cimi-rest/cimi-rest-volume-templates.html
@@ -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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/cimi-rest/cimi-rest-volumes.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest/cimi-rest-volumes.html b/site/output/cimi-rest/cimi-rest-volumes.html
index 361439d..6ca6bf0 100644
--- a/site/output/cimi-rest/cimi-rest-volumes.html
+++ b/site/output/cimi-rest/cimi-rest-volumes.html
@@ -115,7 +115,7 @@ A Volume Collection resource represents the collection of Volumes within a Provi
<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 the collection of Volumes within a Provi
<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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/clients.html
----------------------------------------------------------------------
diff --git a/site/output/clients.html b/site/output/clients.html
index b88b2a6..c76e90d 100644
--- a/site/output/clients.html
+++ b/site/output/clients.html
@@ -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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/command-tools.html
----------------------------------------------------------------------
diff --git a/site/output/command-tools.html b/site/output/command-tools.html
index 212258d..735bda4 100644
--- a/site/output/command-tools.html
+++ b/site/output/command-tools.html
@@ -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="drivers.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 Deltacloud server is running on your loca
<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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/compute-resources.html
----------------------------------------------------------------------
diff --git a/site/output/compute-resources.html b/site/output/compute-resources.html
index 3083f19..1fbf438 100644
--- a/site/output/compute-resources.html
+++ b/site/output/compute-resources.html
@@ -122,14 +122,14 @@ To list all realms use call <strong>GET /api/realms</strong>. You can filter the
<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 /api/realms</strong>. You can filter the
<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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/contribute.html
----------------------------------------------------------------------
diff --git a/site/output/contribute.html b/site/output/contribute.html
index 58a10c5..0ab4825 100644
--- a/site/output/contribute.html
+++ b/site/output/contribute.html
@@ -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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/credentials.html
----------------------------------------------------------------------
diff --git a/site/output/credentials.html b/site/output/credentials.html
index 58228b4..6dceb03 100644
--- a/site/output/credentials.html
+++ b/site/output/credentials.html
@@ -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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d8e671a1/site/output/curl-examples.html
----------------------------------------------------------------------
diff --git a/site/output/curl-examples.html b/site/output/curl-examples.html
index 40cf61a..a5d25cc 100644
--- a/site/output/curl-examples.html
+++ b/site/output/curl-examples.html
@@ -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 Deltacloud. 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>
@@ -122,12 +122,13 @@ curl -v -X DELETE --user "username:password" -H "Accept: application/xml" http:/
</pre>
</li>
</ul>
-</div>
+
+ </div>
<div class="span4">
<ul class="nav nav-list well">
-<li class="nav-header">cURL as a deltacloud client</li>
+ <li class="nav-header">cURL as a deltacloud client</li>
<li class="active"><a href="#instances">Work with instances</a></li>
<li><a href="#images">Work with images</a></li>
<li><a href="#hardware_profiles">Work with hardware profiles</a></li>
@@ -140,10 +141,13 @@ curl -v -X DELETE --user "username:password" -H "Accept: application/xml" http:/
<li><a href="#storage_volumes">Work with storage volumes</a></li>
<li><a href="#storage_snapshots">Work with storage snapshots</a></li>
</ul>
+
+ </div>
</div>
-</div>
-<hr><h4 id="instances">Working with instances</h4>
+<hr>
+
+<h4 id="instances">Working with instances</h4>
<p>Display a complete list of instances in xml format:</p>
@@ -352,6 +356,7 @@ listener_balancer_port=80&listener_instance_port=3001" http://localhost:3001
<p>Delete a storage snapshot:</p>
<pre>curl -v --user "user:pass" -X DELETE http://localhost:3001/api/storage_snapshots/snap-dda6cebc?format=xml</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'>