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/03/06 23:09:18 UTC
[3/5] SITE: addresses DTACLOUD-478, DTACLOUD-479 and removes crud
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c7f4d022/site/output/#storage-snapshots.md#
----------------------------------------------------------------------
diff --git a/site/output/#storage-snapshots.md# b/site/output/#storage-snapshots.md#
deleted file mode 100644
index b7bf07c..0000000
--- a/site/output/#storage-snapshots.md#
+++ /dev/null
@@ -1,185 +0,0 @@
----
-site_name: Deltacloud API
-title: Storage snapshots
----
-
-<br/>
-
-<div class="alert alert-info">
-<a class="close" data-dismiss="alert" href="#">×</a>
-This section is currently being updated.
-</div>
-
-<div class="row">
- <div class="span8">
-
-<h3 id="snapshots">Storage snapshots</h3>
-
-<p>
-A storage_snapshot captures the point-in-time state of a storage_volume. Each snapshot has a created timestamp, and a storage_volume attribute referring to the volume from which the snapshot was made.
-</p>
-
-<h4>Get a list of all storage snapshots</h4>
-
-<p>
-To list all available storage snapshots use call <strong>GET /api/storage_snapshots</strong>. For Amazon EC2 this list includes any snapshots that are available to the requesting client account, including those that may not have been created by that account. As this list is very long the example below shows only part of the response:
-</p>
-
- </div>
- <div class="span4">
-
-<ul class="nav nav-list well">
- <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>
- <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 class="active"><a href="#snapshots">Storage snapshots</a></li>
- <li><a href="/blob-storage.html">Blob storage</a></li>
- </ul>
-</ul>
-
- </div>
-</div>
-
-<p>
-Example request:
-</p>
-
-<pre>
-GET /api/storage_snapshots?format=xml HTTP/1.1
-Authorization: Basic AU1J3UB2121Afd1DdyQWxLaTYTmJMNF4zTXBoRGdhMDh2RUw5ZDAN9zVXVa==
-User-Agent: curl/7.20.1 (i386-redhat-linux-gnu)
-Host: localhost:3001
-Accept: */*
-</pre>
-
-<p>Server response:</p>
-
-<pre>
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Date: Thu, 28 Jul 2011 22:08:36 GMT
-Content-Length: 156897
-
-<?xml version='1.0' encoding='utf-8' ?>
-<storage_snapshots>
- <storage_snapshot href='http://localhost:3001/api/storage_snapshots/snap-45b8d024' id='snap-45b8d024'>
- <created>Thu Jul 28 21:54:19 UTC 2011</created>
- <storage_volume href='http://localhost:3001/api/storage_volumes/vol-0bc0de60' id='vol-0bc0de60'></storage_volume>
- </storage_snapshot>
- <storage_snapshot href='http://localhost:3001/api/storage_snapshots/snap-d5a1c9b4' id='snap-d5a1c9b4'>
- <created>Thu Jul 28 21:46:12 UTC 2011</created>
- <storage_volume href='http://localhost:3001/api/storage_volumes/vol-99fbe5f2' id='vol-99fbe5f2'></storage_volume>
- </storage_snapshot>
- <storage_snapshot href='http://localhost:3001/api/storage_snapshots/snap-dda6cebc' id='snap-dda6cebc'>
- <created>Thu Jul 28 21:51:55 UTC 2011</created>
- <storage_volume href='http://localhost:3001/api/storage_volumes/vol-99fbe5f2' id='vol-99fbe5f2'></storage_volume>
- </storage_snapshot>
- <storage_snapshot href='http://localhost:3001/api/storage_snapshots/snap-d010f6b9' id='snap-d010f6b9'>
- <created>Mon Oct 20 18:23:59 UTC 2008</created>
- <storage_volume href='http://localhost:3001/api/storage_volumes/vol-351efb5c' id='vol-351efb5c'></storage_volume>
- </storage_snapshot>
- <storage_snapshot href='http://localhost:3001/api/storage_snapshots/snap-a310f6ca' id='snap-a310f6ca'>
- <created>Mon Oct 20 18:25:53 UTC 2008</created>
- <storage_volume href='http://localhost:3001/api/storage_volumes/vol-001efb69' id='vol-001efb69'></storage_volume>
- </storage_snapshot>
- (...)
-</storage_snapshots>
-</pre>
-
-<h4>Get the details for a storage snaphsot</h4>
-
-<p>
-To get all details for a specified storage snapshot, as shown below, use call <strong>GET /api/storage_snapshots/:id</strong>.
-</p>
-
-<p>Example request:</p>
-
-<pre>
-GET /api/storage_snapshots/snap-45b8d024?format=xml HTTP/1.1
-Authorization: Basic AU1J3UB2121Afd1DdyQWxLaTYTmJMNF4zTXBoRGdhMDh2RUw5ZDAN9zVXVa==
-User-Agent: curl/7.20.1 (i386-redhat-linux-gnu)
-Host: localhost:3001
-Accept: */*
-</pre>
-
-<p>Server response:</p>
-
-<pre>
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Date: Thu, 28 Jul 2011 22:08:36 GMT
-Content-Length: 329
-
-<?xml version='1.0' encoding='utf-8' ?>
-<storage_snapshot href='http://localhost:3001/api/storage_snapshots/snap-45b8d024' id='snap-45b8d024'>
- <created>Thu Jul 28 21:54:19 UTC 2011</created>
- <storage_volume href='http://localhost:3001/api/storage_volumes/vol-0bc0de60' id='vol-0bc0de60'></storage_volume>
-</storage_snapshot>
-</pre>
-
-<h4>Create a new storage snapshot</h4>
-
-<p>
-To create a new storage_snapshot use call <strong>POST /api/storage_snapshots</strong>. Clients must specify the storage_volume from which the snapshot is created by supplying the volume_id parameter. The Deltacloud server responds with <strong>HTTP 201 Created</strong> after a succesful operation and provides details of the new storage_snapshot. Clients may specify operation parameters as multipart/form-data, or as application/x-www-form-urlencoded data:
-</p>
-
-<p>Example request:</p>
-
-<pre>
-POST /api/storage_snapshots?format=xml HTTP/1.1
-Authorization: Basic AU1J3UB2121Afd1DdyQWxLaTYTmJMNF4zTXBoRGdhMDh2RUw5ZDAN9zVXVa==
-User-Agent: curl/7.20.1 (i386-redhat-linux-gnu)
-Host: localhost:3001
-Accept: */*
-Content-Length: 22
-Content-Type: application/x-www-form-urlencoded
-
-volume_id=vol-99fbe5f2
-</pre>
-
-<p>Server response:</p>
-
-<pre>
-HTTP/1.1 201 Created
-Date: Thu, 28 Jul 2011 21:46:48 GMT
-Content-Length: 329
-
-<?xml version='1.0' encoding='utf-8' ?>
-<storage_snapshot href='http://localhost:3001/api/storage_snapshots/snap-d5a1c9b4' id='snap-d5a1c9b4'>
- <created>Thu Jul 28 21:46:12 UTC 2011</created>
- <storage_volume href='http://localhost:3001/api/storage_volumes/vol-99fbe5f2' id='vol-99fbe5f2'></storage_volume>
-</storage_snapshot>
-</pre>
-
-<h4>Delete a storage snapshot</h4>
-
-<p>
-To delete the specified storage_snapshot use call <strong>DELETE /api/storage_snapshots/:id</strong>. The operation returns a <strong>HTTP 204 No Content</strong> after a succesful operation:
-</p>
-
-<p>Example request:</p>
-
-<pre>
-DELETE /api/storage_snapshots/snap-dda6cebc?format=xml HTTP/1.1
-Authorization: Basic AU1J3UB2121Afd1DdyQWxLaTYTmJMNF4zTXBoRGdhMDh2RUw5ZDAN9zVXVa==
-User-Agent: curl/7.20.1 (i386-redhat-linux-gnu)
-Host: localhost:3001
-Accept: */*
-</pre>
-
-<p>Server response:</p>
-
-<pre>
-HTTP/1.1 204 No Content
-Date: Thu, 28 Jul 2011 22:26:07 GMT
-</pre>
-
-<a class="btn btn-inverse btn-large" style="float: right" href="/blob-storage.html">Blob storage <i class="icon-arrow-right icon-white" style="vertical-align:baseline"> </i></a>
-
-<br/>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c7f4d022/site/output/#usage.md#
----------------------------------------------------------------------
diff --git a/site/output/#usage.md# b/site/output/#usage.md#
deleted file mode 100644
index 6921528..0000000
--- a/site/output/#usage.md#
+++ /dev/null
@@ -1,135 +0,0 @@
----
-site_name: Deltacloud API
-title: Usage
----
-<br/>
-
-<h2 id="usingapi">Using API</h2>
-
-<h3>Creating an instance</h3>
-
-<h3>Switching a driver</h3>
-
-<h2 id="clients">Clients</h2>
-Instead of dealing with HTTP interface you can use various clients to communicate with Deltacloud server.
-
-<h3>The Deltacloud Ruby client</h3>
-You need to install Ruby client seperately to the Deltacloud API server. Assuming you already have Ruby and RubyGems setup, you can install the Deltacloud client by simply typing:
-
-<pre>$ sudo gem install deltacloud-client</pre>
-
-<p>The Deltacloud client consists of a Ruby library (packaged as a ruby gem) which you can use to interact with the Deltacloud server and control your cloud infrastructure across cloud providers. <p>
-
-<p>To use the client, you must require <strong>deltacloud</strong>:</p>
-
-<pre>require 'deltacloud'</pre>
-
-<p>Connect to a Deltacloud provider using these commands:</p>
-
-<pre>
-require 'deltacloud'
-
-api_url = 'http://localhost:3001/api'
-api_name = 'mockuser'
-api_password = 'mockpassword'
-
-client = DeltaCloud.new( api_name, api_password, api_url )
-
-# work with client here
-</pre>
-
-<p>In addition to creating a client, operations may occur within a block included on the initialization.</p>
-
-<pre>
-DeltaCloud.new( api_name, api_password, api_url ) do |client|
- # work with client here
-end
-</pre>
-
-<p>In case of a failure, every underlying HTTP transport exceptions will be thrown away and returned back to the caller.</p>
-
-<a class="btn btn-inverse btn-large" style="float: right" href="/ruby-client.html">Work with the Ruby client</a>
-
-<br/>
-<br/>
-
-<h3>HTTP clients - cURL</h3>
-
-<p>
-Basically, you interact with the Deltacloud server via HTTP calls, so you can use any HTTP client to talk to Deltacloud using the <a href="/rest-api.html">REST API</a>.
-</p>
-
-<p>
-<a href="http://curl.haxx.se/">cURL</a> is a popular command line tool available on most modern linux distributions. See the following examples to learn how to use cURL to interact with Deltacloud. There is an assumption that the Deltacloud server is running on locahost:3001, and was started with the 'ec2' driver (i.e., deltacloudd -i ec2 ).
-</p>
-
-<p>
-Get a listing of all <strong>images</strong> available in the back-end cloud:
-</p>
-
-<pre>
-curl --user "pGbAJ1TsVg5PKs3BK27O:dPs47ralgBlldqYNbLg3scthsg4g8v0L9d6Mb5DK"
-"http://localhost:3001/api/images?format=xml"
-</pre>
-
-<p>
-The cURL <strong>--user</strong> option is used to specify the <strong>username:password</strong> credentials for access to the back-end cloud provider (Amazon EC2 in this case).</p>
-
-<p>Create a new <strong>instance</strong> from the image with id 'ami-f51aff9c', in realm 'us-east-1c', with the hardware profile 'c1.medium', in firewall 'default':
-</p>
-
-<pre>
-curl -X POST -F "keyname=eftah" -F "image_id=ami-f51aff9c"
--F "realm_id=us-east-1c" -F "hwp_id=c1.medium" -F "firewalls1=default"
---user "pGbAJ1TsVg5PKs3BK27O:dPs47ralgBlldqYNbLg3scthsg4g8v0L9d6Mb5DK"
-"http://localhost:3001/api/instances?format=xml"
-</pre>
-
-<p>Delete a <strong>firewall</strong> called 'develgroup':</p>
-
-<pre>
-curl -X DELETE
---user "pGbAJ1TsVg5PKs3BK27O:dPs47ralgBlldqYNbLg3scthsg4g8v0L9d6Mb5DK"
-http://localhost:3001/api/firewalls/develgroup?format=xml
-</pre>
-
-<p>
-Create a <strong>blob</strong> called 'my_new_blob' within the bucket 'mybucket' from a local file with <strong>HTTP PUT</strong> specifying its content type and setting some some metadata <strong>key:value</strong> pairs:
-</p>
-
-<pre>
-curl -H 'content-type: text/html' -H 'X-Deltacloud-Blobmeta-Name:mariosblob'
--H 'X-Deltacloud-Blobmeta-Version:2.1' --upload-file
-"/home/marios/Desktop/somefile.html"
---user "pGbAJ1TsVg5PKs3BK27O:dPs47ralgBlldqYNbLg3scthsg4g8v0L9d6Mb5DK"
-http://localhost:3001/api/buckets/mybucket/my_new_blob?format=xml
-</pre>
-
-<p>
-Retrieve <strong>blob metadata</strong> for the blob called 'my_new_blob':
-</p>
-
-<pre>
-curl -iv -X HEAD
---user "pGbAJ1TsVg5PKs3BK27O:dPs47ralgBlldqYNbLg3scthsg4g8v0L9d6Mb5DK"
-http://localhost:3001/api/buckets/mybucket/my_new_blob?format=xml
-</pre>
-
-<p>
-The <strong>'-iv'</strong> flags will ensure that cURL displays the request and response headers (blob metadata are reported in the response headers with an empty response body).
-</p>
-
-<h3>Libdeltacloud Client (C library)</h3>
-<p>
-Libdeltacloud is a C/C++ library for accessing the Deltacloud API. It exports convenient structures and functions for manipulating cloud objects through the deltacloud API.
-</p>
-
-Get the source code:
-<pre>
-$ git clone git://git.fedorahosted.org/deltacloud/libdeltacloud.git
-</pre>
-
-<p>
-<a href="http://deltacloud.apache.org/libdeltacloud/index.html">Full documentation</a> for the library contains the list of data structures, all documented files with brief descriptions and also the exapmles of working with libdeltacloud.
-</p>
-
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c7f4d022/site/output/#write-new-driver.md#
----------------------------------------------------------------------
diff --git a/site/output/#write-new-driver.md# b/site/output/#write-new-driver.md#
deleted file mode 100644
index 5d54cb3..0000000
--- a/site/output/#write-new-driver.md#
+++ /dev/null
@@ -1,140 +0,0 @@
----
-site_name: Deltacloud API
-title: Write New Provider Driver
----
-
-<br/>
-
-<h3>Writing a provider driver</h3>
-
-<p>The deltacloud drivers are stored in <strong>deltacloud/server/lib/deltacloud/drivers</strong></p> To ad a driver for hypotetical <strong>Foo</strong> cloud, add a directory into /drivers/ and then a file for a driver itself:
-
-<pre>deltacloud/server/lib/deltacloud/drivers/foo/foo_driver.rb</pre>
-
-<p>You need to define a class <strong>Deltacloud::Drivers::Foo::FooDriver</strong> to this file. The class must be a subclass of the <strong>Deltacloud::BaseDriver</strong>.
-</p>
-
-<p>Set up which <a href="/rest-api.html#">collections</a> the provider for you are writing the driver supports - e.g. images, instances, keys, buckets/blobs (storage), etc.:</p>
-
-<pre>
-def supported_collections
- DEFAULT_COLLECTIONS + [ :buckets ] - [ :storage_snapshots, :storage_volumes ]
-end
-</pre>
-
-<p>This declares that the driver supports the <strong>DEFAULT_COLLECTIONS</strong> (defined in <strong>deltacloud/server/lib/drivers.rb</strong>) except <a href="/rest-api.html#">storage_snapshots</a> and <a href="/rest-api.html#">storage_volumes</a> and also the <a href="/rest-api.html#">buckets</a> collection. A storage only cloud provider driver would support only the buckets colletion.</p>
-
-<p>
-Then, you can define the methods for each collection that your driver supports. The methods, as well as the routes to them, are defined in <strong>deltacloud/server/lib/deltacloud/server.rb</strong>. In general, you can look at the existing drivers to have the idea of how to implement any specific method.
-</p>
-
-<p>
-You should consider how the driver will be communicating with the cloud provider. Many of the existing drivers use external ruby gems for this purpose: for example, the <strong>ec2</strong> driver uses the <a href="https://github.com/appoxy/aws/">aws</a> gem, the <strong>rackspace</strong> driver uses the <a href="https://github.com/rackspace/ruby-cloudfiles">cloudfiles</a> and <a href="https://github.com/rackspace/ruby-cloudservers">cloudservers</a> gems. However, other drivers implement their own clients to communicate with the cloud provider, such as the IBM SBC driver and the Gogrid driver. This also explains why, under the <strong>/drivers</strong> directory, some drivers contain only the provider <strong>_driver.rb</strong> file, whilst others also define a <strong>provider_client.rb</strong> file. It is entirely up to you, whether you write your own client or use an existing one.
-</p>
-
-<p>Thus, your driver for the cloud provider foo may look like:</p>
-
-<pre>
-require 'deltacloud/base_driver'
-require 'foo_lib' # a library for talking to the foo cloud
-
-module Deltacloud
- module Drivers
- module Foo
-
-class FooDriver < Deltacloud::BaseDriver
-
- def supported_collections
- DEFAULT_COLLECTIONS + [ :buckets ]
- end
-
- def images(credentials, opts={})
- client = new_foo_client(credentials)
- # use client to get a list of images from the back-end cloud and then create
- # a Deltacloud Image object for each of these. Filter the result
- # (eg specific image requested) and return to user
- end
-
- def realms(credentials, opts={})
- (...)
- end
-
- def instances(credentials, opts={})
- (...)
- end
-
- ... ETC
-
- private
-
- def new_foo_client(credentials)
- client = FooLib::Service.new({:user => credentials.user,
- :pass => credentials.password })
- end
-
-end
- end
- end
- end
-</pre>
-
-<p>
-An important method for drivers that implement the <a href="/rest-api.html#">instances</a> collection is <strong>instance_states</strong>. This method represents the finite-state-machine for instances which varies across cloud providers. In some clouds an instance may be in the 'running' state after creation, whereas in other clouds an instance may need to be started explicitly. For example:
-</p>
-
-<pre>
-define_instance_states do
- start.to( :pending ) .on( :create )
- pending.to( :running ) .automatically
- running.to( :running ) .on( :reboot )
- running.to( :shutting_down ) .on( :stop )
- shutting_down.to( :stopped ) .automatically
- stopped.to( :finish ) .automatically
-end
-</pre>
-
-<p>
-The definiton of .to and on. etc is defined in <strong>/deltacloud/server/lib/deltacloud/state_machine.rb</strong>.
-</p>
-
-<p>Valid states are:</p>
-
-<ul>
- <li><strong>:begin</strong></li>
- <li><strong>:pending</strong></li>
- <li><strong>:running</strong></li>
- <li><strong>:shutting_down</strong></li>
- <li><strong>:stopped</strong></li>
- <li><strong>:end</strong></li>
-</ul>
-
-<p>The instance is located in the<strong>:begin</strong> state before being created. Immediately after being destroyed the instance is removed to the <strong>:end</strong> state.</p>
-
-<p>Valid transition actions are:</p>
-
-<ul>
- <li><strong>:stop</strong></li>
- <li><strong>:start</strong></li>
- <li><strong>:reboot</strong></li>
-</ul>
-
-<p>The action <strong>:automatically</strong> may be used to indicate a tranisition that may occur without an action being triggered (see the example above).</p>
-
-<p>You can implement some other methods according to the collections you will be supporting:</p>
-
-<ul>
- <li><strong>hardware_profiles(credentials, opts=nil)</strong></li>
- <li><strong>images(credentials, opts=nil)</strong></li>
- <li><strong>realms(credentials, opts=nil)</strong></li>
- <li><strong>instances(credentials, opts=nil)</strong></li>
- <li><strong>create_instance(credentials, image_id, opts)</strong></li>
- <li><strong>reboot_instance(credentials, id)</strong></li>
- <li><strong>stop_instance(credentials, id)</strong></li>
- <li><strong>destroy_instance(credentials, id)</strong></li>
-</ul>
-
-<p>
-The <strong>hardware_profiles(...)</strong> method should return an array of HardwareProfile objects. The <strong>opts</strong> hash, if present, must be inspected for <strong>:id</strong> and <strong>:architecture</strong> keys. If these keys are present, the results should be filtered by the value associated with each key. The <strong>filter_on(...)</strong> helper method is used for this filtering and as you can see from existing driver method definitions, is invoked in many of the driver collection methods:
-</p>
-
-
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c7f4d022/site/output/#writing-tests.md#
----------------------------------------------------------------------
diff --git a/site/output/#writing-tests.md# b/site/output/#writing-tests.md#
deleted file mode 100644
index fe79d5c..0000000
--- a/site/output/#writing-tests.md#
+++ /dev/null
@@ -1,57 +0,0 @@
----
-site_name: Deltacloud API
-title: Writing and running tests
----
-
-<br/>
-
-<h3 id="test">Writing and running tests</h3>
-
-<p>
-You should add a test to every new feature or new driver you create to make sure, that everything is running as expected. There are two different directories in the Deltacloud project, where the tests are stored: <strong>/deltacloud/server/tests</strong> for Unit tests for drivers and <strong>/deltacloud/tests</strong> for Cucumber tests.
-</p>
-
-<p>Initiate the Unit tests:</p>
-
-<pre>
-$ cd /path/to/deltacloud/server
-$ rake test
-</pre>
-
-<p>This will invoke all Unit tests defined in <strong>/deltacloud/server/tests</strong> by inspecting the Rakefile in <strong>/deltacloud/server</strong>. To invoke a specific driver tests type:</p>
-
-<pre>
-$ cd /path/to/deltacloud/server
-$ rake test:rackspace
- _OR_
-$ rake test:mock
- _etc_
-</pre>
-
-<p>Initiate the Cucumber tests:</p>
-
-<pre>
-$ cd /path/to/deltacloud/server
-$ rake cucumber
-</pre>
-
-<p>Alternatively, you can invoke the cucumber tests directly without using Rakefile: </p>
-
-<pre>
-$ cd /path/to/deltacloud/server
-$ cucumber ../tests/mock
- _OR_
-$ cucumber ../tests/ec2
- _etc_
-</pre>
-
-<div class="btn-group">
- <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
- <i class="icon-arrow-left icon-white"></i> Back
- <span class="caret"></span>
- </a>
-<ul class="dropdown-menu">
- <li><a href="/send-patch.html">Send a patch</a></li>
- <li><a href="/write"></a></li>
-</ul>
-</div>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c7f4d022/site/output/about.html
----------------------------------------------------------------------
diff --git a/site/output/about.html b/site/output/about.html
index b0327fa..649a5d3 100644
--- a/site/output/about.html
+++ b/site/output/about.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -99,11 +99,8 @@
<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>
@@ -112,33 +109,21 @@
<p>All of this means you can start an instance on an internal cloud and with the same code start another on EC2 or RHEV-M.</p>
</div>
-<br>
-
-<div class="span8">
+<br><div class="span8">
<img src="assets/img/diagram-soa.png" alt="Deltacloud API SOA diagram" align="center">
</div>
<div class="span12">
-<br>
-<br>
-<h3>How does Deltacloud work?</h3>
-<br>
-<p>Deltacloud contains a cloud abstraction API - whether the <a href="rest-api.html">Deltacloud</a> classic API, the DMTF <a href="cimi-rest.html">CIMI API</a> or even the EC2 API. The API works as a wrapper around a large number of clouds, abstracting their differences. For every cloud <a href="supported-providers.html" rel="tooltip" title="currently supported providers">provider</a> there is a driver "speaking" that cloud provider's native API, freeing you from dealing with the particulars of each cloud's API.</p>
+<br><br><h3>How does Deltacloud work?</h3>
+<br><p>Deltacloud contains a cloud abstraction API - whether the <a href="rest-api.html">Deltacloud</a> classic API, the DMTF <a href="cimi-rest.html">CIMI API</a> or even the EC2 API. The API works as a wrapper around a large number of clouds, abstracting their differences. For every cloud <a href="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/c7f4d022/site/output/addresses.html
----------------------------------------------------------------------
diff --git a/site/output/addresses.html b/site/output/addresses.html
index 4bc37fa..8ff7cf5 100644
--- a/site/output/addresses.html
+++ b/site/output/addresses.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -110,43 +110,35 @@ 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>
@@ -156,10 +148,9 @@ 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">
@@ -373,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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c7f4d022/site/output/api-docs.html
----------------------------------------------------------------------
diff --git a/site/output/api-docs.html b/site/output/api-docs.html
index ca30878..c3a7d3d 100644
--- a/site/output/api-docs.html
+++ b/site/output/api-docs.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -97,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'>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c7f4d022/site/output/api-entry-point.html
----------------------------------------------------------------------
diff --git a/site/output/api-entry-point.html b/site/output/api-entry-point.html
index 3ea3919..64c014c 100644
--- a/site/output/api-entry-point.html
+++ b/site/output/api-entry-point.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -112,24 +112,22 @@ 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">
@@ -141,9 +139,7 @@ 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
@@ -231,95 +227,90 @@ 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/c7f4d022/site/output/blob-storage.html
----------------------------------------------------------------------
diff --git a/site/output/blob-storage.html b/site/output/blob-storage.html
index b2c6d9a..284e64c 100644
--- a/site/output/blob-storage.html
+++ b/site/output/blob-storage.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -111,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>
@@ -124,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>
@@ -132,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>
@@ -163,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">
@@ -592,7 +586,6 @@ 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/c7f4d022/site/output/cimi-curl.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-curl.html b/site/output/cimi-curl.html
index 4973a65..7c961ce 100644
--- a/site/output/cimi-curl.html
+++ b/site/output/cimi-curl.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -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,8 +119,7 @@
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>
@@ -133,21 +132,19 @@ 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>
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c7f4d022/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 1ee18f9..2b5c02b 100644
--- a/site/output/cimi-curl/cimi-curl-machines.html
+++ b/site/output/cimi-curl/cimi-curl-machines.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -104,31 +104,28 @@
<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>
@@ -137,7 +134,6 @@
<div class="tab-pane active" id="machines">
<hr>
-
<h4 id="machines">Working with Machines</h4>
<p>Retrieve the Machine Collection in json format:</p>
@@ -166,10 +162,7 @@ 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">
@@ -199,10 +192,7 @@ 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">
@@ -270,7 +260,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>
@@ -288,7 +278,6 @@ 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/c7f4d022/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 a7bab0b..f1e1389 100644
--- a/site/output/cimi-curl/cimi-curl-resource_metadata.html
+++ b/site/output/cimi-curl/cimi-curl-resource_metadata.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -108,18 +108,17 @@
<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>
@@ -135,8 +134,6 @@
<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/c7f4d022/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 a002ca2..0d76746 100644
--- a/site/output/cimi-curl/cimi-curl-volumes.html
+++ b/site/output/cimi-curl/cimi-curl-volumes.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -104,30 +104,27 @@
<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>
@@ -136,8 +133,7 @@
<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>
@@ -177,8 +173,7 @@
<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>
@@ -207,8 +202,7 @@
<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>
@@ -237,8 +231,7 @@
<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>
@@ -263,7 +256,6 @@
</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/c7f4d022/site/output/cimi-rest.html
----------------------------------------------------------------------
diff --git a/site/output/cimi-rest.html b/site/output/cimi-rest.html
index 3ffa7ae..18fc143 100644
--- a/site/output/cimi-rest.html
+++ b/site/output/cimi-rest.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -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,15 +131,14 @@ 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>
@@ -150,13 +149,10 @@ 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
@@ -173,7 +169,6 @@ 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/c7f4d022/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 16ad207..86fdea6 100644
--- a/site/output/cimi-rest/cimi-rest-collections.html
+++ b/site/output/cimi-rest/cimi-rest-collections.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -109,11 +109,7 @@ 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.
@@ -126,7 +122,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>
@@ -137,48 +133,39 @@ 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
@@ -457,10 +444,8 @@ 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>
@@ -506,10 +491,8 @@ 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>
@@ -545,7 +528,6 @@ 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/c7f4d022/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 26d6ae7..436c43f 100644
--- a/site/output/cimi-rest/cimi-rest-entry-point.html
+++ b/site/output/cimi-rest/cimi-rest-entry-point.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -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,15 +127,14 @@ 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>
@@ -193,7 +192,6 @@ 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/c7f4d022/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 e95af05..de832a8 100644
--- a/site/output/cimi-rest/cimi-rest-machine-configs.html
+++ b/site/output/cimi-rest/cimi-rest-machine-configs.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -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,36 +127,30 @@ 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>
@@ -271,7 +265,6 @@ 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/c7f4d022/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 743ffa5..f6256a5 100644
--- a/site/output/cimi-rest/cimi-rest-machine-images.html
+++ b/site/output/cimi-rest/cimi-rest-machine-images.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -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,37 +124,31 @@ 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>
@@ -314,9 +308,7 @@ Server: thin 1.5.0 codename Knife
</MachineImage>
</pre>
-<br>
-<hr>
-
+<br><hr>
<h4>Delete a Machine Image</h4>
<p>Example request:</p>
@@ -347,7 +339,6 @@ 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/c7f4d022/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 cb0a26d..e16fc85 100644
--- a/site/output/cimi-rest/cimi-rest-machine-templates.html
+++ b/site/output/cimi-rest/cimi-rest-machine-templates.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -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,38 +137,32 @@ 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>
@@ -335,7 +329,6 @@ 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/c7f4d022/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 7046663..0490e2a 100644
--- a/site/output/cimi-rest/cimi-rest-resource-metadata.html
+++ b/site/output/cimi-rest/cimi-rest-resource-metadata.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -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,28 +140,25 @@ 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>
@@ -237,8 +234,7 @@ 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
@@ -256,12 +252,9 @@ 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>
@@ -270,18 +263,17 @@ 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>
@@ -289,8 +281,8 @@ supported by the Provider.
supported by the Provider.
</td>
</tr>
- <tr>
- <td>CloudEntryPoint
+<tr>
+<td>CloudEntryPoint
</td>
<td>firstParameter
</td>
@@ -299,8 +291,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>
@@ -308,8 +300,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>
@@ -317,8 +309,8 @@ supported by the Provider.
Component Templates by-value in SystemTemplates.
</td>
</tr>
- <tr>
- <td>Machine
+<tr>
+<td>Machine
</td>
<td>DefaultInitialState
</td>
@@ -326,8 +318,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>
@@ -336,8 +328,8 @@ Consumer may choose from when creating a new
Machine.
</td>
</tr>
- <tr>
- <td>Machine
+<tr>
+<td>Machine
</td>
<td>MachineConfigByValue
</td>
@@ -347,8 +339,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>
@@ -358,8 +350,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>
@@ -369,8 +361,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>
@@ -380,8 +372,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>
@@ -389,8 +381,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>
@@ -401,8 +393,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>
@@ -411,8 +403,8 @@ from Machine Images that are not SNAPSHOT Machine
Images.
</td>
</tr>
- <tr>
- <td>Machine
+<tr>
+<td>Machine
</td>
<td>UserData
</td>
@@ -420,8 +412,8 @@ Images.
See 5.14.1 for more information.
</td>
</tr>
- <tr>
- <td>Credential
+<tr>
+<td>Credential
</td>
<td>CredentialTemplateByValue
</td>
@@ -430,8 +422,8 @@ Credential Templates by-value in Credential create
operations.
</td>
</tr>
- <tr>
- <td>Volume
+<tr>
+<td>Volume
</td>
<td>SharedVolumeSupport
</td>
@@ -440,8 +432,8 @@ volume resources across Machines. The value specified
is of type "boolean."
</td>
</tr>
- <tr>
- <td>Volume
+<tr>
+<td>Volume
</td>
<td>VolumeConfigByValue
</td>
@@ -451,8 +443,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>
@@ -462,8 +454,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>
@@ -471,8 +463,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>
@@ -480,8 +472,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>
@@ -490,8 +482,8 @@ Configurations by-value in the Network create
operation.
</td>
</tr>
- <tr>
- <td>Network
+<tr>
+<td>Network
</td>
<td>NetworkTemplateByValue
</td>
@@ -499,8 +491,8 @@ operation.
Templates by-value in the Network create operation.
</td>
</tr>
- <tr>
- <td>NetworkPort
+<tr>
+<td>NetworkPort
</td>
<td>NetworkPortConfigByValue
</td>
@@ -509,8 +501,8 @@ NetworkPort Configurations by-value in the NetworkPort
create operation.
</td>
</tr>
- <tr>
- <td>NetworkPort
+<tr>
+<td>NetworkPort
</td>
<td>NetworkPortTemplateByValue
</td>
@@ -519,8 +511,8 @@ NetworkPort Templates by-value in the NetworkPort
create operation.
</td>
</tr>
- <tr>
- <td>ForwardingGroup
+<tr>
+<td>ForwardingGroup
</td>
<td>MixedNetwork
</td>
@@ -528,8 +520,8 @@ create operation.
private and public connection at the same time.
</td>
</tr>
- <tr>
- <td>Job
+<tr>
+<td>Job
</td>
<td>JobRetention
</td>
@@ -541,8 +533,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>
@@ -551,8 +543,8 @@ MeterConfigurations by-value in the Meter create
operation.
</td>
</tr>
- <tr>
- <td>Meter
+<tr>
+<td>Meter
</td>
<td>MeterTemplateByValue
</td>
@@ -560,8 +552,8 @@ operation.
Templates by-value in the Meter create operation.
</td>
</tr>
- <tr>
- <td>EventLog
+<tr>
+<td>EventLog
</td>
<td>Linked
</td>
@@ -570,12 +562,10 @@ 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/c7f4d022/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 895b0ab..14cd456 100644
--- a/site/output/cimi-rest/cimi-rest-volume-configs.html
+++ b/site/output/cimi-rest/cimi-rest-volume-configs.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -106,8 +106,7 @@
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>
@@ -118,7 +117,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>
@@ -129,38 +128,32 @@ 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">
@@ -338,7 +331,6 @@ 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/c7f4d022/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 cca9862..7bcb190 100644
--- a/site/output/cimi-rest/cimi-rest-volume-images.html
+++ b/site/output/cimi-rest/cimi-rest-volume-images.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -104,8 +104,7 @@
<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>
@@ -116,7 +115,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>
@@ -127,38 +126,32 @@ 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">
@@ -347,7 +340,6 @@ 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/c7f4d022/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 3bd3a11..85fef9c 100644
--- a/site/output/cimi-rest/cimi-rest-volume-templates.html
+++ b/site/output/cimi-rest/cimi-rest-volume-templates.html
@@ -44,7 +44,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/about.html">What is Deltacloud?</a></li>
- <li><a href="/supported-providers.html">Supported Providers</a></li>
+ <li><a href="/drivers.html#drivers">Supported Providers</a></li>
</ul>
</li>
<li><a href="/download.html">Download</a></li>
@@ -105,8 +105,7 @@
<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>
@@ -118,7 +117,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>
@@ -129,39 +128,33 @@ 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">
@@ -335,7 +328,6 @@ 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'>