You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2013/01/24 18:35:00 UTC
svn commit: r1438096 [1/2] - in /deltacloud/trunk/site: content/
content/assets/css/ content/assets/img/ content/cimi-curl/
content/cimi-rest/ layouts/partials/default/ output/ output/assets/img/
output/cimi-curl/ output/cimi-rest/ tmp/
Author: marios
Date: Thu Jan 24 17:34:59 2013
New Revision: 1438096
URL: http://svn.apache.org/viewvc?rev=1438096&view=rev
Log:
SITE: fix nits in CIMI docs - update links and nav bar
Added:
deltacloud/trunk/site/output/assets/img/API_Diagram.gif
Modified:
deltacloud/trunk/site/content/about.md
deltacloud/trunk/site/content/assets/css/bootstrap.css
deltacloud/trunk/site/content/assets/img/deltacloud_concept.gif
deltacloud/trunk/site/content/cimi-curl/cimi-curl-resource_metadata.md
deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-templates.md
deltacloud/trunk/site/content/index.md
deltacloud/trunk/site/content/rest-api.md
deltacloud/trunk/site/layouts/partials/default/nav.html
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/assets/img/deltacloud_concept.gif
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
deltacloud/trunk/site/tmp/checksums
deltacloud/trunk/site/tmp/compiled_content
deltacloud/trunk/site/tmp/dependencies
deltacloud/trunk/site/tmp/rule_memory
Modified: deltacloud/trunk/site/content/about.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/about.md?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/content/about.md (original)
+++ deltacloud/trunk/site/content/about.md Thu Jan 24 17:34:59 2013
@@ -10,13 +10,13 @@ title: About
<h3>About Deltacloud</h3>
<br/>
-<p>Deltacloud provides the API server and drivers necessary for connecting to cloud providers.</p>
+<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>
-<p>Using single API Deltacloud enables management of resources in different clouds.</p>
+<p>Using a single API Deltacloud enables management of resources in different clouds. This 'single API' can be 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.</p>
-<p>Start an instance on an internal cloud, then with the same code start another on EC2 or RHEV-M.</p>
+<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/>
@@ -31,9 +31,9 @@ title: About
<br/>
<h3>How does Deltacloud work?</h3>
<br/>
-<p>Deltacloud contains a cloud abstraction API. The API works as a wrapper around a large number of clouds, abstracting their differences. For every <a href="/supported-providers.html" rel="tooltip" title="currently supported providers">provider</a> there is a driver "speaking" cloud provider's native API. It frees you from dealing with the particulars of each cloud's API.</p>
+<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 <a href="/supported-providers.html" rel="tooltip" title="currently supported providers">provider</a> there is a driver "speaking" cloud provider's native API. It frees 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>. Deltacloud even comes with a 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>
+<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 a 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"/>
Modified: deltacloud/trunk/site/content/assets/css/bootstrap.css
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/assets/css/bootstrap.css?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/content/assets/css/bootstrap.css (original)
+++ deltacloud/trunk/site/content/assets/css/bootstrap.css Thu Jan 24 17:34:59 2013
@@ -496,7 +496,7 @@ button.btn.small,input[type="submit"].bt
.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;}
.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;}
.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#666;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
.navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#606060;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
.navbar-fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030;}
Modified: deltacloud/trunk/site/content/assets/img/deltacloud_concept.gif
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/assets/img/deltacloud_concept.gif?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
Files deltacloud/trunk/site/content/assets/img/deltacloud_concept.gif (original) and deltacloud/trunk/site/content/assets/img/deltacloud_concept.gif Thu Jan 24 17:34:59 2013 differ
Modified: deltacloud/trunk/site/content/cimi-curl/cimi-curl-resource_metadata.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-curl/cimi-curl-resource_metadata.md?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/content/cimi-curl/cimi-curl-resource_metadata.md (original)
+++ deltacloud/trunk/site/content/cimi-curl/cimi-curl-resource_metadata.md Thu Jan 24 17:34:59 2013
@@ -38,8 +38,8 @@ title: CIMI cURL Examples - Resource Met
<p> Retrieve the Resource Metadata resource corresponding to the Cloud Entry Point resource, in json format:</p>
- <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/resource_metadata/cloud_entry_point </pre>
+ <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/json" http://localhost:3001/cimi/resource_metadata/cloud_entry_point </pre>
<p> Retrieve the Resource Metadata resource corresponding to the Machine resource, in xml format:</p>
- <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/json" http://localhost:3001/cimi/resource_metadata/machine </pre>
+ <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/resource_metadata/machine </pre>
Modified: deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-templates.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-templates.md?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-templates.md (original)
+++ deltacloud/trunk/site/content/cimi-rest/cimi-rest-machine-templates.md Thu Jan 24 17:34:59 2013
@@ -27,7 +27,7 @@ machineConfiguration + machineImage = ma
</pre>
<p>
-A CIMI client (a <strong>consumer</strong> in CIMI terminology) uses a Machine Template to <a href="/cimi-rest-collections.html#create-machine"> create a new Machine</a>; a Machine Template consists of (amongst other attributes) a Machine Configuration and a Machine Image. Generally speaking - many CIMI resources require use of a template for their creation and a template will typically consist of an image plus a configuration resource.
+A CIMI client (a <strong>consumer</strong> in CIMI terminology) uses a Machine Template to <a href="/cimi-rest/cimi-rest-collections.html#create-machine"> create a new Machine</a>; a Machine Template consists of (amongst other attributes) a Machine Configuration and a Machine Image. Generally speaking - many CIMI resources require use of a template for their creation and a template will typically consist of an image plus a configuration resource.
</p>
</div>
Modified: deltacloud/trunk/site/content/index.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/index.md?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/content/index.md (original)
+++ deltacloud/trunk/site/content/index.md Thu Jan 24 17:34:59 2013
@@ -15,7 +15,7 @@ title: Deltacloud API
<ul>
<li>an opportunity to manage cloud instances the way you want</li>
<li>a way to protect your apps from cloud API changes and incompatitibilities</li>
- <li>three frontends: 'classic' Deltacloud, DMTF CIMI, and EC2</li>
+ <li>three frontends: 'classic' <a href="/rest-api.html">Deltacloud</a>, DMTF <a href="/cimi-rest.html">CIMI</a>, and EC2</li>
<li>support for all major <a class="providers" href="/drivers.html#drivers" title="Supported providers">cloud service providers</a></li>
<li>makes it easy for cloud providers to <a href="/how-to-contribute.html">add their cloud</a></li>
<li>lets you use your RHEV-M and vSphere installations as a cloud</li>
Modified: deltacloud/trunk/site/content/rest-api.md
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/rest-api.md?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/content/rest-api.md (original)
+++ deltacloud/trunk/site/content/rest-api.md Thu Jan 24 17:34:59 2013
@@ -1,6 +1,6 @@
---
site_name: Deltacloud API
-title: REST API
+title: Deltacloud REST API
---
<br/>
@@ -8,7 +8,7 @@ title: REST API
<div class="row">
<div class="span9">
-<h3 id="rest">REST API</h3>
+<h3 id="rest">The Deltacloud REST API</h3>
<p>
Apache Deltacloud is a REST-based (HATEOAS) cloud abstraction API. It enables management of resources in different IaaS clouds using a single API. There are back-end drivers communicating with each cloud provider's native API and the Deltacloud Core Framework provides the basis for implementing drivers to new IaaS clouds. Apache Deltacloud currently supports many back-end <a href="/drivers.html#drivers">cloud providers</a>.
Modified: deltacloud/trunk/site/layouts/partials/default/nav.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/layouts/partials/default/nav.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/layouts/partials/default/nav.html (original)
+++ deltacloud/trunk/site/layouts/partials/default/nav.html Thu Jan 24 17:34:59 2013
@@ -33,7 +33,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
Modified: deltacloud/trunk/site/output/about.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/about.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/about.html (original)
+++ deltacloud/trunk/site/output/about.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -98,46 +99,31 @@
<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>
-<p>Using single API Deltacloud enables management of resources in different clouds.</p>
+<p>Using a single API Deltacloud enables management of resources in different clouds. This 'single API' can be 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.</p>
-<p>Start an instance on an internal cloud, then with the same code start another on EC2 or RHEV-M.</p>
+<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. The API works as a wrapper around a large number of clouds, abstracting their differences. For every <a href="supported-providers.html" rel="tooltip" title="currently supported providers">provider</a> there is a driver "speaking" cloud provider's native API. It frees 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>. Deltacloud even comes with a 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>
+<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 <a href="supported-providers.html" rel="tooltip" title="currently supported providers">provider</a> there is a driver "speaking" cloud provider's native API. It frees you from dealing with the particulars of each cloud's API.</p>
-<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>
+<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 a 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>
</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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/addresses.html (original)
+++ deltacloud/trunk/site/output/addresses.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -109,43 +110,35 @@ 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>
@@ -155,10 +148,9 @@ 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">
@@ -372,7 +364,6 @@ 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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/api-docs.html (original)
+++ deltacloud/trunk/site/output/api-docs.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -96,7 +97,6 @@
-
<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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/api-entry-point.html (original)
+++ deltacloud/trunk/site/output/api-entry-point.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -111,24 +112,22 @@ 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">
@@ -140,9 +139,7 @@ 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
@@ -230,95 +227,90 @@ 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'>
Added: deltacloud/trunk/site/output/assets/img/API_Diagram.gif
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/assets/img/API_Diagram.gif?rev=1438096&view=auto
==============================================================================
Files deltacloud/trunk/site/output/assets/img/API_Diagram.gif (added) and deltacloud/trunk/site/output/assets/img/API_Diagram.gif Thu Jan 24 17:34:59 2013 differ
Modified: deltacloud/trunk/site/output/assets/img/deltacloud_concept.gif
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/assets/img/deltacloud_concept.gif?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
Files deltacloud/trunk/site/output/assets/img/deltacloud_concept.gif (original) and deltacloud/trunk/site/output/assets/img/deltacloud_concept.gif Thu Jan 24 17:34:59 2013 differ
Modified: deltacloud/trunk/site/output/blob-storage.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/blob-storage.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/blob-storage.html (original)
+++ deltacloud/trunk/site/output/blob-storage.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -110,11 +111,10 @@ 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 +123,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,30 +131,27 @@ 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>
@@ -162,9 +159,7 @@ 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">
@@ -591,7 +586,6 @@ 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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-curl.html (original)
+++ deltacloud/trunk/site/output/cimi-curl.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html (original)
+++ deltacloud/trunk/site/output/cimi-curl/cimi-curl-machines.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&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 Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -127,11 +128,11 @@
<p> Retrieve the Resource Metadata resource corresponding to the Cloud Entry Point resource, in json format:</p>
- <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/xml" http://localhost:3001/cimi/resource_metadata/cloud_entry_point </pre>
+ <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/json" http://localhost:3001/cimi/resource_metadata/cloud_entry_point </pre>
<p> Retrieve the Resource Metadata resource corresponding to the Machine resource, in xml format:</p>
- <pre>curl -v --user "mockuser:mockpassword" -H "Accept: application/json" http://localhost:3001/cimi/resource_metadata/machine </pre>
+ <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>
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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-curl/cimi-curl-volumes.html (original)
+++ deltacloud/trunk/site/output/cimi-curl/cimi-curl-volumes.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
Modified: deltacloud/trunk/site/output/cimi-rest.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/cimi-rest.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest.html (original)
+++ deltacloud/trunk/site/output/cimi-rest.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-collections.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&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 Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&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 Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&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 Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&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 Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -118,7 +119,7 @@ machineConfiguration + machineImage = ma
</pre>
<p>
-A CIMI client (a <strong>consumer</strong> in CIMI terminology) uses a Machine Template to <a href="../cimi-rest-collections.html#create-machine"> create a new Machine</a>; a Machine Template consists of (amongst other attributes) a Machine Configuration and a Machine Image. Generally speaking - many CIMI resources require use of a template for their creation and a template will typically consist of an image plus a configuration resource.
+A CIMI client (a <strong>consumer</strong> in CIMI terminology) uses a Machine Template to <a href="cimi-rest-collections.html#create-machine"> create a new Machine</a>; a Machine Template consists of (amongst other attributes) a Machine Configuration and a Machine Image. Generally speaking - many CIMI resources require use of a template for their creation and a template will typically consist of an image plus a configuration resource.
</p>
</div>
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=1438096&r1=1438095&r2=1438096&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 Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&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 Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&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 Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&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 Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/cimi-rest/cimi-rest-volumes.html (original)
+++ deltacloud/trunk/site/output/cimi-rest/cimi-rest-volumes.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
Modified: deltacloud/trunk/site/output/clients.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/clients.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/clients.html (original)
+++ deltacloud/trunk/site/output/clients.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -96,7 +97,6 @@
-
<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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/command-tools.html (original)
+++ deltacloud/trunk/site/output/command-tools.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -102,14 +103,10 @@
<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>
@@ -118,7 +115,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">REST API documentation</a>.
</dd>
@@ -130,9 +127,7 @@
<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>
@@ -151,8 +146,6 @@ 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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/compute-resources.html (original)
+++ deltacloud/trunk/site/output/compute-resources.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -121,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>
@@ -138,10 +139,9 @@ 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,7 +220,6 @@ 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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/contact.html (original)
+++ deltacloud/trunk/site/output/contact.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
Modified: deltacloud/trunk/site/output/contribute.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/contribute.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/contribute.html (original)
+++ deltacloud/trunk/site/output/contribute.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -96,7 +97,6 @@
-
<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=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/credentials.html (original)
+++ deltacloud/trunk/site/output/credentials.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -97,18 +98,16 @@
<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>
@@ -116,8 +115,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>
@@ -125,8 +124,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>
@@ -134,8 +133,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>
@@ -143,8 +142,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>
@@ -152,8 +151,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>
@@ -161,8 +160,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>
@@ -170,8 +169,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>
@@ -179,8 +178,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>
@@ -190,8 +189,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>
@@ -199,8 +198,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>
@@ -208,8 +207,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>
@@ -217,8 +216,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>
@@ -226,10 +225,9 @@
<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'>
Modified: deltacloud/trunk/site/output/curl-examples.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/curl-examples.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/curl-examples.html (original)
+++ deltacloud/trunk/site/output/curl-examples.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -105,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>
@@ -121,13 +122,12 @@ curl -v -X DELETE --user "username:passw
</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,13 +140,10 @@ curl -v -X DELETE --user "username:passw
<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>
@@ -355,7 +352,6 @@ listener_balancer_port=80&listener_i
<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'>
Modified: deltacloud/trunk/site/output/download.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/download.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/download.html (original)
+++ deltacloud/trunk/site/output/download.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
Modified: deltacloud/trunk/site/output/drivers.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/drivers.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/drivers.html (original)
+++ deltacloud/trunk/site/output/drivers.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
Modified: deltacloud/trunk/site/output/firewalls.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/firewalls.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/firewalls.html (original)
+++ deltacloud/trunk/site/output/firewalls.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -106,7 +107,7 @@ Firewalls represent sets of rules that g
</p>
<ul>
- <li>a <strong>name</strong>
+<li>a <strong>name</strong>
</li>
<li>a <strong>description</strong>
</li>
@@ -115,7 +116,6 @@ Firewalls represent sets of rules that g
<li>set of <strong>rules</strong>
</li>
</ul>
-
<p>
For Amazon EC2, an instance is launched into a firewall by specifying the <strong>firewalls1 ... firewallsN</strong> parameters in the <strong>POST /api/instances</strong> operation (see the <a href="instances.html#instance">Create an instance</a> section).
</p>
@@ -125,23 +125,22 @@ Each <strong>firewall rule</strong> has
</p>
<ul>
- <li>an <strong>allow_protocol</strong> (tcp, udp or icmp);</li>
+<li>an <strong>allow_protocol</strong> (tcp, udp or icmp);</li>
<li>a <strong>port_from</strong> and a <strong>port_to</strong> that delimit the port range for access; and</li>
<li>a <strong>sources</strong> list, which can contain firewalls (i.e. allow instances in another firewall to communicate with instances in the firewall in which this rule exists), or a number of IP addresses in CIDR format, or a mix of both.</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><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">Realms</a></li>
+<li><a href="compute-resources.html#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>
@@ -151,10 +150,9 @@ Each <strong>firewall rule</strong> has
<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>
@@ -186,15 +184,11 @@ By creating the rule identifier abstract
<p><br></p>
<ul class="nav nav-pills">
- <li class="active"><a href="#tab1" data-toggle="tab">Get a list of all firewalls</a></li>
+<li class="active"><a href="#tab1" data-toggle="tab">Get a list of all firewalls</a></li>
<li><a href="#tab2" data-toggle="tab">Get the details of a firewall</a></li>
<li><a href="#tab3" data-toggle="tab">Create/delete a firewall</a></li>
<li><a href="#tab4" data-toggle="tab">Create/delete a firewall rule</a></li>
-</ul>
-
-<hr>
-
-<div class="tab-content">
+</ul><hr><div class="tab-content">
<div class="tab-pane active" id="tab1">
<h4>Get a list of all firewalls</h4>
@@ -539,7 +533,6 @@ Date: Wed, 27 Jul 2011 10:39:52 GMT
<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/getting-sources.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/getting-sources.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/getting-sources.html (original)
+++ deltacloud/trunk/site/output/getting-sources.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -170,7 +171,6 @@ $ gem install pkg/deltacloud-client-<
<p><a class="btn btn-inverse btn-large" style="float: right" href="how-to-contribute.html">Contribute</a>
<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/hardware-profiles.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/hardware-profiles.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/hardware-profiles.html (original)
+++ deltacloud/trunk/site/output/hardware-profiles.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -110,14 +111,13 @@ Since clouds differ sharply in how virtu
</p>
<ul>
- <li>size is <strong>fixed</strong> in the dimension, for example instances all have 2GB of memory;</li>
+<li>size is <strong>fixed</strong> in the dimension, for example instances all have 2GB of memory;</li>
<li>size can vary within some <strong>range</strong>, for example instances can have from 1GB to 4GB of memory;
</li>
<li>
size can be chosen from a predefined set of values - an <strong>enumeration</strong>, for example instances can have 512 MB, 1 GB or 4GB of memory.
</li>
</ul>
-
<p>
When creating a new instance, a client must specify the hardware profile on which the instance is based.
</p>
@@ -130,14 +130,14 @@ In addition to the sizing constraints, a
<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">Realms</a></li>
+<li><a href="compute-resources.html#realms">Realms</a></li>
<li class="active"><a href="#hardware">Hardware profiles</a></li>
<li><a href="images.html">Images</a></li>
<li><a href="instance-states.html">Instance states</a></li>
@@ -147,10 +147,9 @@ In addition to the sizing constraints, a
<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 style="margin-top:0px">
@@ -302,7 +301,6 @@ Content-Length: 808
<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/how-to-contribute.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/how-to-contribute.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/how-to-contribute.html (original)
+++ deltacloud/trunk/site/output/how-to-contribute.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -102,7 +103,7 @@
<h4 id="how">How can I contribute?</h4>
<ul class="nav nav-list">
- <li class="nav-header">
+<li class="nav-header">
</li>
<li>
<a href="send-patch.html">Send a patch</a>
@@ -119,9 +120,7 @@
<li>
<a href="#documentation">Write documentation</a>
</li>
-</ul>
-
-<p><br></p>
+</ul><p><br></p>
<h3>Overview of the Deltacloud directory structure</h3>
@@ -181,7 +180,6 @@ deltacloud
<h3 id="documentation">Writing documentation</h3>
<p>You can also contribute with a piece of documentation. There are still things which needs to be described. If you found one like that and you are interested in writing a couple of sentences about the particular issue, please, donât hesitate to do it and <a href="http://mail-archives.apache.org/mod_mbox/deltacloud-dev/">send us</a> your contribution. We really appreciate your help.</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/images.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/images.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/images.html (original)
+++ deltacloud/trunk/site/output/images.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -106,7 +107,7 @@ Images are used to launch instances. Eac
</p>
<ul>
- <li>a human-readable <strong>name</strong>
+<li>a human-readable <strong>name</strong>
</li>
<li>a <strong>description</strong>
</li>
@@ -117,7 +118,6 @@ Images are used to launch instances. Eac
<li>a <strong>state</strong>
</li>
</ul>
-
<p>
The <strong>owner_id</strong> identifies the user account to which the image belongs. The <strong>architecture</strong> attribute refers to whether the image will create an instance with 32 or 64-bit processor. The values that the Deltacloud server returns for this attribute are thus i386 and x86_64 respectively. The state attribute varies between back-end clouds (it depends on a cloud provider). For example, AWS EC2 image state can be one of AVAILABLE, PENDING or FAILED, whereas Rackspace Cloudservers image state can be one of UNKNOWN, PREPARING, ACTIVE, QUEUED or FAILED. Finally, each image also contains an <code><actions></code> attribute which specifies the URI to which a client may issue a <strong>HTTP POST</strong> for creation of an instance from the given image.
</p>
@@ -126,14 +126,14 @@ The <strong>owner_id</strong> identifies
<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">Realms</a></li>
+<li><a href="compute-resources.html#realms">Realms</a></li>
<li><a href="hardware-profiles.html">Hardware profiles</a></li>
<li class="active"><a href="#images">Images</a></li>
<li><a href="instance-states.html">Instance states</a></li>
@@ -143,23 +143,18 @@ The <strong>owner_id</strong> identifies
<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><br></p>
<ul class="nav nav-pills">
- <li class="active"><a href="#tab1" data-toggle="tab">Get a list of all images</a></li>
+<li class="active"><a href="#tab1" data-toggle="tab">Get a list of all images</a></li>
<li><a href="#tab2" data-toggle="tab">Get the details of an image</a></li>
<li><a href="#tab3" data-toggle="tab">Create/delete an image</a></li>
-</ul>
-
-<hr>
-
-<div class="tab-content">
+</ul><hr><div class="tab-content">
<div class="tab-pane active" id="tab1">
<h4>Get the list of all images</h4>
@@ -384,7 +379,6 @@ HTTP/1.1 204 No Content
<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/index.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/index.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/index.html (original)
+++ deltacloud/trunk/site/output/index.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>
@@ -106,7 +107,7 @@
<ul>
<li>an opportunity to manage cloud instances the way you want</li>
<li>a way to protect your apps from cloud API changes and incompatitibilities</li>
- <li>three frontends: 'classic' Deltacloud, DMTF CIMI, and EC2</li>
+ <li>three frontends: 'classic' <a href="rest-api.html">Deltacloud</a>, DMTF <a href="cimi-rest.html">CIMI</a>, and EC2</li>
<li>support for all major <a class="providers" href="drivers.html#drivers" title="Supported providers">cloud service providers</a>
</li>
<li>makes it easy for cloud providers to <a href="how-to-contribute.html">add their cloud</a>
Modified: deltacloud/trunk/site/output/install-deltacloud.html
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/install-deltacloud.html?rev=1438096&r1=1438095&r2=1438096&view=diff
==============================================================================
--- deltacloud/trunk/site/output/install-deltacloud.html (original)
+++ deltacloud/trunk/site/output/install-deltacloud.html Thu Jan 24 17:34:59 2013
@@ -73,7 +73,8 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">API<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="/rest-api.html">REST API</a></li>
+ <li><a href="/rest-api.html">Deltacloud REST API</a></li>
+ <li><a href="/curl-examples.html">Deltacloud API cURL examples</a></li>
<li><a href="/drivers.html">Drivers API</a></li>
</ul>
</li>