deltacloud-core 1.1.1 → 1.1.2

data/lib/deltacloud/collections/base.rb

@@ -16,6 +16,10 @@
 module Deltacloud::Collections
   class Base < Sinatra::Base
 
+    Sinatra::Rabbit.configure do
+      enable :use_namespace
+    end
+
     include Sinatra::Rabbit
     include Sinatra::Rabbit::Features
 

data/lib/deltacloud/collections/images.rb

@@ -23,7 +23,7 @@ module Deltacloud::Collections
 
     new_route_for :images do
       halt 404 unless params[:instance_id]
-      @instance = Instance.new( :id => params[:instance_id] )
+      @instance = Deltacloud::Instance.new( :id => params[:instance_id] )
     end
 
     collection :images do

data/lib/deltacloud/collections/instances.rb

@@ -22,10 +22,10 @@ module Deltacloud::Collections
     check_features :for => lambda { |c, f| driver.class.has_feature?(c, f) }
 
     new_route_for(:instances) do
-      @instance = Instance.new( { :id=>params[:id], :image_id=>params[:image_id] } )
+      @instance = Deltacloud::Instance.new( { :id=>params[:id], :image_id=>params[:image_id] } )
       @image   = driver.image(credentials, :id => params[:image_id])
       @hardware_profiles = driver.hardware_profiles(credentials, :architecture => @image.architecture )
-      @realms = [Realm.new(:id => params[:realm_id])] if params[:realm_id]
+      @realms = [Deltacloud::Realm.new(:id => params[:realm_id])] if params[:realm_id]
       @realms ||= driver.realms(credentials)
       @firewalls = driver.firewalls(credentials) if driver.class.has_feature? :instances, :firewalls
       @keys = driver.keys(credentials) if driver.class.has_feature? :instances, :authentication_key

data/lib/deltacloud/core_ext/array.rb

@@ -14,6 +14,7 @@
 # under the License.
 
 class Array
+
   def expand_opts!(more_opts)
     self << {} unless last.is_a?(Hash)
     last.update(more_opts)

data/lib/deltacloud/core_ext/integer.rb

@@ -15,17 +15,21 @@
 # under the License.
 
 class Integer
+
   # Turn integers into strings +1st+, +2nd+, +3rd+ etc.
-  def ordinalize
-    if (11..13).include?(self % 100)
-      "#{self}th"
-    else
-      case self % 10
-      when 1; "#{self}st"
-      when 2; "#{self}nd"
-      when 3; "#{self}rd"
-      else    "#{self}th"
+  unless method_defined? 'ordinalize'
+    def ordinalize
+      if (11..13).include?(self % 100)
+        "#{self}th"
+      else
+        case self % 10
+        when 1; "#{self}st"
+        when 2; "#{self}nd"
+        when 3; "#{self}rd"
+        else    "#{self}th"
+        end
       end
     end
   end
+
 end

data/lib/deltacloud/core_ext/string.rb

@@ -15,10 +15,13 @@
 # under the License.
 
 class String
+
   # Rails defines this for a number of other classes, including Object
   # see activesupport/lib/active_support/core_ext/object/blank.rb
-  def blank?
+  unless method_defined? 'blank?'
+    def blank?
       self !~ /\S/
+    end
   end
 
   # Title case.
@@ -28,49 +31,63 @@ class String
   #
   # CREDIT: Eliazar Parra
   # Copied from facets
-  def titlecase
-    gsub(/\b\w/){ $`[-1,1] == "'" ? $& : $&.upcase }
+  unless method_defined? 'titlecase'
+    def titlecase
+      gsub(/\b\w/){ $`[-1,1] == "'" ? $& : $&.upcase }
+    end
   end
 
-  def pluralize
-    return self + 'es' if self =~ /ess$/
-    return self[0, self.length-1] + "ies" if self =~ /ty$/
-    return self if self =~ /data$/
-    self + "s"
+  unless method_defined? 'pluralize'
+    def pluralize
+      return self + 'es' if self =~ /ess$/
+      return self[0, self.length-1] + "ies" if self =~ /ty$/
+      return self if self =~ /data$/
+      self + "s"
+    end
   end
 
-  def singularize
-    return self.gsub(/ies$/, 'y') if self =~ /ies$/
-    return self.gsub(/es$/, '') if self =~ /sses$/
-    self.gsub(/s$/, '')
+  unless method_defined? 'singularize'
+    def singularize
+      return self.gsub(/ies$/, 'y') if self =~ /ies$/
+      return self.gsub(/es$/, '') if self =~ /sses$/
+      self.gsub(/s$/, '')
+    end
   end
 
-  def underscore
-    return self.downcase if self =~ /VSPs$/i
-    gsub(/::/, '/').
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-    tr("-", "_").
-    downcase
+  unless method_defined? 'underscore'
+    def underscore
+      return self.downcase if self =~ /VSPs$/i
+      gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+    end
   end
 
-  def camelize(lowercase_first_letter=nil)
-    s = split('_').map { |w| w.capitalize }.join
-    lowercase_first_letter ? s.uncapitalize : s
+  unless method_defined? 'camelize'
+    def camelize(lowercase_first_letter=nil)
+      s = split('_').map { |w| w.capitalize }.join
+      lowercase_first_letter ? s.uncapitalize : s
+    end
   end
 
-  def uncapitalize
-    self[0, 1].downcase + self[1..-1]
+  unless method_defined? 'uncapitalize'
+    def uncapitalize
+      self[0, 1].downcase + self[1..-1]
+    end
   end
 
   def upcase_first
     self[0, 1].upcase + self[1..-1]
   end
 
-  def truncate(length = 10)
-    return self if self.length <= length
-    end_string = "...#{self[(self.length-(length/2))..self.length]}"
-    "#{self[0..(length/2)]}#{end_string}"
+  unless method_defined? 'truncate'
+    def truncate(length = 10)
+      return self if self.length <= length
+      end_string = "...#{self[(self.length-(length/2))..self.length]}"
+      "#{self[0..(length/2)]}#{end_string}"
+    end
   end
 
   def remove_matrix_params

data/lib/deltacloud/drivers/arubacloud/arubacloud_driver.rb

@@ -61,15 +61,6 @@ class ArubacloudDriver < Deltacloud::BaseDriver
     architecture ['x86_64', 'i386']
   end
 
-  def valid_credentials?(credentials)
-    begin
-      new_client(credentials)
-    rescue
-      return false
-    end
-    true
-  end
-
   def realms(credentials, opts=nil)
     client = new_client(credentials)
     safely do

data/lib/deltacloud/drivers/base_driver.rb

@@ -25,6 +25,7 @@ module Deltacloud
   class BaseDriver
 
     include Exceptions
+    include Deltacloud
 
     STATE_MACHINE_OPTS = {
       :all_states => [:start, :pending, :running, :stopping, :stopped, :finish, :error],
@@ -39,13 +40,15 @@ module Deltacloud
       @features ||= {}
     end
 
-    def self.feature(collection, feature_name)
-      return if has_feature?(collection, feature_name)
-      constraints[collection] ||= {}
-      constraints[collection][feature_name] ||= {}
-      constraints[collection][feature_name].merge!(yield) if block_given?
-      features[collection] ||= []
-      features[collection] << feature_name
+    def self.feature(collection, *feature_list)
+      feature_list.each do |feature_name|
+        next if has_feature?(collection, feature_name)
+        constraints[collection] ||= {}
+        constraints[collection][feature_name] ||= {}
+        constraints[collection][feature_name].merge!(yield) if block_given?
+        features[collection] ||= []
+        features[collection] << feature_name
+      end
     end
 
     def self.constraints(opts={})
@@ -144,7 +147,7 @@ module Deltacloud
     end
 
     def has_capability?(method)
-      method = (RUBY_VERSION =~ /^1\.9/) ? method : method.to_s
+      method = (RUBY_VERSION < '1.9') ? method.to_s : method
       # Prevent has_capability fail when driver is inherited from another
       # driver, like Eucalyptus
       superclass_methods = self.class.superclass.name == 'Deltacloud::BaseDriver' ?
@@ -154,7 +157,7 @@ module Deltacloud
 
     def supported_collections(credentials)
       collection_arr = []
-      Deltacloud::Collections.deltacloud_modules.each do |m|
+      Deltacloud::Collections.modules(:deltacloud).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
@@ -260,15 +263,29 @@ module Deltacloud
     MEMBER_SHOW_METHODS = [ :realm, :image, :instance, :storage_volume, :bucket, :blob,
                             :key, :firewall ] unless defined?(MEMBER_SHOW_METHODS)
 
-    def filter_on(collection, attribute, opts)
+    def filter_on(collection, opts, *attributes)
+      opts, attributes = attributes.pop, [opts] if !opts.nil? and !(opts.is_a?(Hash))
+      # FIXME: ^^ This is just to keep backward compatibility until
+      # drivers will be fixed to use the new syntax.
+      #
+      # filter_on instances, :opts, [ :id, :state, :realm_id]
+      #
+      # instead of old:
+      #
+      # filter_on instances, :id, opts
+      # filter_on instances, :state, opts
+      # filter_on instances, :realm_id, opts
+
       return collection if opts.nil?
-      return collection if opts[attribute].nil?
-      filter = opts[attribute]
-      if ( filter.is_a?( Array ) )
-        return collection.select{|e| filter.include?( e.send(attribute) ) }
-      else
-        return collection.select{|e| filter == e.send(attribute) }
+      attributes.each do |attribute|
+        next unless filter = opts[attribute]
+        if ( filter.is_a?( Array ) )
+          collection.select! { |e| filter.include?( e.send(attribute) ) }
+        else
+          collection.select! { |e| filter == e.send(attribute) }
+        end
       end
+      collection
     end
 
     def catched_exceptions_list
@@ -284,6 +301,18 @@ module Deltacloud
     def configured_providers
       []
     end
+
+    def valid_credentials?(credentials)
+      begin
+        new_client(credentials)
+      rescue  Deltacloud::Exceptions::AuthenticationFailure
+        return false
+      rescue => e
+        safely { raise e }
+      end
+      true
+    end
+
   end
 
 end

data/lib/deltacloud/drivers/digitalocean/digitalocean_driver.rb

@@ -20,7 +20,7 @@ module Deltacloud
     module Digitalocean
       class DigitaloceanDriver < Deltacloud::BaseDriver
 
-        feature :instances, :user_name
+        feature :instances, :user_name, :authentication_key
         feature :images, :owner_id
 
         define_instance_states do
@@ -30,6 +30,7 @@ module Deltacloud
           running.to( :stopping )       .on( :stop )
           running.to( :finish )         .on( :destroy )
           stopped.to( :running )        .on( :start )
+          stopped.to( :finish)          .on( :destroy )
           stopping.to( :stopped )       .automatically
           stopped.to( :finish )         .automatically
           error.from(:running, :pending, :stopping)
@@ -45,7 +46,7 @@ module Deltacloud
               size = do_client.get("sizes/#{opts[:id]}")["size"]
               results << hardware_profile_from(size)
             else
-              sizes = do_client.get("sizes")["sizes"].each do |s|
+              do_client.get("sizes")["sizes"].each do |s|
                 size = do_client.get("sizes/#{s['id']}")["size"]
                 results << hardware_profile_from(size)
               end
@@ -67,14 +68,15 @@ module Deltacloud
 
         def realms(credentials, opts={})
           safely do
-            new_client(credentials).get('regions')['regions'].map do |r|
+            realms = new_client(credentials).get('regions')['regions'].map do |r|
               Realm.new(
-                :id => r['id'],
+                :id => r['id'].to_s,
                 :name => r['name'],
                 :state => 'AVAILABLE',
                 :limit => :unlimited
               )
             end
+            filter_on(realms, opts, :id)
           end
         end
 
@@ -133,9 +135,16 @@ module Deltacloud
           safely do
             client = new_client(credentials)
             args = { :image_id => image_id }
-            args.merge!(:region_id => opts[:realm_id]) if opts[:realm_id]
-            args.merge!(:size_id => opts[:hwp_id]) if opts[:hwp_id]
-            args.merge!(:name => opts[:name] || "inst#{Time.now.to_i}")
+            # Defaults to first realm if realm_id not set
+            opts[:realm_id] ||= '1'
+            args.merge!(:region_id => opts[:realm_id])
+            # Defaults to first size if hwp_id not set
+            opts[:hwp_id] ||= '66'
+            args.merge!(:size_id => opts[:hwp_id])
+            # Default to 'inst-timestamp if name is not set'
+            opts[:name] ||= "inst-#{Time.now.to_i}"
+            args.merge!(:name => opts[:name])
+            args.merge!(:ssh_key_ids => opts[:keyname]) if opts[:keyname]
             convert_instance(
               credentials.user,
               client.get("droplets/new", args)['droplet']
@@ -167,8 +176,48 @@ module Deltacloud
           end
         end
 
+        def keys(credentials, opts={})
+          client = new_client(credentials)
+          safely do
+            client.get('ssh_keys')['ssh_keys'].map do |k|
+              convert_key(k)
+            end
+          end
+        end
+
+        def key(credentials, opts={})
+          client = new_client(credentials)
+          safely do
+            convert_key(client.get("ssh_keys/#{opts[:id]}")["ssh_key"])
+          end
+        end
+
+        def destroy_key(credentials, opts={})
+          client = new_client(credentials)
+          original_key = key(credentials, opts)
+          safely do
+            client.get("ssh_keys/#{opts[:id]}/destroy")
+            original_key.state = 'deleted'
+            original_key
+          end
+        end
+
+        def create_key(credentials, opts={})
+          client = new_client(credentials)
+          convert_key(
+            client.get(
+              "ssh_keys/new",
+              :name => opts[:key_name],
+              :ssh_pub_key => opts[:public_key])['ssh_key']
+          )
+        end
+
         exceptions do
 
+          on (/ERROR Unable to verify credentials.*/) do
+            status 401
+          end
+
           on(/InternalServerError/) do
             status 502
           end
@@ -183,6 +232,17 @@ module Deltacloud
 
         end
 
+        def valid_credentials?(credentials)
+          begin
+            hardware_profile_ids(credentials)
+          rescue  Deltacloud::Exceptions::AuthenticationFailure
+            return false
+          rescue => e
+            safely { raise e }
+          end
+          true
+        end
+
         private
 
         class Client
@@ -204,7 +264,7 @@ module Deltacloud
             json_result = JSON::parse(result)
             if json_result['status'] != 'OK'
               p result
-              error_message = json_result['error_message'] || json_result['status']
+              error_message = json_result['error_message'] || "#{json_result['status']} #{json_result['description']}"
               raise error_message
             end
             json_result
@@ -221,6 +281,16 @@ module Deltacloud
           return 'i386' if name.include? 'x32'
         end
 
+        def convert_key(k)
+          Key.new(
+            :id => k['id'],
+            :name => k['name'],
+            :credential_type => :key,
+            :pem_rsa_key => k['ssh_pub_key'],
+            :state => 'available'
+          )
+        end
+
         def convert_state(status)
           case status
             when 'active' then 'RUNNING'