deltacloud-core 0.0.5 → 0.0.6

data/Rakefile

@@ -37,15 +37,22 @@ Rake::TestTask.new("test") { |t|
     'tests/images_test.rb',
     'tests/instances_test.rb',
     'tests/instance_states_test.rb',
+    'tests/url_for_test.rb'
   ]
   t.verbose = true
   t.warning = false
 }
 
-load 'deltacloud-core.gemspec'
 
-Rake::GemPackageTask.new(@spec) do |pkg|
-  pkg.need_tar = true
+@specs = ['ruby', 'java'].inject({}) do |hash, spec_platform|
+  $platform = spec_platform
+  hash.update(spec_platform => Gem::Specification.load('deltacloud-core.gemspec'))
+end
+
+@specs.values.each do |spec|
+  Rake::GemPackageTask.new(spec) do |pkg|
+    pkg.need_tar = true
+  end
 end
 
 desc "Install API"

data/bin/deltacloudd

@@ -2,7 +2,6 @@
 
 require 'rubygems'
 require 'optparse'
-require 'thin'
 
 options = {
   :env => 'development'
@@ -44,45 +43,78 @@ end
 ENV["API_HOST"] = "localhost" unless ENV["API_HOST"]
 ENV["API_PORT"] = "3001" unless ENV["API_PORT"]
 
+puts "Starting Deltacloud API :: #{ENV["API_DRIVER"]} :: http://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/api"
+puts
+
 dirname="#{File.dirname(__FILE__)}/.."
+platform = RUBY_PLATFORM[/java/] || 'ruby'
 
-argv_opts = ARGV.clone
-argv_opts << ['start'] unless Thin::Runner.commands.include?(options[0])
-argv_opts << ['--address', ENV["API_HOST"] ]
-argv_opts << ['--port', ENV["API_PORT"] ]
-argv_opts << ['--rackup', 'config.ru' ]
-argv_opts << ['--chdir', dirname ]
-argv_opts << ['-e', options[:env] ]
-argv_opts << ['--threaded', '-D', '--stats', '/stats']
-
-argv_opts.flatten!
-
-if options[:env] == "development"
-  use_rerun = false
-  begin
-    require "rerun"
-    use_rerun = true
-  rescue
-    # Do nothing
-  end
-end
+if platform == 'java'
+  require 'rack'
 
-puts "Starting Deltacloud API :: #{ENV["API_DRIVER"]} :: http://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/api"
-puts
+  # We can't chdir with webrick so add our root directory
+  # onto the load path
+  $: << dirname
+
+  # Read in config.ru and convert it to an instance of Rack::Builder
+  cfgfile = File.read(File.join(dirname, 'config.ru'))
+  inner_app = eval("Rack::Builder.new {(" + cfgfile + "\n )}.to_app",
+                   nil, 'config.ru')
 
-if use_rerun
-  argv_opts.unshift "thin"
-  command = argv_opts.join(" ")
-  topdir = File::expand_path(File::join(File::dirname(__FILE__), ".."))
-  rerun = Rerun::Runner.new(command, :dir => topdir)
-  rerun.start
-  rerun.join
+  app = Rack::Builder.new {
+    use Rack::CommonLogger # apache-like logging
+    use Rack::Reloader if options[:env] == "development"
+    set :root, dirname # Set Sinatra root since we can't chdir to ../
+    run inner_app
+  }.to_app
+
+  # There's a bug with string ports on JRuby so convert to int
+  # http://jira.codehaus.org/browse/JRUBY-4868
+  port = ENV["API_PORT"].to_i
+
+  puts "=> Ctrl-C to shutdown server"
+  Rack::Handler::WEBrick.run(app,
+                             :Host => ENV["API_HOST"],
+                             :Port => port,
+                             :AccessLog => [])
 else
-  thin = Thin::Runner.new(argv_opts)
+  require 'thin'
+
+  argv_opts = ARGV.clone
+  argv_opts << ['start'] unless Thin::Runner.commands.include?(options[0])
+  argv_opts << ['--address', ENV["API_HOST"] ]
+  argv_opts << ['--port', ENV["API_PORT"] ]
+  argv_opts << ['--rackup', 'config.ru' ]
+  argv_opts << ['--chdir', dirname ]
+  argv_opts << ['-e', options[:env] ]
+  argv_opts << ['--threaded', '-D', '--stats', '/stats']
+
+  argv_opts.flatten!
+
+  if options[:env] == "development"
+    use_rerun = false
+    begin
+      require "rerun"
+      use_rerun = true
+    rescue
+      # Do nothing
+    end
+  end
+
+  if use_rerun
+    argv_opts.unshift "thin"
+    command = argv_opts.join(" ")
+    topdir = File::expand_path(File::join(File::dirname(__FILE__), ".."))
+    rerun = Rerun::Runner.new(command, :dir => topdir)
+    rerun.start
+    rerun.join
+  else
+    thin = Thin::Runner.new(argv_opts)
 
-  begin
-    thin.run!
-  rescue Exception => e
-    puts "ERROR: #{e.message}"
+    begin
+      thin.run!
+    rescue Exception => e
+      puts "ERROR: #{e.message}"
+    end
   end
 end

data/config.ru

@@ -1,5 +1,5 @@
-require 'sinatra'
 require 'rubygems'
+require 'sinatra'
 
 require 'server.rb'
 run Sinatra::Application

data/lib/deltacloud/drivers/ec2/ec2_driver.rb

@@ -310,6 +310,15 @@ class EC2Driver < Deltacloud::BaseDriver
     end
   end
 
+  def valid_credentials?(credentials)
+    client = new_client(credentials)
+    # FIXME: We need to do this call to determine if
+    #        EC2 is working with given credentials. There is no
+    #        other way to check, if given credentials are valid or not.
+    realms = client.describe_availability_zones rescue false
+    return realms ? true : false
+  end
+
   private
 
   def new_client(credentials)

data/lib/deltacloud/drivers/gogrid/gogrid_client.rb

@@ -9,7 +9,7 @@ class GoGridClient
                  apikey='YOUR API KEY',
                  secret='YOUR SHARED SECRET', 
                  format='json',
-                 version='1.4')
+                 version='1.5')
     @server = server
     @secret = secret
     @default_params = {'format'=>format, 'v'=>version,'api_key' => apikey}
@@ -30,7 +30,12 @@ class GoGridClient
     open(getRequestURL(method,params)).read
   end
 
-  def request(method, params={})
+  def request(method, params={}, version=nil)
+    if version
+      @default_params['v'] = version
+    else
+      @default_params['v'] = '1.5'
+    end
     begin
       JSON::parse(sendAPIRequest(method, params))
     rescue Exception => e

data/lib/deltacloud/drivers/gogrid/gogrid_driver.rb

@@ -67,7 +67,7 @@ class GogridDriver < Deltacloud::BaseDriver
 
   def realms(credentials, opts=nil)
     safely do
-      new_client(credentials).request('common/lookup/list', { 'lookup' => 'image.type' })['list'].collect do |realm|
+      new_client(credentials).request('common/lookup/list', { 'lookup' => 'ip.datacenter' })['list'].collect do |realm|
         convert_realm(realm)
       end
     end
@@ -88,7 +88,7 @@ class GogridDriver < Deltacloud::BaseDriver
         'name' => name,
         'image' => image_id,
         'server.ram' => server_ram,
-        'ip' => get_next_free_ip(credentials)
+        'ip' => get_free_ip_from_realm(credentials, opts[:realm_id] || '1')
       })['list'].first
       if instance
         login_data = get_login_data(client, instance[:id])
@@ -120,6 +120,7 @@ class GogridDriver < Deltacloud::BaseDriver
   end
 
   def instances(credentials, opts=nil)
+    require 'ap'
     instances = []
     if opts and opts[:id]
       begin
@@ -154,25 +155,25 @@ class GogridDriver < Deltacloud::BaseDriver
 
   def reboot_instance(credentials, id)
     safely do
-      new_client(credentials).request('grid/server/power', { 'id' => id, 'power' => 'reboot'})
+      new_client(credentials).request('grid/server/power', { 'name' => id, 'power' => 'reboot'})
     end
   end
 
   def destroy_instance(credentials, id)
     safely do
-      new_client(credentials).request('grid/server/delete', { 'id' => id})
+      new_client(credentials).request('grid/server/delete', { 'name' => id})
     end
   end
 
   def stop_instance(credentials, id)
     safely do
-      new_client(credentials).request('grid/server/power', { 'id' => id, 'power' => 'off'})
+      new_client(credentials).request('grid/server/power', { 'name' => id, 'power' => 'off'})
     end
   end
 
   def start_instance(credentials, id)
     safely do
-      new_client(credentials).request('grid/server/power', { 'id' => id, 'power' => 'on'})
+      new_client(credentials).request('grid/server/power', { 'name' => id, 'power' => 'on'})
     end
   end
 
@@ -183,12 +184,23 @@ class GogridDriver < Deltacloud::BaseDriver
   def keys(credentials, opts=nil)
     gogrid = new_client( credentials )
     creds = []
-    gogrid.request('support/password/list')['list'].each do |password|
-      creds << convert_key(password)
+    safely do
+      gogrid.request('support/password/list')['list'].each do |password|
+        creds << convert_key(password)
+      end
     end
     return creds
   end
 
+  def valid_credentials?(credentials)
+    client = new_client(credentials)
+    # FIXME: We need to do this call to determine if
+    #        GoGrid is working with given credentials. There is no
+    #        other way to check, if given credentials are valid or not.
+    return false unless new_client(credentials).request('common/lookup/list', { 'lookup' => 'ip.datacenter' })
+    true
+  end
+
   define_instance_states do
     start.to( :pending )         .automatically
     pending.to( :running )       .automatically
@@ -202,6 +214,7 @@ class GogridDriver < Deltacloud::BaseDriver
 
   def new_client(credentials)
     GoGridClient.new('https://api.gogrid.com/api', credentials.user, credentials.password)
+
   end
 
   def get_login_data(client, instance_id)
@@ -282,7 +295,7 @@ class GogridDriver < Deltacloud::BaseDriver
       :image_id => instance['image']['id'],
       :instance_profile => prof,
       :name => instance['name'],
-      :realm_id => instance['type']['id'],
+      :realm_id => instance['ip']['datacenter']['id'],
       :state => convert_server_state(instance['state']['name'], instance['id']),
       :actions => instance_actions_for(convert_server_state(instance['state']['name'], instance['id'])),
       :public_addresses => [ instance['ip']['ip'] ],
@@ -301,12 +314,13 @@ class GogridDriver < Deltacloud::BaseDriver
     state.eql?('Off') ? 'STOPPED' : 'RUNNING'
   end
 
-  def get_next_free_ip(credentials)
+  def get_free_ip_from_realm(credentials, realm_id)
     ip = ""
     safely do
       ip = new_client(credentials).request('grid/ip/list', {
         'ip.type' => '1',
-        'ip.state' => '1'
+        'ip.state' => '1',
+        'datacenter' => realm_id
       })['list'].first['ip']
     end
     return ip

data/lib/deltacloud/drivers/gogrid/test.rb

@@ -0,0 +1,13 @@
+require 'gogrid_client'
+require 'ap'
+
+user='fbb1de3897597ccf'
+password='ngieth10'
+
+client=GoGridClient.new('https://api.gogrid.com/api', user, password)
+
+ap client.request('grid/ip/list', {
+  'ip.type' => '1',
+  'ip.state' => '1',
+  'datacenter' => '1'
+})

data/lib/deltacloud/drivers/mock/mock_driver.rb

@@ -257,6 +257,15 @@ class MockDriver < Deltacloud::BaseDriver
     snapshots
   end
 
+  def valid_credentials?(credentials)
+    begin
+      check_credentials(credentials)
+      return true
+    rescue Deltacloud::AuthException
+    end
+    return false
+  end
+
   private
 
   def check_credentials(credentials)

data/lib/deltacloud/drivers/rackspace/rackspace_driver.rb

@@ -73,6 +73,11 @@ class RackspaceDriver < Deltacloud::BaseDriver
     safely do
       racks.reboot_server(id)
     end
+    Instance.new( {
+      :id => id,
+      :state => "REBOOT",
+      :actions => instance_actions_for( state ),
+    } )
   end
 
   def stop_instance(credentials, id)
@@ -84,6 +89,11 @@ class RackspaceDriver < Deltacloud::BaseDriver
     safely do
       racks.delete_server(id)
     end
+    Instance.new( {
+      :id => id,
+      :state => "STOPPED",
+      :actions => instance_actions_for( "STOPPED" ),
+    } )
   end
 
 
@@ -121,9 +131,17 @@ class RackspaceDriver < Deltacloud::BaseDriver
     instances
   end
 
+  def valid_credentials?(credentials)
+    begin
+      new_client(credentials)
+    rescue
+      return false
+    end
+    true
+  end
+
 
   def convert_srv_to_instance(srv)
-    status = srv["status"] == "ACTIVE" ? "RUNNING" : "PENDING"
     inst = Instance.new(:id => srv["id"].to_s,
                         :owner_id => "root",
                         :realm_id => "us")

data/lib/deltacloud/drivers/terremark/terremark_driver.rb

@@ -118,7 +118,7 @@ VAPP_STATE_MAP = { "0" =>  "PENDING", "1" =>  "PENDING", "2" =>  "STOPPED", "4"
     running.to(:running)          .on( :reboot )
     running.to(:shutting_down)    .on( :stop )
     shutting_down.to(:stopped)    .automatically
-    stopped.to(:end)              .on( :destroy )
+    stopped.to(:finish)           .on( :destroy )
    end
 
 
@@ -191,6 +191,15 @@ def destroy_instance(credentials, id)
   end
 end
 
+def valid_credentials?(credentials)
+  begin
+    new_client(credentials)
+  rescue Deltacloud::AuthException
+    return false
+  end
+  true
+end
+
 #--
 # PRIVATE METHODS:
 #--

data/lib/deltacloud/helpers/application_helper.rb

@@ -20,8 +20,8 @@
 module ApplicationHelper
 
   def bread_crumb
-    s = "<ul class='breadcrumb'><li class='first'><a href='/'>&#948</a></li>"
-    url = request.path.split('?')  #remove extra query string parameters
+    s = "<ul class='breadcrumb'><li class='first'><a href='#{url_for('/')}'>&#948</a></li>"
+    url = request.path_info.split('?')  #remove extra query string parameters
     levels = url[0].split('/') #break up url into different levels
     levels.each_with_index do |level, index|
       unless level.blank?
@@ -30,7 +30,7 @@ module ApplicationHelper
           s += "<li class='subsequent'>#{level.gsub(/_/, ' ')}</li>\n" unless level.to_i > 0
         else
             link = levels.slice(0, index+1).join("/")
-            s += "<li class='subsequent'><a href=\"#{link}\">#{level.gsub(/_/, ' ')}</a></li>\n"
+            s += "<li class='subsequent'><a href=\"#{url_for(link)}\">#{level.gsub(/_/, ' ')}</a></li>\n"
         end
       end
     end

data/lib/deltacloud/models/base_model.rb

@@ -52,8 +52,8 @@ class BaseModel
     out
   end
 
-  def to_json
-    self.to_hash.to_json
+  def to_json(*a)
+    self.to_hash.to_json(*a)
   end
 
 end

data/lib/sinatra/url_for.rb

@@ -33,7 +33,13 @@ module Sinatra
         raise TypeError, "Unknown url_for mode #{mode}"
       end
       url_escape = URI.escape(url_fragment)
-      "#{base}#{url_escape}"
+      # Don't add the base fragment if url_for gets called more than once
+      # per url or the url_fragment passed in is an absolute url
+      if url_escape.match(/^#{base}/) or url_escape.match(/^http/)
+        url_escape
+      else
+        "#{base}#{url_escape}"
+      end
     end
 
     def root_url

data/server.rb

@@ -38,10 +38,13 @@ error Deltacloud::BackendError do
 end
 
 # Redirect to /api
-get '/' do redirect '/api'; end
+get '/' do redirect url_for('/api'); end
 
 get '/api\/?' do
     @version = 0.1
+    if params[:force_auth]
+      return [401, 'Authentication failed'] unless driver.valid_credentials?(credentials)
+    end
     respond_to do |format|
         format.xml { haml :"api/show" }
         format.json do
@@ -174,7 +177,7 @@ END
   end
 
   operation :show do
-    description 'Show an image identified by "id" parameter.'
+    description 'Show an instance identified by "id" parameter.'
     param :id,           :string, :required
     control { show(:instance) }
   end

data/test.rb

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'AWS'
+require 'ap'
+
+client = AWS::EC2::Base.new(:access_key_id => "AKIAJ5XGZSACLBSBMUIA" ,
+  :secret_access_key => "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")
+
+print client.describe_addresses

data/tests/url_for_test.rb

@@ -0,0 +1,50 @@
+require 'tests/common'
+
+module DeltacloudUnitTest
+  class UrlForTest < Test::Unit::TestCase
+    include Rack::Test::Methods
+
+    def app
+      Sinatra::Application
+    end
+
+    def test_it_works_for_root
+      verify_url_for("/", "/")
+    end
+
+    def test_it_works_for_root_absolute
+      verify_url_for("/", "http://localhost/", :full)
+    end
+
+    def test_it_works_with_spaces
+      verify_url_for("/url with spaces", "/url%20with%20spaces")
+    end
+
+    def test_it_works_when_given_absolute
+      verify_url_for("http://test.com", "http://test.com")
+    end
+
+    def test_it_works_when_not_at_root_context
+      verify_url_for("/", "context/", :path_only, {}, {"SCRIPT_NAME" => "context"})
+    end
+
+    def verify_url_for(url, expected_url, mode=:path_only, params={}, rack_env={})
+      # generate a unique url for each test
+      test_url = "/url_for_test/#{expected_url.hash}/#{Time.now.to_f}"
+      # Create our sinatra test endpoint
+      self.class.create_test_url_content(test_url, url, mode)
+
+      # verify the generated url matches what we expect
+      get test_url, params, rack_env
+      last_response.body.should == expected_url
+    end
+
+    def self.create_test_url_content(test_url, url_content, mode)
+      get test_url do
+        content_type "text/plain"
+          url_for(url_content, mode)
+      end
+    end
+
+  end
+end

data/views/api/show.html.haml

@@ -12,4 +12,4 @@
             = op
   %li
     %strong
-      %a{:href => "/api/docs"} Documentation (v#{@version})
+      %a{:href => url_for("/api/docs")} Documentation (v#{@version})

data/views/docs/collection.html.haml

@@ -16,7 +16,7 @@
     - @operations.keys.sort_by { |k| k.to_s }.each do |operation|
       %tr
         %td{:style => "width:15em"}
-          %a{:href => "/api/docs/#{@collection.name.to_s}/#{operation}"} #{operation}
+          %a{:href => url_for("/api/docs/#{@collection.name.to_s}/#{operation}")} #{operation}
         %td{:style => "width:10em"} #{@operations[operation].description}
 
 %h3 Features:
@@ -34,4 +34,4 @@
         %td= feature.description
         %td
           - feature.operations.each do |op|
-            %a{:href => "/api/docs/#{@collection.name.to_s}/#{op.name}"} #{op.name}
+            %a{:href => url_for("/api/docs/#{@collection.name.to_s}/#{op.name}")} #{op.name}

data/views/docs/collection.xml.haml

@@ -1,9 +1,9 @@
 %docs{:status => "unsupported"}
-  %collection{:url => "/api/docs/#{@collection.name}", :name => "#{@collection.name}"}
+  %collection{:url => url_for("/api/docs/#{@collection.name}"), :name => "#{@collection.name}"}
     %description #{@collection.description}
     %operations
       - @operations.keys.sort_by { |k| k.to_s }.each do |operation|
-        %operation{:url => "/api/#{@collection.name.to_s}", :name => "#{operation}", :href => "#{@operations[operation].path}", :method => "#{@operations[operation].method}"}
+        %operation{:url => url_for("/api/#{@collection.name.to_s}"), :name => "#{operation}", :href => url_for("#{@operations[operation].path}"), :method => "#{@operations[operation].method}"}
           %description #{@operations[operation].description}
           - @operations[operation].each_param do |param|
             %parameter{:name => "#{param.name}", :type => "#{param.type}"}

data/views/docs/index.html.haml

@@ -11,5 +11,5 @@
     - collections.keys.sort_by { |k| k.to_s }.each do |collection|
       %tr
         %td{:style => "width:15em"}
-          %a{:href => "/api/docs/#{collection}"} #{collection}
+          %a{:href => url_for("/api/docs/#{collection}")} #{collection}
         %td{:style => "width:10em"} #{collections[collection].description}

data/views/docs/index.xml.haml

@@ -1,5 +1,5 @@
 %docs{:status => "unsupported"}
   - collections.keys.sort_by { |k| k.to_s }.each do |collection|
-    %collection{:url => "/api/docs/#{collection}"}
+    %collection{:url => url_for("/api/docs/#{collection}")}
       %name #{collection}
       %description  #{collections[collection].description}

data/views/docs/operation.html.haml

@@ -1,5 +1,5 @@
 %h2
-  %a{:href => "/api/docs/#{@collection.name.to_s}"} #{@collection.name.to_s.titlecase}
+  %a{:href => url_for("/api/docs/#{@collection.name.to_s}")} #{@collection.name.to_s.titlecase}
   #{'::'}
   #{@operation.name}
 
@@ -9,7 +9,7 @@
 %h3
   URL:
   %u
-    = "/api/#{@collection.name.to_s}/#{@operation.name.to_s}"
+    = url_for("/api/#{@collection.name.to_s}/#{@operation.name.to_s}")
 %br
 %h3 Parameters:
 

data/views/docs/operation.xml.haml

@@ -1,5 +1,5 @@
 %docs{:status => "unsupported"}
-  %operation{:url => "/api/docs/#{@collection.name.to_s}", :name => "#{@operation.name.to_s}", :href => "#{@operation.path}", :method => "#{@operation.method}"}
+  %operation{:url => url_for("/api/docs/#{@collection.name.to_s}"), :name => "#{@operation.name.to_s}", :href => url_for("#{@operation.path}"), :method => "#{@operation.method}"}
     %description #{@operation.description}
     - @operation.each_param do |param|
       %parameter{:name => "#{param.name}", :type => "#{param.type}"}

data/views/layout.html.haml

@@ -22,4 +22,5 @@
           Driver: #{DRIVER}
         #copyright
           Copyright 2009, 2010
-          #{link_to 'Red Hat', 'http://redhat.com'} and individual contributors.
+          %a{:href => 'http://redhat.com'} Red Hat
+          and individual contributors.

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-core
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +02:00
+date: 2010-09-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 8
@@ -35,9 +38,11 @@ dependencies:
   name: eventmachine
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 12
@@ -49,9 +54,11 @@ dependencies:
   name: haml
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 37
         segments: 
         - 2
         - 2
@@ -63,9 +70,11 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 9
@@ -77,9 +86,11 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -91,9 +102,11 @@ dependencies:
   name: thin
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 2
@@ -105,9 +118,11 @@ dependencies:
   name: rerun
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 5
@@ -119,9 +134,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 4
@@ -133,9 +150,11 @@ dependencies:
   name: compass
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 8
@@ -147,9 +166,11 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 1
         - 4
@@ -161,9 +182,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 5
@@ -175,9 +198,11 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 0
         - 6
@@ -189,9 +214,11 @@ dependencies:
   name: rcov
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
@@ -210,129 +237,138 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - config.ru
+- test.rb
 - deltacloud.rb
 - server.rb
-- support/fedora/deltacloudd
 - support/fedora/rubygem-deltacloud-core.spec
-- lib/deltacloud/base_driver.rb
-- lib/deltacloud/base_driver/base_driver.rb
-- lib/deltacloud/base_driver/features.rb
-- lib/deltacloud/base_driver/mock_driver.rb
-- lib/deltacloud/drivers/ec2/ec2_driver.rb
+- support/fedora/deltacloudd
+- lib/drivers.rb
+- lib/sinatra/respond_to.rb
+- lib/sinatra/lazy_auth.rb
+- lib/sinatra/accept_media_types.rb
+- lib/sinatra/static_assets.rb
+- lib/sinatra/url_for.rb
+- lib/sinatra/rabbit.rb
+- lib/deltacloud/models/base_model.rb
+- lib/deltacloud/models/realm.rb
+- lib/deltacloud/models/instance.rb
+- lib/deltacloud/models/key.rb
+- lib/deltacloud/models/instance_profile.rb
+- lib/deltacloud/models/storage_volume.rb
+- lib/deltacloud/models/storage_snapshot.rb
+- lib/deltacloud/models/image.rb
+- lib/deltacloud/method_serializer.rb
+- lib/deltacloud/helpers.rb
 - lib/deltacloud/drivers/ec2/ec2_mock_driver.rb
+- lib/deltacloud/drivers/ec2/ec2_driver.rb
+- lib/deltacloud/drivers/terremark/terremark_driver.rb
+- lib/deltacloud/drivers/gogrid/test.rb
 - lib/deltacloud/drivers/gogrid/gogrid_client.rb
 - lib/deltacloud/drivers/gogrid/gogrid_driver.rb
-- lib/deltacloud/drivers/mock/mock_driver.rb
-- lib/deltacloud/drivers/opennebula/cloud_client.rb
-- lib/deltacloud/drivers/opennebula/occi_client.rb
 - lib/deltacloud/drivers/opennebula/opennebula_driver.rb
+- lib/deltacloud/drivers/opennebula/occi_client.rb
+- lib/deltacloud/drivers/opennebula/cloud_client.rb
+- lib/deltacloud/drivers/mock/mock_driver.rb
+- lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
+- lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
 - lib/deltacloud/drivers/rackspace/rackspace_client.rb
 - lib/deltacloud/drivers/rackspace/rackspace_driver.rb
 - lib/deltacloud/drivers/rhevm/rhevm_driver.rb
-- lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
-- lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
-- lib/deltacloud/drivers/terremark/terremark_driver.rb
 - lib/deltacloud/hardware_profile.rb
-- lib/deltacloud/helpers.rb
+- lib/deltacloud/validation.rb
+- lib/deltacloud/base_driver/mock_driver.rb
+- lib/deltacloud/base_driver/base_driver.rb
+- lib/deltacloud/base_driver/features.rb
+- lib/deltacloud/helpers/hardware_profiles_helper.rb
 - lib/deltacloud/helpers/application_helper.rb
 - lib/deltacloud/helpers/conversion_helper.rb
-- lib/deltacloud/helpers/hardware_profiles_helper.rb
-- lib/deltacloud/method_serializer.rb
-- lib/deltacloud/models/base_model.rb
-- lib/deltacloud/models/image.rb
-- lib/deltacloud/models/instance.rb
-- lib/deltacloud/models/instance_profile.rb
-- lib/deltacloud/models/realm.rb
-- lib/deltacloud/models/storage_snapshot.rb
-- lib/deltacloud/models/storage_volume.rb
-- lib/deltacloud/models/key.rb
 - lib/deltacloud/state_machine.rb
-- lib/deltacloud/validation.rb
-- lib/drivers.rb
-- lib/sinatra/accept_media_types.rb
-- lib/sinatra/lazy_auth.rb
-- lib/sinatra/rabbit.rb
-- lib/sinatra/respond_to.rb
-- lib/sinatra/static_assets.rb
-- lib/sinatra/url_for.rb
-- lib/deltacloud/drivers/mock/data/images/img1.yml
+- lib/deltacloud/base_driver.rb
+- lib/deltacloud/drivers/mock/data/storage_volumes/vol1.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_snapshots/snap3.yml
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap1.yml
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap2.yml
 - lib/deltacloud/drivers/mock/data/images/img2.yml
 - lib/deltacloud/drivers/mock/data/images/img3.yml
-- lib/deltacloud/drivers/mock/data/instances/inst0.yml
+- lib/deltacloud/drivers/mock/data/images/img1.yml
 - lib/deltacloud/drivers/mock/data/instances/inst1.yml
 - lib/deltacloud/drivers/mock/data/instances/inst2.yml
-- lib/deltacloud/drivers/mock/data/storage_snapshots/snap1.yml
-- lib/deltacloud/drivers/mock/data/storage_snapshots/snap2.yml
-- lib/deltacloud/drivers/mock/data/storage_snapshots/snap3.yml
-- lib/deltacloud/drivers/mock/data/storage_volumes/vol1.yml
-- lib/deltacloud/drivers/mock/data/storage_volumes/vol2.yml
-- lib/deltacloud/drivers/mock/data/storage_volumes/vol3.yml
+- lib/deltacloud/drivers/mock/data/instances/inst0.yml
+- views/instance_states/show.xml.haml
+- views/instance_states/show.html.haml
+- views/root/index.html.haml
+- views/storage_volumes/show.xml.haml
+- views/storage_volumes/index.xml.haml
+- views/storage_volumes/index.html.haml
+- views/storage_volumes/show.html.haml
 - views/accounts/index.html.haml
 - views/accounts/show.html.haml
-- views/api/show.html.haml
-- views/api/show.xml.haml
-- views/docs/collection.html.haml
-- views/docs/collection.xml.haml
-- views/docs/index.html.haml
-- views/docs/index.xml.haml
-- views/docs/operation.html.haml
-- views/docs/operation.xml.haml
-- views/errors/auth_exception.html.haml
+- views/storage_snapshots/show.xml.haml
+- views/storage_snapshots/index.xml.haml
+- views/storage_snapshots/index.html.haml
+- views/storage_snapshots/show.html.haml
+- views/layout.html.haml
+- views/errors/not_found.html.haml
 - views/errors/auth_exception.xml.haml
-- views/errors/backend_error.html.haml
-- views/errors/backend_error.xml.haml
-- views/errors/validation_failure.html.haml
 - views/errors/validation_failure.xml.haml
-- views/errors/not_found.html.haml
 - views/errors/not_found.xml.haml
-- views/hardware_profiles/index.html.haml
-- views/hardware_profiles/index.xml.haml
-- views/hardware_profiles/show.html.haml
-- views/hardware_profiles/show.xml.haml
-- views/images/index.html.haml
+- views/errors/backend_error.xml.haml
+- views/errors/auth_exception.html.haml
+- views/errors/backend_error.html.haml
+- views/errors/validation_failure.html.haml
+- views/images/show.xml.haml
 - views/images/index.xml.haml
+- views/images/index.html.haml
 - views/images/show.html.haml
-- views/images/show.xml.haml
-- views/instance_states/show.html.haml
-- views/instance_states/show.xml.haml
-- views/instances/index.html.haml
+- views/api/show.xml.haml
+- views/api/show.html.haml
+- views/keys/show.xml.haml
+- views/keys/new.html.haml
+- views/keys/index.xml.haml
+- views/keys/index.html.haml
+- views/keys/show.html.haml
+- views/instances/show.xml.haml
 - views/instances/index.xml.haml
-- views/instances/new.html.haml
+- views/instances/index.html.haml
 - views/instances/show.html.haml
-- views/instances/show.xml.haml
-- views/layout.html.haml
-- views/realms/index.html.haml
+- views/instances/new.html.haml
+- views/hardware_profiles/show.xml.haml
+- views/hardware_profiles/index.xml.haml
+- views/hardware_profiles/index.html.haml
+- views/hardware_profiles/show.html.haml
+- views/docs/operation.xml.haml
+- views/docs/operation.html.haml
+- views/docs/collection.xml.haml
+- views/docs/index.xml.haml
+- views/docs/index.html.haml
+- views/docs/collection.html.haml
+- views/realms/show.xml.haml
 - views/realms/index.xml.haml
 - views/realms/show.html.haml
-- views/realms/show.xml.haml
-- views/root/index.html.haml
-- views/storage_snapshots/index.html.haml
-- views/storage_snapshots/index.xml.haml
-- views/storage_snapshots/show.html.haml
-- views/storage_snapshots/show.xml.haml
-- views/storage_volumes/index.html.haml
-- views/storage_volumes/index.xml.haml
-- views/storage_volumes/show.html.haml
-- views/storage_volumes/show.xml.haml
-- views/keys/index.html.haml
-- views/keys/index.xml.haml
-- views/keys/new.html.haml
-- views/keys/show.html.haml
-- views/keys/show.xml.haml
+- views/realms/index.html.haml
 - views/instance_states/show.gv.erb
 - public/favicon.ico
+- public/images/topbar-bg.png
 - public/images/grid.png
-- public/images/logo-wide.png
 - public/images/rails.png
-- public/images/topbar-bg.png
-- public/javascripts/application.js
+- public/images/logo-wide.png
 - public/javascripts/jquery-1.4.2.min.js
-- public/stylesheets/compiled/application.css
+- public/javascripts/application.js
 - public/stylesheets/compiled/ie.css
+- public/stylesheets/compiled/application.css
 - public/stylesheets/compiled/print.css
 - public/stylesheets/compiled/screen.css
 - bin/deltacloudd
 - COPYING
+- tests/instance_states_test.rb
+- tests/api_test.rb
+- tests/instances_test.rb
+- tests/hardware_profiles_test.rb
+- tests/realms_test.rb
+- tests/images_test.rb
+- tests/url_for_test.rb
 has_rdoc: true
 homepage: http://www.deltacloud.org
 licenses: []
@@ -343,32 +379,37 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 53
       segments: 
       - 1
       - 8
       - 1
       version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Deltacloud REST API
 test_files: 
-- tests/realms_test.rb
-- tests/images_test.rb
-- tests/instances_test.rb
+- tests/instance_states_test.rb
 - tests/api_test.rb
+- tests/instances_test.rb
 - tests/hardware_profiles_test.rb
-- tests/instance_states_test.rb
+- tests/realms_test.rb
+- tests/images_test.rb
+- tests/url_for_test.rb