deltacloud-core 1.0.1 → 1.0.2

data/lib/deltacloud/drivers/vsphere/vsphere_driver.rb

@@ -73,7 +73,7 @@ module Deltacloud::Drivers::Vsphere
 
     # Images are virtual machines with 'template' flag set to be true.
     # Thus we're getting them using find_vm and list_virtual_machines
-    def images(credentials, opts=nil)
+    def images(credentials, opts={})
       cloud = new_client(credentials)
       img_arr = []
       profiles = hardware_profiles(credentials)
@@ -123,7 +123,7 @@ module Deltacloud::Drivers::Vsphere
     end
 
     # List all datacenters managed by the vSphere or vCenter entrypoint.
-    def realms(credentials, opts=nil)
+    def realms(credentials, opts={})
       vsphere = new_client(credentials)
       safely do
         if opts and opts[:id]
@@ -140,7 +140,7 @@ module Deltacloud::Drivers::Vsphere
 
     # List all running instances, across all datacenters. DeltaCloud API does
     # not yet support filtering instances by realm.
-    def instances(credentials, opts=nil)
+    def instances(credentials, opts={})
       cloud = new_client(credentials)
       inst_arr, machine_vms, pending_vms = [], [], []
       safely do
@@ -212,7 +212,7 @@ module Deltacloud::Drivers::Vsphere
     end
 
 
-    def create_instance(credentials, image_id, opts)
+    def create_instance(credentials, image_id, opts={})
       vsphere = new_client(credentials)
       safely do
         if opts[:hwp_cpu]

data/lib/deltacloud/helpers.rb

@@ -66,6 +66,10 @@ module Deltacloud::Collections
 
     after do
       headers 'Server' => 'Apache-Deltacloud/' + settings.version
+      headers 'X-Deltacloud-Driver' => driver_name
+      if provider_name
+        headers 'X-Deltacloud-Provider' => provider_name
+      end
     end
 
     def self.new_route_for(route, &block)
@@ -79,10 +83,6 @@ module Deltacloud::Collections
       end
     end
 
-    def self.check_capability(opts={})
-      Sinatra::Rabbit.set :check_capability, opts[:for]
-    end
-
     def self.check_features(opts={})
       Sinatra::Rabbit.set :check_features, opts[:for]
     end

data/lib/deltacloud/helpers/blob_stream_helper.rb

@@ -25,10 +25,7 @@ begin
     AsyncResponse = [-1, {}, []].freeze
     def self.call(context, credentials, params)
      body = DeferrableBody.new
-      #Get the headers out asap. Don't specify a content-type let
-      #the client guess and if they can't they SHOULD default to
-      #'application/octet-stream' anyway as per:
-      #http://www.w3.org/Protocols/rfc2616/rfc2616-sec7.html#sec7.2.1
+      #Get the headers out asap.
       EM.next_tick { context.env['async.callback'].call [200, {
         'Content-Type' => "#{params['content_type']}",
         'Content-Disposition' => params["content_disposition"],
@@ -36,9 +33,9 @@ begin
       }
       #call the driver from here. the driver method yields for every chunk
       #of blob it receives. Then use body.call to write that chunk as received.
-      context.driver.blob_data(credentials, params[:id], params[:blob_id], params) {|chunk| body.call ["#{chunk}"]} #close blob_data block
+      context.driver.blob_data(credentials, params[:id], params[:blob_id], params) {|chunk| body.call [chunk]} #close blob_data block
       body.succeed
-      AsyncResponse # Tell Thin to not close connection & work other requests
+      AsyncResponse.dup # Tell Thin to not close connection & work other requests
     end
   end
 
@@ -54,6 +51,7 @@ begin
     def each(&blk)
       @body_callback = blk
     end
+
   end
 rescue LoadError => e
   # EventMachine isn't available, disable blob streaming

data/lib/deltacloud/helpers/deltacloud_helper.rb

@@ -18,6 +18,22 @@ module Deltacloud::Helpers
 
     require 'benchmark'
 
+    def supported_collections
+      collection_arr = []
+      Deltacloud::Collections.deltacloud_modules.each do |m|
+        m.collections.each do |c|
+          # Get the required capability for the :index operation (like 'realms' or 'instance_state_machine')
+          index_operation_capability = c.operation(:index).required_capability
+          # Then use this capability to check if the 'capability' lambda defined
+          # for the Sinatra::Base class evaluate to 'true'
+          next if m.settings.respond_to?(:capability) and !m.settings.capability(index_operation_capability)
+          yield c if block_given?
+          collection_arr << c
+        end
+      end
+      collection_arr
+    end
+
     def auth_feature_name
       return 'key' if driver.class.has_feature?(:instances, :authentication_key)
       return 'password' if driver.class.has_feature?(:instances, :authentication_password)
@@ -136,7 +152,7 @@ module Deltacloud::Helpers
     end
 
     def render_cdata(text)
-      "<![CDATA[#{text.strip}]]>"
+      "<![CDATA[#{text.strip}]]>" unless text.nil?
     end
 
     def link_to_action(action, url, method)

data/lib/deltacloud/helpers/driver_helper.rb

@@ -22,7 +22,11 @@ module Deltacloud::Helpers
     end
 
     def driver_name
-      Thread.current[:driver] ||= ENV['API_DRIVER']
+      Thread.current[:driver] ||= Deltacloud.default_frontend.default_driver.to_s
+    end
+
+    def provider_name
+      Thread.current[:provider] || ENV['API_PROVIDER']
     end
 
     def driver_class_name
@@ -38,14 +42,14 @@ module Deltacloud::Helpers
         m = Deltacloud::Drivers.const_get(driver_class_name)
         m.const_get(driver_class_name + "Driver").new
       rescue NameError
-        raise "[ERROR] The driver class name is not defined as #{driver_class_name}Driver"
+        nil
       end
     end
 
     def driver
       $:.unshift File.join(File.dirname(__FILE__), '..', '..')
       begin
-        require_relative driver_source_name
+        require_relative(driver_source_name) unless driver_class
         driver_class
       rescue LoadError => e
         raise "[ERROR] The driver '#{driver_name}' is unknown or not installed (#{driver_source_name})\n" +

data/lib/deltacloud/helpers/url_helper.rb

@@ -35,9 +35,9 @@ module Sinatra
           t = $1
           if t.match(/^(stop|reboot|start|attach|detach)_/)
             action = $1
-            api_url_for(t.pluralize.split('_').last + '/' + args.first + '/' + action, :full)
+            api_url_for(t.pluralize.split('_').last + '/' + args.first.to_s + '/' + action, :full)
           elsif t.match(/^(destroy|update)_/)
-            api_url_for(t.pluralize.split('_').last + '/' + args.first, :full)
+            api_url_for(t.pluralize.split('_').last + '/' + args.first.to_s, :full)
           else
             api_url_for(t.pluralize, :full) + '/' + "#{args.first}"
           end
@@ -79,7 +79,7 @@ module Sinatra
     def url_for url_fragment, mode=:path_only
       case mode
       when :path_only
-        base = request.script_name.empty? ? Deltacloud[ENV['API_FRONTEND'] || :deltacloud].root_url : request.script_name
+        base = request.script_name.empty? ? Deltacloud.default_frontend.root_url : request.script_name
       when :full
         scheme = request.scheme
         port = request.port
@@ -96,7 +96,7 @@ module Sinatra
         else
           port = ":#{port}"
         end
-        base = "#{scheme}://#{request_host}#{port}#{request.script_name.empty? ? Deltacloud[ENV['API_FRONTEND'] || :deltacloud].root_url : request.script_name}"
+        base = "#{scheme}://#{request_host}#{port}#{request.script_name.empty? ? settings.config.root_url : request.script_name}"
       else
         raise TypeError, "Unknown url_for mode #{mode}"
       end

data/lib/deltacloud/models/address.rb

@@ -22,7 +22,7 @@ class Address < BaseModel
   end
 
   def associated?
-    true unless self.instance_id.nil?
+    !self.instance_id.nil?
   end
 
 end

data/lib/deltacloud/models/base_model.rb

@@ -44,18 +44,4 @@ class BaseModel
     @id
   end
 
-  def to_hash
-    out = {}
-    self.attributes.each do |attribute|
-      if self.send(:"#{attribute}")
-        out.merge!({ attribute => self.send(:"#{attribute}") } )
-      end
-    end
-    out
-  end
-
-  def to_json(*a)
-    self.to_hash.to_json(*a)
-  end
-
 end

data/lib/deltacloud/models/bucket.rb

@@ -20,18 +20,8 @@ class Bucket < BaseModel
   attr_accessor :size
   attr_accessor :blob_list
 
-  alias :to_hash_original :to_hash
-
   def blob_list
     @blob_list || []
   end
 
-  def to_hash
-    h = self.to_hash_original
-    unless blob_list.nil?
-      h[:blob_list] = self.blob_list.collect { |blob| { :id => blob,
-        :href => "#{settings.root_url}/buckets/#{self.id}/#{blob}"}}
-    end
-    return h
-  end
 end

data/lib/deltacloud/models/hardware_profile.rb

@@ -154,35 +154,14 @@ module Deltacloud
     end
 
     def default?(prop, v)
-      p = @properties[prop.to_sym]
-      p && p.default.to_s == v
-    end
-
-    def to_hash
-      props = []
-      self.each_property do |p|
-        if p.kind.eql? :fixed
-          props << { :kind => p.kind, :value => p.value, :name => p.name, :unit => p.unit }
-        else
-          param = { :operation => "create", :method => "post", :name => p.name }
-          if p.kind.eql? :range
-            param[:range] = { :first => p.first, :last => p.last }
-          elsif p.kind.eql? :enum
-            param[:enum] = p.values.collect { |v| { :entry => v } }
-          end
-          param
-          props << { :kind => p.kind, :value => p.default, :name => p.name, :unit => p.unit, :param => param }
-        end
-      end
-      {
-        :id => self.name,
-        :properties => props
-      }
+      property(prop) && property(prop).default.to_s == v
     end
 
     def include?(prop, v)
-      p = @properties[prop]
-      p.nil? || p.include?(v)
+      return false unless p = property(prop)
+      return true if p.kind == :range and (p.first..p.last).include?(v)
+      return true if p.kind == :enum and p.values.include?(v)
+      false
     end
 
     def params

data/lib/deltacloud/models/image.rb

@@ -24,16 +24,4 @@ class Image < BaseModel
   attr_accessor :state
   attr_accessor :hardware_profiles
 
-  alias :to_hash_original :to_hash
-
-  def to_hash
-    h = self.to_hash_original
-    h.merge({
-      :actions => [ :create_instance => {
-        :method => 'post',
-        :href => "#{settings.root_url}/instances;image_id=#{self.id}"
-      }]
-    })
-  end
-
 end

data/lib/deltacloud/models/instance.rb

@@ -14,8 +14,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+require 'timeout'
+
 class Instance < BaseModel
 
+  include Timeout
+
   attr_accessor :owner_id
   attr_accessor :image_id
   attr_accessor :name
@@ -42,10 +46,6 @@ class Instance < BaseModel
     self.create_image
   end
 
-  def to_s
-    name
-  end
-
   def hardware_profile
     instance_profile
   end
@@ -62,8 +62,8 @@ class Instance < BaseModel
   end
 
   def method_missing(name, *args)
-    if name =~ /is_(\w+)\?/
-      return true if self.state.downcase.eql?($1)
+    if name.to_s =~ /is_(\w+)\?/
+      self.state.downcase.eql?($1)
     else
       raise NoMethodError.new(name.to_s)
     end
@@ -73,20 +73,4 @@ class Instance < BaseModel
     return true unless authn_error.nil?
   end
 
-  alias :to_hash_original :to_hash
-
-  def to_hash
-    h = self.to_hash_original
-    h[:public_addresses] = h[:public_addresses].collect do |address|
-      { :address => { :type => address.address_type, :value => address } }
-    end
-    h[:actions] = self.actions.collect do |action|
-      { :"#{action}" => {
-        :method => collections[:instances].operations[action.to_sym].method,
-        :href => collections[:instances].operations[action.to_sym].path.gsub(':id', self.id)
-      }}
-    end
-    h
-  end
-
 end

data/lib/deltacloud/models/key.rb

@@ -28,11 +28,11 @@ class Key < BaseModel
   end
 
   def is_password?
-    true if @credential_type.eql?(:password)
+    @credential_type.eql?(:password)
   end
 
   def is_key?
-    true if @credential_type.eql?(:key)
+    @credential_type.eql?(:key)
   end
 
   # Mock fingerprint generator

data/lib/deltacloud/models/metric.rb

@@ -19,7 +19,7 @@ class Metric < BaseModel
   attr_accessor :properties
 
   def unknown?
-    true if self.entity == :unknown
+    self.entity == :unknown
   end
 
   def add_property(name, values=nil)

data/lib/deltacloud/models/storage_snapshot.rb

@@ -22,4 +22,8 @@ class StorageSnapshot < BaseModel
   attr_accessor :storage_volume_id
   attr_accessor :created
 
+  def is_completed?
+    state == 'completed'
+  end
+
 end

data/lib/deltacloud/server.rb

@@ -31,7 +31,9 @@ module Deltacloud
   class API < Collections::Base
 
     # Enable logging
-    use Rack::CommonLogger
+    # NOTE: Jruby use different logging mechanism not complatible with our
+    # logger.
+    use Deltacloud[:deltacloud].logger unless RUBY_PLATFORM == 'java'
     use Rack::Date
     use Rack::ETag
     use Rack::MatrixParams
@@ -55,13 +57,17 @@ module Deltacloud
       end
     end
 
+    options Deltacloud.config[:deltacloud].root_url + '/?' do
+      headers 'Allow' => supported_collections { |c| c.collection_name }.join(',')
+    end
+
     post Deltacloud.config[:deltacloud].root_url + '/?' do
       param_driver, param_provider = params["driver"], params["provider"]
       if param_driver
         redirect "#{Deltacloud.config[:deltacloud].root_url}\;driver=#{param_driver}", 301
       elsif param_provider && param_provider != "default"
 #FIXME NEEDS A BETTER WAY OF GRABBING CURRENT DRIVER FROM MATRIX PARAMS...
-        current_matrix_driver = env["HTTP_REFERER"].match(/\;(driver)=(\w*).*$/i)
+        current_matrix_driver = env['HTTP_REFERER'] ? env["HTTP_REFERER"].match(/\;(driver)=(\w*).*$/i) : nil
         if current_matrix_driver
           redirect "#{Deltacloud.config[:deltacloud].root_url}\;driver=#{$2}\;provider=#{param_provider}", 301
         else

data/lib/deltacloud_rack.rb

@@ -13,15 +13,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-unless Kernel.respond_to?(:require_relative)
-  module Kernel
-    def require_relative(path)
-      require File.join(File.dirname(caller[0]), path.to_str)
-    end
-  end
-end
+require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative './deltacloud/core_ext'
+require_relative './sinatra/rack_logger'
 
 module Deltacloud
 
@@ -31,7 +26,7 @@ module Deltacloud
 
   def self.configure(frontend=:deltacloud, &block)
     frontend = frontend.to_sym
-    config[frontend] = Server.new(&block)
+    config[frontend] ||= Server.new(frontend, &block)
     self
   end
 
@@ -41,20 +36,37 @@ module Deltacloud
 
   def self.require_frontend!(frontend=:deltacloud)
     frontend = frontend.to_sym
-    require File.join(File.dirname(__FILE__), frontend.to_s, 'server.rb')
+    return false if frontend_required?(frontend)
+    require_relative File.join(frontend.to_s, 'server.rb')
     Deltacloud[frontend].klass eval('::'+Deltacloud[frontend].klass)
   end
 
+  def self.frontend_required?(frontend)
+    true unless Deltacloud[frontend].klass.kind_of? String
+  end
+
+  def self.default_frontend(frontend=nil)
+    @default_frontend = frontend unless frontend.nil?
+    raise "Could not determine default API frontend" if @default_frontend.nil? and !config[:deltacloud]
+    @default_frontend || config[:deltacloud]
+  end
+
   class Server
 
+    attr_reader :name
     attr_reader :root_url
     attr_reader :version
     attr_reader :klass
+    attr_reader :logger
+    attr_reader :default_driver
 
-    def initialize(opts={}, &block)
+    def initialize(frontend, opts={}, &block)
+      @name=frontend.to_sym
       @root_url = opts[:root_url]
       @version = opts[:version]
       @klass = opts[:klass]
+      @logger = opts[:logger] || Rack::DeltacloudLogger
+      @default_driver = opts[:default_driver] || :mock
       instance_eval(&block)
     end
 
@@ -74,6 +86,24 @@ module Deltacloud
       @klass = k
     end
 
+    def default_driver(drv=nil)
+      return @default_driver if drv.nil?
+      @default_driver = drv
+    end
+
+    def logger(logger=nil)
+      return @logger if logger.nil?
+      @logger = logger
+    end
+
+    def require!
+      Deltacloud.require_frontend!(@name)
+    end
+
+    def default_frontend!
+      Deltacloud.default_frontend(self)
+    end
+
   end
 
 end