deltacloud-core 0.4.0 → 0.4.1

data/support/fedora/deltacloud-core-config

@@ -1,26 +1,28 @@
-# Deltacloud API configuration 
+# Deltacloud API configuration
 # http://deltacloud.org
 
-# Default port where Deltacloud API will listen on (3002)
-# You should be able to access Deltacloud API on http://localhost:PORT/api
+# Environment under which to run deltacloud-core (default: production)
+#API_ENV="production"
 
-PORT=3002
+# Default driver to be used (mock).
+# NOTE: Some drivers require some additional gems to be installed.
+# Please refer to http://deltacloud.org to see what gems are needed for specific
+# drivers
+#DRIVER="mock"
 
-# Bind to HOST address (default: localhost)
-# You can use both IP address or hostname
+# Port where deltacloud core will listen (default: localhost)
+# You should be able to access Deltacloud API on http://localhost:PORT/api
+#PORT="3002"
 
-HOST=localhost
+# Bind to HOST address (default: localhost)
+# You can use both IP address or hostname; use 0.0.0.0 to bind to all addresses
+#HOST="localhost"
 
-# Default driver to be used (EC2).
-# NOTE: Some drivers require some additional gems to be installed.
-# Please reffer to http://deltacloud.org to see what gems are needed for specific
-# drivers
+# Default user that deltacloud core will be run under (default: nobody)
+#DELTACLOUD_USER="nobody"
 
-DRIVER="ec2"
+# Default log file for deltacloud-core (default: /var/log/deltacloud-core/$DRIVER.log)
+#LOGFILE="/var/log/deltacloud-core/$DRIVER.log"
 
-# Default log file for Deltacloud API
-# LOGFILE="/var/log/deltacloud-core/ec2.log"
-#
-# Default user under Deltacloud API will be run (default: nobody)
-#
-# DELTACLOUD_USER="nobody"
+# Default lock file for deltacloud-core (default: /var/lock/subsys/deltacloud-core)
+#LOCKFILE="/var/lock/subsys/deltacloud-core"

data/support/fedora/{deltacloud-core → deltacloud-core.init}

@@ -26,28 +26,25 @@ prog="deltacloud-core"
 [ ! -d /var/log/$prog ] && mkdir -p /var/log/$prog
 
 # You can overide these variables using /etc/sysconfig/deltacloud-core
-#
-# ENV=production|development
-# DRIVER=ec2|mock|gogrid
-#
-#
-API_ENV="${ENV:-production}"
-DRIVER="${DRIVER:-ec2}"
+API_ENV="${API_ENV:-production}"
+DRIVER="${DRIVER:-mock}"
 PORT="${PORT:-3002}"
+HOST="${HOST:-localhost}"
+DELTACLOUD_USER="${DELTACLOUD_USER:-nobody}"
 LOGFILE="${LOGFILE:-/var/log/$prog/$DRIVER.log}"
-lockfile="${LOCKFILE:-/var/lock/subsys/$prog }"
+LOCKFILE="${LOCKFILE:-/var/lock/subsys/$prog}"
 
 [ -r $LOGFILE ] && chown nobody $LOGFILE
-[ -r $lockfile ] && chown nobody $lockfile
+[ -r $LOCKFILE ] && chown nobody $LOCKFILE
 
 start() {
     [ -x $exec ] || exit 5
 
     echo -n $"Starting $prog: "
-    daemon --user nobody $exec -i $DRIVER -e $API_ENV --port $PORT >> $LOGFILE 2>&1 &
+    daemon --user "$DELTACLOUD_USER" "$exec -i $DRIVER -e $API_ENV --port $PORT -r $HOST >> $LOGFILE 2>&1 &"
     retval=$?
 
-    if [ $retval -eq 0 ] && touch $lockfile ; then
+    if [ $retval -eq 0 ] && touch $LOCKFILE ; then
       echo_success
       echo
     else
@@ -61,7 +58,7 @@ stop() {
     echo -n $"Shutting down $prog: "
     killproc deltacloudd
     retval=$?
-    if [ $retval -eq 0 ] && rm -f $lockfile ; then
+    if [ $retval -eq 0 ] && rm -f $LOCKFILE ; then
       echo_success
       echo
     else
@@ -88,7 +85,7 @@ case "$1" in
       restart
       ;;
     status)
-      status $PROG
+      status -p $PIDFILE $prog
       retval=$?
       ;;
     *)
@@ -97,4 +94,4 @@ case "$1" in
   ;;
 esac
 
-exit $?
+exit $retval

data/support/fedora/deltacloud-core.spec

@@ -1,19 +1,16 @@
 %global app_root %{_datadir}/%{name}
-%%global alphatag git
 
 Summary: Deltacloud REST API
 Name: deltacloud-core
 Version: 0.4.0
-Release: 0.1.%{alphatag}
+Release: 4%{?dist}
 Group: Development/Languages
 License: ASL 2.0 and MIT
 URL: http://incubator.apache.org/deltacloud
 Source0: http://gems.rubyforge.org/gems/%{name}-%{version}.gem
 Source1: deltacloudd-fedora
-Source2: deltacloud-core
+Source2: deltacloud-core.init
 Source3: deltacloud-core-config
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: ruby(abi) = 1.8
 Requires: rubygem(haml)
@@ -61,27 +58,45 @@ Documentation for %{name}
 %package all
 Summary: Deltacloud Core with all drivers
 Requires: %{name} = %{version}-%{release}
-Requires: deltacloud-core-ec2
-Requires: deltacloud-core-rackspace
-Requires: deltacloud-core-gogrid
-Requires: deltacloud-core-rimuhosting
-Requires: deltacloud-core-rhevm
-Requires: deltacloud-core-sbc
+#Requires: %{name}-azure = %{version}-%{release}
+Requires: %{name}-condor = %{version}-%{release}
+Requires: %{name}-ec2 = %{version}-%{release}
+Requires: %{name}-eucalyptus = %{version}-%{release}
+Requires: %{name}-gogrid = %{version}-%{release}
+Requires: %{name}-opennebula = %{version}-%{release}
+Requires: %{name}-rackspace = %{version}-%{release}
+Requires: %{name}-rimuhosting = %{version}-%{release}
+Requires: %{name}-rhevm = %{version}-%{release}
+Requires: %{name}-sbc = %{version}-%{release}
+Requires: %{name}-terremark = %{version}-%{release}
+Requires: %{name}-vsphere = %{version}-%{release}
 
 %description all
 Deltacloud core with all available drivers
 
 # FIXME: Azure requires waz-blobs gem which is not yet included in Fedora repos
 #
-#%package azure
+#% package azure
 #Summary: Deltacloud Core for Azure
 #Requires: %{name} = %{version}-%{release}
 #Requires: rubygem(waz-blobs)
 
-#%description azure
+#% description azure
 #The azure sub-package brings in all dependencies necessary to use deltacloud
 #core to connect to Azure.
 
+%package condor
+Summary: Deltacloud Core for CondorCloud
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(uuidtools)
+Requires: rubygem(rest-client)
+Requires: condor >= 7.4.0
+Requires: condor-vm-gahp >= 7.4.0
+
+%description condor
+The condor sub-package brings in all dependencies necessary to use deltacloud core
+to connect to CondorCloud.
+
 %package ec2
 Summary: Deltacloud Core for EC2
 Requires: %{name} = %{version}-%{release}
@@ -135,15 +150,6 @@ Requires: rubygem(rest-client)
 The rhevm sub-package brings in all dependencies necessary to use deltacloud
 core to connect to RHEV-M.
 
-%package vsphere
-Summary: Deltacloud Core for vSphere
-Requires: %{name} = %{version}-%{release}
-Requires: rubygem(rbvmomi)
-
-%description vsphere
-The vsphere sub-package brings in all dependencies necessary to use deltacloud
-core to connect to VMware vSphere.
-
 %package rimuhosting
 Summary: Deltacloud Core for Rimuhosting
 Requires: %{name} = %{version}-%{release}
@@ -160,19 +166,6 @@ Requires: %{name} = %{version}-%{release}
 The sbc sub-package brings in all dependencies necessary to use deltacloud core
 to connect to SBC.
 
-%package condor
-Summary: Deltacloud Core for CondorCloud
-Requires: %{name} = %{version}-%{release}
-Requires: rubygem(uuid)
-Requires: rubygem(rest-client)
-Requires: condor >= 7.4.0
-# FIXME: condor-vm-gaph is not yet included in Fedora
-# Requires: condor-vm-gaph >= 7.4.0
-
-%description condor
-The condor sub-package brings in all dependencies necessary to use deltacloud core
-to connect to CondorCloud.
-
 %package terremark
 Summary: Deltacloud Core for Terremark
 Requires: %{name} = %{version}-%{release}
@@ -183,6 +176,15 @@ Requires: rubygem(excon)
 The terremark sub-package brings in all dependencies necessary to use deltacloud
 core to connect to Terremark.
 
+%package vsphere
+Summary: Deltacloud Core for vSphere
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(rbvmomi)
+
+%description vsphere
+The vsphere sub-package brings in all dependencies necessary to use deltacloud
+core to connect to VMware vSphere.
+
 %prep
 %setup -q -c -T
 gem unpack -V --target=%{_builddir} %{SOURCE0}
@@ -205,20 +207,21 @@ find %{buildroot}%{app_root}/lib -type f | xargs chmod -x
 chmod -x %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 chmod 0755 %{buildroot}%{_initddir}/%{name}
 chmod 0755 %{buildroot}%{app_root}/bin/deltacloudd
-# Temporary remove Azure drivers until all dependencies will be pushed in to Fedora
+
+# temporarily remove Azure drivers until all dependencies will be pushed in to Fedora
 rm -rf %{buildroot}%{app_root}/config/drivers/azure.yaml
-rm -rf %{buildroot}%{app_root}/support/fedora
+
 rdoc --op %{buildroot}%{_defaultdocdir}/%{name}
 
-%install condor
-install -m 0655 %{buildroot}%{app_root}/support/condor/config/condor-cloud \
-  %{buildroot}%{_sysconfdir}/sysconfig/condor-cloud
-install -m 0655 %{buildroot}%{app_root}/support/condor/config/50* \
-  %{buildroot}%{_sysconfdir}/condor/config.d
-install -m 0755 %{buildroot}%{app_root}/support/condor/bash/* \
-  %{buildroot}%{_libexecdir}/condor
+mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
+
+# the condor stuff is provided by the condor-cloud package; it really doesn't
+# belong in deltacloud, but until it is removed from upstream we just manually
+# delete it here
 rm -rf %{buildroot}%{app_root}/support/condor
 
+rm -rf %{buildroot}%{app_root}/support/fedora
+
 %check
 pushd %{buildroot}%{app_root}
 rake mock:fixtures:clean
@@ -243,7 +246,6 @@ if [ "$1" -ge "1" ] ; then
 fi
 
 %files
-%defattr(-, root, root, -)
 %{_initddir}/%{name}
 %{_bindir}/deltacloudd
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -264,73 +266,52 @@ fi
 %doc %{app_root}/LICENSE
 # MIT
 %{app_root}/public/javascripts
+%dir %attr(0755, nobody, nobody) %{_localstatedir}/log/%{name}
 
 %files doc
-%defattr(-, root, root, -)
 %{_defaultdocdir}/%{name}
 %{app_root}/tests
 %{app_root}/%{name}.gemspec
 %{app_root}/Rakefile
 
+%files all
+
 #%files azure
-#%defattr(-, root, root, -)
+
+%files condor
+%{app_root}/config/drivers/condor.yaml
+%{app_root}/config/condor.yaml
+%{app_root}/config/addresses.xml
 
 %files ec2
-%defattr(-, root, root, -)
 %{app_root}/config/drivers/ec2.yaml
 
 %files eucalyptus
-%defattr(-, root, root, -)
 %{app_root}/config/drivers/eucalyptus.yaml
 
 %files gogrid
-%defattr(-, root, root, -)
 %{app_root}/config/drivers/gogrid.yaml
 
 %files opennebula
-%defattr(-, root, root, -)
 %{app_root}/config/drivers/opennebula.yaml
 
 %files rackspace
-%defattr(-, root, root, -)
 %{app_root}/config/drivers/rackspace.yaml
 
 %files rhevm
-%defattr(-, root, root, -)
 %{app_root}/config/drivers/rhevm.yaml
 
 %files rimuhosting
-%defattr(-, root, root, -)
 %{app_root}/config/drivers/rimuhosting.yaml
 
 %files sbc
-%defattr(-, root, root, -)
 %{app_root}/config/drivers/sbc.yaml
 
-%files vsphere
-%defattr(-, root, root, -)
-%{app_root}/config/drivers/vsphere.yaml
-
 %files terremark
-%defattr(-, root, root, -)
 %{app_root}/config/drivers/terremark.yaml
 
-%files condor
-%defattr(-, root, root, -)
-%{app_root}/config/drivers/condor.yaml
-%{app_root}/config/condor.yaml
-%{app_root}/config/addresses.xml
-%%config(noreplace) %{_sysconfdir}/sysconfig/condor-cloud
-%%config(noreplace) %{_sysconfdir}/condor/config.d/50condor_cloud.config
-%%config(noreplace) %{_sysconfdir}/condor/config.d/50condor_cloud_node.config
-%{_libexecdir}/condor/cached_images.sh
-%{_libexecdir}/condor/cloud_exit_hook.sh
-%{_libexecdir}/condor/cloud_functions
-%{_libexecdir}/condor/cloud_prepare_hook.sh
-%{_libexecdir}/condor/libvirt_cloud_script.sh
-
-%files all
-%defattr(-, root, root, -)
+%files vsphere
+%{app_root}/config/drivers/vsphere.yaml
 
 %changelog
 * Mon Jul 26 2011 Michal Fojtik <mfojtik@redhat.com> - 0.4.0-0.1.git

data/tests/rabbit_test.rb

@@ -17,7 +17,7 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
 require 'tests/common'
 
-require 'drivers'
+require 'deltacloud/drivers'
 require 'deltacloud/drivers/mock/mock_driver'
 
 module DeltacloudUnitTest

data/views/instances/new.html.haml

@@ -2,12 +2,13 @@
 =subheader @image.description
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
-  %form{ :action => instances_url, :method => :post, :class => :new_instance }
+  %form{ :action => instances_url, :method => :post, :class => :new_instance, :'data-ajax' => 'false'}
     %input{ :name => :image_id, :type => :hidden, :value => @instance.image_id }/
 
-    %div{ 'data-role' => :fieldcontain }
-      %label{ :for => :name} Instance name:
-      %input{ :type => :text, :id => :name, :name => :name, :value => '' }
+    - if driver_has_feature?(:user_name)
+      %div{ 'data-role' => :fieldcontain }
+        %label{ :for => :name} Instance name:
+        %input{ :type => :text, :id => :name, :name => :name, :value => '' }
 
     %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
       %h3 Additional parameters

data/views/storage_volumes/show.html.haml

@@ -20,13 +20,16 @@
       %p{ :'data-role' => 'fieldcontain'}=@storage_volume.state
     %li{ :'data-role' => 'list-divider'} Attached to
     %li
-      %a{ :href => instance_url( @storage_volume.instance_id) + ' - ' + @storage_volume.device.to_s}
-        =@storage_volume.instance_id || 'unknown'
+      %a{ :href => instance_url( @storage_volume.instance_id)}
+        = @storage_volume.instance_id || 'unknown'
+    %li{ :'data-role' => 'list-divider'} Device
+    %li
+      %p{ :'data-role' => 'fieldcontain'}= @storage_volume.device
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
         - if ["AVAILABLE", "IN-USE"].include?(@storage_volume.state)
-          =link_to_action "Snaphot", api_url_for("storage_snapshots/new?volume_id=#{@storage_volume.id}"), :get
+          =link_to_action "Snapshot", api_url_for("storage_snapshots/new?volume_id=#{@storage_volume.id}"), :get
           - unless @storage_volume.instance_id
             =link_to_action "Delete", destroy_storage_volume_url(@storage_volume.id), :delete
             =link_to_action "Attach", api_url_for("storage_volumes/attach?id=#{@storage_volume.id}"), :get

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-core
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2011-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -160,85 +160,123 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: compass
+  name: aws
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
-        - 0
-        - 8
-        - 17
-        version: 0.8.17
-  type: :development
+        - 2
+        - 5
+        - 4
+        version: 2.5.4
+  type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: waz-storage
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 19
         segments: 
         - 1
-        - 4
         - 1
-        version: 1.4.1
-  type: :development
+        - 0
+        version: 1.1.0
+  type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: cloudservers
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 0
-        - 5
-        - 3
-        version: 0.5.3
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: cloudfiles
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
         - 0
-        - 6
-        - 3
-        version: 0.6.3
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: fog
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 3
         segments: 
         - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: excon
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 1
+        - 1
+        version: 2.1.1
+  type: :runtime
+  version_requirements: *id017
 description: "    The Deltacloud API is built as a service-based REST API.\n    You do not directly link a Deltacloud library into your program to use it.\n    Instead, a client speaks the Deltacloud API over HTTP to a server\n    which implements the REST interface.\n"
 email: deltacloud-users@lists.fedorahosted.org
 executables: 
@@ -254,285 +292,287 @@ files:
 - deltacloud-core.gemspec
 - config.ru
 - server.rb
-- deltacloud.rb
 - config/drivers/rhevm.yaml
-- config/drivers/rackspace.yaml
 - config/drivers/sbc.yaml
-- config/drivers/azure.yaml
-- config/drivers/condor.yaml
-- config/drivers/vsphere.yaml
-- config/drivers/rimuhosting.yaml
-- config/drivers/ec2.yaml
 - config/drivers/mock.yaml
+- config/drivers/condor.yaml
+- config/drivers/terremark.yaml
 - config/drivers/gogrid.yaml
-- config/drivers/opennebula.yaml
+- config/drivers/ec2.yaml
 - config/drivers/eucalyptus.yaml
-- config/drivers/terremark.yaml
+- config/drivers/opennebula.yaml
+- config/drivers/vsphere.yaml
+- config/drivers/rimuhosting.yaml
+- config/drivers/azure.yaml
+- config/drivers/rackspace.yaml
 - config/condor.yaml
 - config/addresses.xml
 - support/fedora/deltacloud-core-config
-- support/fedora/deltacloud-core
-- support/fedora/deltacloud-core.spec
+- support/fedora/deltacloud-core.init
 - support/fedora/deltacloudd-fedora
-- support/condor/bash/cloud_prepare_hook.sh
+- support/fedora/deltacloud-core.spec
+- support/condor/bash/cloud_functions
 - support/condor/bash/libvirt_cloud_script.sh
 - support/condor/bash/cached_images.sh
+- support/condor/bash/cloud_prepare_hook.sh
 - support/condor/bash/cloud_exit_hook.sh
-- support/condor/bash/cloud_functions
-- support/condor/config/50condor_cloud.config
 - support/condor/config/condor_config.local
 - support/condor/config/50condor_cloud_node.config
 - support/condor/config/condor-cloud
-- lib/drivers.rb
-- lib/deltacloud/helpers/conversion_helper.rb
-- lib/deltacloud/helpers/application_helper.rb
-- lib/deltacloud/helpers/json_helper.rb
-- lib/deltacloud/helpers/hardware_profiles_helper.rb
-- lib/deltacloud/helpers/blob_stream.rb
-- lib/deltacloud/core_ext.rb
-- lib/deltacloud/core_ext/integer.rb
-- lib/deltacloud/core_ext/string.rb
-- lib/deltacloud/base_driver/exceptions.rb
+- support/condor/config/50condor_cloud.config
 - lib/deltacloud/base_driver/mock_driver.rb
+- lib/deltacloud/base_driver/exceptions.rb
 - lib/deltacloud/base_driver/base_driver.rb
 - lib/deltacloud/base_driver/features.rb
-- lib/deltacloud/drivers/opennebula/cloud_client.rb
+- lib/deltacloud/runner.rb
+- lib/deltacloud/drivers/azure/azure_driver.rb
 - lib/deltacloud/drivers/opennebula/occi_client.rb
 - lib/deltacloud/drivers/opennebula/opennebula_driver.rb
-- lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb
+- lib/deltacloud/drivers/opennebula/cloud_client.rb
+- lib/deltacloud/drivers/vsphere/vsphere_driver.rb
 - lib/deltacloud/drivers/vsphere/vsphere_client.rb
 - lib/deltacloud/drivers/vsphere/vsphere_filemanager.rb
-- lib/deltacloud/drivers/vsphere/vsphere_driver.rb
-- lib/deltacloud/drivers/condor/condor_client.rb
 - lib/deltacloud/drivers/condor/condor_driver.rb
 - lib/deltacloud/drivers/condor/ip_agents/confserver.rb
 - lib/deltacloud/drivers/condor/ip_agents/default.rb
-- lib/deltacloud/drivers/mock/mock_driver.rb
-- lib/deltacloud/drivers/mock/mock_client.rb
-- lib/deltacloud/drivers/sbc/sbc_client.rb
+- lib/deltacloud/drivers/condor/condor_client.rb
+- lib/deltacloud/drivers/rackspace/rackspace_driver.rb
 - lib/deltacloud/drivers/sbc/sbc_driver.rb
+- lib/deltacloud/drivers/sbc/sbc_client.rb
+- lib/deltacloud/drivers/mock/mock_client.rb
+- lib/deltacloud/drivers/mock/mock_driver.rb
+- lib/deltacloud/drivers/terremark/terremark_driver.rb
+- lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb
 - lib/deltacloud/drivers/ec2/ec2_mock_driver.rb
 - lib/deltacloud/drivers/ec2/ec2_driver.rb
-- lib/deltacloud/drivers/rackspace/rackspace_driver.rb
-- lib/deltacloud/drivers/terremark/terremark_driver.rb
-- lib/deltacloud/drivers/gogrid/gogrid_client.rb
-- lib/deltacloud/drivers/gogrid/gogrid_driver.rb
-- lib/deltacloud/drivers/rhevm/rhevm_client.rb
 - lib/deltacloud/drivers/rhevm/rhevm_driver.rb
-- lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
+- lib/deltacloud/drivers/rhevm/rhevm_client.rb
 - lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
-- lib/deltacloud/drivers/azure/azure_driver.rb
-- lib/deltacloud/validation.rb
+- lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
+- lib/deltacloud/drivers/gogrid/gogrid_client.rb
+- lib/deltacloud/drivers/gogrid/gogrid_driver.rb
 - lib/deltacloud/method_serializer.rb
-- lib/deltacloud/helpers.rb
-- lib/deltacloud/backend_capability.rb
-- lib/deltacloud/runner.rb
-- lib/deltacloud/state_machine.rb
-- lib/deltacloud/base_driver.rb
+- lib/deltacloud/helpers/blob_stream.rb
+- lib/deltacloud/helpers/conversion_helper.rb
+- lib/deltacloud/helpers/json_helper.rb
+- lib/deltacloud/helpers/application_helper.rb
+- lib/deltacloud/helpers/hardware_profiles_helper.rb
+- lib/deltacloud/core_ext.rb
 - lib/deltacloud/hardware_profile.rb
-- lib/deltacloud/models/bucket.rb
-- lib/deltacloud/models/instance_profile.rb
 - lib/deltacloud/models/base_model.rb
-- lib/deltacloud/models/realm.rb
-- lib/deltacloud/models/blob.rb
-- lib/deltacloud/models/firewall.rb
-- lib/deltacloud/models/key.rb
-- lib/deltacloud/models/instance.rb
-- lib/deltacloud/models/storage_volume.rb
-- lib/deltacloud/models/firewall_rule.rb
+- lib/deltacloud/models/address.rb
 - lib/deltacloud/models/load_balancer.rb
+- lib/deltacloud/models/firewall_rule.rb
+- lib/deltacloud/models/instance_profile.rb
+- lib/deltacloud/models/storage_volume.rb
+- lib/deltacloud/models/bucket.rb
+- lib/deltacloud/models/key.rb
+- lib/deltacloud/models/firewall.rb
 - lib/deltacloud/models/image.rb
-- lib/deltacloud/models/address.rb
+- lib/deltacloud/models/blob.rb
+- lib/deltacloud/models/realm.rb
+- lib/deltacloud/models/instance.rb
 - lib/deltacloud/models/storage_snapshot.rb
-- lib/sinatra/rack_accept.rb
-- lib/sinatra/url_for.rb
+- lib/deltacloud/core_ext/string.rb
+- lib/deltacloud/core_ext/integer.rb
+- lib/deltacloud/core_ext/hash.rb
+- lib/deltacloud/base_driver.rb
+- lib/deltacloud/validation.rb
+- lib/deltacloud/models.rb
+- lib/deltacloud/state_machine.rb
+- lib/deltacloud/backend_capability.rb
+- lib/deltacloud/drivers.rb
+- lib/deltacloud/helpers.rb
 - lib/sinatra/accept_media_types.rb
+- lib/sinatra/sinatra_verbose.rb
 - lib/sinatra/rabbit.rb
-- lib/sinatra/rack_date.rb
+- lib/sinatra/rack_driver_select.rb
+- lib/sinatra/static_assets.rb
+- lib/sinatra/url_for.rb
 - lib/sinatra/lazy_auth.rb
-- lib/sinatra/body_proxy.rb
 - lib/sinatra/rack_etag.rb
-- lib/sinatra/rack_runtime.rb
+- lib/sinatra/body_proxy.rb
 - lib/sinatra/rack_matrix_params.rb
-- lib/sinatra/static_assets.rb
-- lib/sinatra/rack_driver_select.rb
+- lib/sinatra/rack_accept.rb
 - lib/sinatra/rack_syslog.rb
-- lib/deltacloud/drivers/mock/data/storage_snapshots/snap3.yml
-- lib/deltacloud/drivers/mock/data/storage_snapshots/snap1.yml
+- lib/sinatra/rack_runtime.rb
+- lib/sinatra/rack_date.rb
+- lib/deltacloud.rb
+- lib/deltacloud/drivers/mock/data/images/img3.yml
+- lib/deltacloud/drivers/mock/data/images/img1.yml
+- lib/deltacloud/drivers/mock/data/images/img2.yml
 - lib/deltacloud/drivers/mock/data/storage_snapshots/snap2.yml
-- lib/deltacloud/drivers/mock/data/buckets/bucket2.yml
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap1.yml
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap3.yml
+- lib/deltacloud/drivers/mock/data/blobs/blob5.yml
+- lib/deltacloud/drivers/mock/data/blobs/blob1.yml
+- lib/deltacloud/drivers/mock/data/blobs/blob3.yml
+- lib/deltacloud/drivers/mock/data/blobs/blob2.yml
+- lib/deltacloud/drivers/mock/data/blobs/blob4.yml
 - lib/deltacloud/drivers/mock/data/buckets/bucket1.yml
+- lib/deltacloud/drivers/mock/data/buckets/bucket2.yml
 - lib/deltacloud/drivers/mock/data/instances/inst0.yml
-- lib/deltacloud/drivers/mock/data/instances/inst1.yml
 - lib/deltacloud/drivers/mock/data/instances/inst2.yml
-- lib/deltacloud/drivers/mock/data/blobs/blob4.yml
-- lib/deltacloud/drivers/mock/data/blobs/blob2.yml
-- lib/deltacloud/drivers/mock/data/blobs/blob3.yml
-- lib/deltacloud/drivers/mock/data/blobs/blob1.yml
-- lib/deltacloud/drivers/mock/data/blobs/blob5.yml
-- lib/deltacloud/drivers/mock/data/images/img3.yml
-- lib/deltacloud/drivers/mock/data/images/img2.yml
-- lib/deltacloud/drivers/mock/data/images/img1.yml
+- lib/deltacloud/drivers/mock/data/instances/inst1.yml
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol3.yml
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol2.yml
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol1.yml
-- tests/rabbit_test.rb
-- tests/common.rb
-- tests/drivers/mock/setup.rb
-- tests/drivers/mock/url_for_test.rb
-- tests/drivers/mock/hardware_profiles_test.rb
+- tests/drivers/rackspace/api_test.rb
+- tests/drivers/rackspace/hardware_profiles_test.rb
+- tests/drivers/rackspace/images_test.rb
+- tests/drivers/rackspace/instances_test.rb
+- tests/drivers/rackspace/setup.rb
+- tests/drivers/rackspace/realms_test.rb
 - tests/drivers/mock/instance_states_test.rb
 - tests/drivers/mock/api_test.rb
+- tests/drivers/mock/url_for_test.rb
+- tests/drivers/mock/hardware_profiles_test.rb
 - tests/drivers/mock/images_test.rb
 - tests/drivers/mock/instances_test.rb
+- tests/drivers/mock/setup.rb
 - tests/drivers/mock/realms_test.rb
-- tests/drivers/rackspace/setup.rb
-- tests/drivers/rackspace/hardware_profiles_test.rb
-- tests/drivers/rackspace/api_test.rb
-- tests/drivers/rackspace/images_test.rb
-- tests/drivers/rackspace/instances_test.rb
-- tests/drivers/rackspace/realms_test.rb
-- tests/drivers/rhevm/setup.rb
-- tests/drivers/rhevm/hardware_profiles_test.rb
 - tests/drivers/rhevm/api_test.rb
+- tests/drivers/rhevm/hardware_profiles_test.rb
 - tests/drivers/rhevm/images_test.rb
 - tests/drivers/rhevm/instances_test.rb
+- tests/drivers/rhevm/setup.rb
 - tests/drivers/rhevm/realms_test.rb
-- views/storage_snapshots/index.xml.haml
+- tests/rabbit_test.rb
+- tests/common.rb
+- views/firewalls/show.html.haml
+- views/firewalls/new.html.haml
+- views/firewalls/new_rule.html.haml
+- views/firewalls/index.html.haml
+- views/firewalls/index.xml.haml
+- views/firewalls/show.xml.haml
+- views/drivers/show.html.haml
+- views/drivers/index.html.haml
+- views/drivers/index.xml.haml
+- views/drivers/show.xml.haml
+- views/hardware_profiles/show.html.haml
+- views/hardware_profiles/index.html.haml
+- views/hardware_profiles/index.xml.haml
+- views/hardware_profiles/show.xml.haml
+- views/images/show.html.haml
+- views/images/new.html.haml
+- views/images/index.html.haml
+- views/images/index.xml.haml
+- views/images/show.xml.haml
+- views/storage_snapshots/show.html.haml
+- views/storage_snapshots/new.html.haml
 - views/storage_snapshots/index.html.haml
+- views/storage_snapshots/index.xml.haml
 - views/storage_snapshots/show.xml.haml
-- views/storage_snapshots/new.html.haml
-- views/storage_snapshots/show.html.haml
-- views/api/show.xml.haml
-- views/api/show.html.haml
-- views/buckets/index.xml.haml
+- views/blobs/show.html.haml
+- views/blobs/new.html.haml
+- views/blobs/show.xml.haml
+- views/buckets/show.html.haml
+- views/buckets/new.html.haml
 - views/buckets/index.html.haml
+- views/buckets/index.xml.haml
 - views/buckets/show.xml.haml
-- views/buckets/new.html.haml
-- views/buckets/show.html.haml
-- views/instance_states/show.xml.haml
-- views/instance_states/show.html.haml
-- views/keys/index.xml.haml
-- views/keys/index.html.haml
-- views/keys/show.xml.haml
-- views/keys/new.html.haml
-- views/keys/show.html.haml
-- views/errors/500.html.haml
+- views/errors/400.html.haml
 - views/errors/502.html.haml
-- views/errors/404.xml.haml
 - views/errors/405.xml.haml
+- views/errors/400.xml.haml
+- views/errors/403.xml.haml
 - views/errors/502.xml.haml
 - views/errors/401.html.haml
-- views/errors/400.html.haml
-- views/errors/403.html.haml
-- views/errors/404.html.haml
 - views/errors/405.html.haml
-- views/errors/403.xml.haml
-- views/errors/400.xml.haml
-- views/errors/500.xml.haml
 - views/errors/backend_capability_failure.xml.haml
+- views/errors/404.html.haml
+- views/errors/403.html.haml
+- views/errors/500.xml.haml
 - views/errors/backend_capability_failure.html.haml
+- views/errors/500.html.haml
+- views/errors/404.xml.haml
 - views/errors/401.xml.haml
-- views/addresses/index.xml.haml
-- views/addresses/_address.html.haml
+- views/api/show.html.haml
+- views/api/show.xml.haml
+- views/addresses/show.html.haml
 - views/addresses/associate.html.haml
+- views/addresses/_address.html.haml
 - views/addresses/index.html.haml
+- views/addresses/index.xml.haml
 - views/addresses/show.xml.haml
-- views/addresses/show.html.haml
+- views/instance_states/show.html.haml
+- views/instance_states/show.xml.haml
+- views/keys/show.html.haml
+- views/keys/new.html.haml
+- views/keys/index.html.haml
+- views/keys/index.xml.haml
+- views/keys/show.xml.haml
+- views/load_balancers/show.html.haml
+- views/load_balancers/new.html.haml
+- views/load_balancers/index.html.haml
+- views/load_balancers/index.xml.haml
+- views/load_balancers/show.xml.haml
+- views/error.html.haml
+- views/layout.html.haml
+- views/instances/show.html.haml
+- views/instances/new.html.haml
 - views/instances/run_command.html.haml
-- views/instances/index.xml.haml
-- views/instances/run.xml.haml
 - views/instances/run.html.haml
+- views/instances/run.xml.haml
 - views/instances/index.html.haml
+- views/instances/index.xml.haml
 - views/instances/show.xml.haml
-- views/instances/new.html.haml
-- views/instances/show.html.haml
-- views/hardware_profiles/index.xml.haml
-- views/hardware_profiles/index.html.haml
-- views/hardware_profiles/show.xml.haml
-- views/hardware_profiles/show.html.haml
-- views/realms/index.xml.haml
+- views/storage_volumes/show.html.haml
+- views/storage_volumes/attach.html.haml
+- views/storage_volumes/new.html.haml
+- views/storage_volumes/index.html.haml
+- views/storage_volumes/index.xml.haml
+- views/storage_volumes/show.xml.haml
+- views/realms/show.html.haml
 - views/realms/index.html.haml
+- views/realms/index.xml.haml
 - views/realms/show.xml.haml
-- views/realms/show.html.haml
-- views/drivers/index.xml.haml
-- views/drivers/index.html.haml
-- views/drivers/show.xml.haml
-- views/drivers/show.html.haml
-- views/layout.html.haml
-- views/load_balancers/index.xml.haml
-- views/load_balancers/index.html.haml
-- views/load_balancers/show.xml.haml
-- views/load_balancers/new.html.haml
-- views/load_balancers/show.html.haml
-- views/blobs/show.xml.haml
-- views/blobs/new.html.haml
-- views/blobs/show.html.haml
-- views/images/index.xml.haml
-- views/images/index.html.haml
-- views/images/show.xml.haml
-- views/images/new.html.haml
-- views/images/show.html.haml
-- views/firewalls/index.xml.haml
-- views/firewalls/index.html.haml
-- views/firewalls/show.xml.haml
-- views/firewalls/new.html.haml
-- views/firewalls/show.html.haml
-- views/firewalls/new_rule.html.haml
-- views/docs/index.xml.haml
+- views/root/index.html.haml
 - views/docs/operation.html.haml
 - views/docs/collection.xml.haml
+- views/docs/collection.html.haml
 - views/docs/operation.xml.haml
 - views/docs/index.html.haml
-- views/docs/collection.html.haml
-- views/root/index.html.haml
-- views/error.html.haml
-- views/storage_volumes/index.xml.haml
-- views/storage_volumes/attach.html.haml
-- views/storage_volumes/index.html.haml
-- views/storage_volumes/show.xml.haml
-- views/storage_volumes/new.html.haml
-- views/storage_volumes/show.html.haml
+- views/docs/index.xml.haml
 - views/instance_states/show.png.erb
 - public/favicon.ico
-- public/images/machine.png
-- public/images/volume.png
-- public/images/blob.png
-- public/images/firewall.png
-- public/images/balancer.png
-- public/images/bucket.png
+- public/images/image.png
 - public/images/cloud.png
-- public/images/address.png
-- public/images/key.png
-- public/images/profile.png
+- public/images/balancer.png
+- public/images/blob.png
 - public/images/snapshot.png
-- public/images/image.png
+- public/images/profile.png
+- public/images/key.png
 - public/images/realm.png
-- public/javascripts/jquery-1.4.2.min.js
-- public/javascripts/application.js
+- public/images/address.png
+- public/images/firewall.png
+- public/images/bucket.png
+- public/images/machine.png
+- public/images/volume.png
 - public/javascripts/jquery.min.js
+- public/javascripts/application.js
 - public/javascripts/jquery.mobile-1.0b1.min.js
-- public/stylesheets/new.css
 - public/stylesheets/jquery.mobile-1.0b1.min.css
-- public/stylesheets/images/icons-36-black.png
-- public/stylesheets/images/stopped.png
-- public/stylesheets/images/topbar-bg.png
-- public/stylesheets/images/icons-18-black.png
-- public/stylesheets/images/icon-search-black.png
-- public/stylesheets/images/pending.png
-- public/stylesheets/images/icons-36-white.png
+- public/stylesheets/new.css
 - public/stylesheets/images/grid.png
-- public/stylesheets/images/icons-18-white.png
+- public/stylesheets/images/logo-wide.png
 - public/stylesheets/images/rails.png
+- public/stylesheets/images/icons-36-white.png
+- public/stylesheets/images/running.png
 - public/stylesheets/images/ajax-loader.png
-- public/stylesheets/images/logo-wide.png
+- public/stylesheets/images/pending.png
 - public/stylesheets/images/bread-bg.png
+- public/stylesheets/images/icons-18-black.png
+- public/stylesheets/images/icons-18-white.png
+- public/stylesheets/images/topbar-bg.png
 - public/stylesheets/images/error.png
-- public/stylesheets/images/running.png
-- public/stylesheets/compiled/print.css
-- public/stylesheets/compiled/screen.css
+- public/stylesheets/images/icon-search-black.png
+- public/stylesheets/images/stopped.png
+- public/stylesheets/images/icons-36-black.png
 - public/stylesheets/compiled/application.css
 - public/stylesheets/compiled/ie.css
+- public/stylesheets/compiled/print.css
+- public/stylesheets/compiled/screen.css
 - bin/deltacloudd
 - LICENSE
 - DISCLAIMER