deltacloud-core 1.0.4 → 1.0.5

data/lib/deltacloud/drivers/mock/data/images/img1.yml

@@ -5,3 +5,4 @@
 :id: img1
 :name: img1
 :description: Fedora 10
+:creation_time: "Thu Oct 25 14:27:53 CEST 2012"

data/lib/deltacloud/drivers/mock/data/images/img2.yml

@@ -5,3 +5,4 @@
 :id: img2
 :name: img2
 :description: Fedora 10
+:creation_time: "Thu Oct 25 14:27:53 CEST 2012"

data/lib/deltacloud/drivers/mock/data/images/img3.yml

@@ -5,3 +5,4 @@
 :id: img3
 :name: img3
 :description: JBoss
+:creation_time: "Thu Oct 25 14:27:53 CEST 2012"

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

@@ -56,10 +56,10 @@ module Deltacloud::Drivers::Mock
       files(collection).map { |f| File::basename(f, ".yml") }
     end
 
-    def load(collection, id)
+    def load_collection(collection, id)
       fname = file(collection, id)
       begin
-        YAML.load(File.read(fname))
+        YAML.load_file(fname)
       rescue Errno::ENOENT
         nil
       end
@@ -73,12 +73,12 @@ module Deltacloud::Drivers::Mock
     # Return the object with id +id+ of class +klass+ from the collection
     # derived from the classes name
     def build(klass, id)
-      klass.new(load(collection_name(klass), id))
+      klass.new(load_collection(collection_name(klass), id))
     end
 
     # Return an array of hashes of all the resources in the collection
     def load_all(collection)
-      members(collection).map { |id| load(collection, id) }
+      members(collection).map { |id| load_collection(collection, id) }
     end
 
     # Return an array of model objects of the resources in the collection

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

@@ -158,7 +158,7 @@ module Deltacloud::Drivers::Mock
 
     def instance(credentials, opts={})
       check_credentials( credentials )
-      if instance = @client.load(:instances, opts[:id])
+      if instance = @client.load_collection(:instances, opts[:id])
         Instance.new(instance)
       end
     end
@@ -217,7 +217,7 @@ module Deltacloud::Drivers::Mock
     end
 
     def update_instance_state(credentials, id, state)
-      instance  = @client.load(:instances, id)
+      instance  = @client.load_collection(:instances, id)
       instance[:state] = state
       instance[:actions] = instance_actions_for( instance[:state] )
       @client.store(:instances, instance)
@@ -325,7 +325,7 @@ module Deltacloud::Drivers::Mock
         :pem_rsa_key => Key::generate_mock_pem
       }
       safely do
-        raise "KeyExist" if @client.load(:keys, key_hash[:id])
+        raise "KeyExist" if @client.load_collection(:keys, key_hash[:id])
         @client.store(:keys, key_hash)
       end
       return Key.new(key_hash)
@@ -351,16 +351,16 @@ module Deltacloud::Drivers::Mock
 
     def destroy_address(credentials, opts={})
       check_credentials(credentials)
-      address = @client.load(:addresses, opts[:id])
+      address = @client.load_collection(:addresses, opts[:id])
       raise "AddressInUse" unless address[:instance_id].nil?
       @client.destroy(:addresses, opts[:id])
     end
 
     def associate_address(credentials, opts={})
       check_credentials(credentials)
-      address = @client.load(:addresses, opts[:id])
+      address = @client.load_collection(:addresses, opts[:id])
       raise "AddressInUse" unless address[:instance_id].nil?
-      instance = @client.load(:instances, opts[:instance_id])
+      instance = @client.load_collection(:instances, opts[:instance_id])
       address[:instance_id] = instance[:id]
       instance[:public_addresses] = [InstanceAddress.new(address[:id])]
       @client.store(:addresses, address)
@@ -369,9 +369,9 @@ module Deltacloud::Drivers::Mock
 
     def disassociate_address(credentials, opts={})
       check_credentials(credentials)
-      address = @client.load(:addresses, opts[:id])
+      address = @client.load_collection(:addresses, opts[:id])
       raise "AddressNotInUse" unless address[:instance_id]
-      instance = @client.load(:instances, address[:instance_id])
+      instance = @client.load_collection(:instances, address[:instance_id])
       address[:instance_id] = nil
       instance[:public_addresses] = [InstanceAddress.new("#{instance[:image_id]}.#{instance[:id]}.public.com", :type => :hostname)]
       @client.store(:addresses, address)
@@ -434,7 +434,7 @@ module Deltacloud::Drivers::Mock
     #--
     def blob_data(credentials, bucket_id, blob_id, opts = {})
       check_credentials(credentials)
-      if blob = @client.load(:blobs, blob_id)
+      if blob = @client.load_collection(:blobs, blob_id)
         #give event machine a chance
         sleep 1
         blob[:content].split('').each {|part| yield part}
@@ -478,7 +478,7 @@ module Deltacloud::Drivers::Mock
     def delete_blob(credentials, bucket_id, blob_id, opts={})
       check_credentials(credentials)
       safely do
-        raise "NotExistentBlob" unless @client.load(:blobs, blob_id)
+        raise "NotExistentBlob" unless @client.load_collection(:blobs, blob_id)
         @client.destroy(:blobs, blob_id)
       end
     end
@@ -488,7 +488,7 @@ module Deltacloud::Drivers::Mock
     #--
     def blob_metadata(credentials, opts={})
       check_credentials(credentials)
-      if blob = @client.load(:blobs, opts[:id])
+      if blob = @client.load_collection(:blobs, opts[:id])
         blob[:user_metadata]
       else
         nil
@@ -501,7 +501,7 @@ module Deltacloud::Drivers::Mock
     def update_blob_metadata(credentials, opts={})
       check_credentials(credentials)
       safely do
-        blob = @client.load(:blobs, opts[:id])
+        blob = @client.load_collection(:blobs, opts[:id])
         return false unless blob
         blob[:user_metadata] = BlobHelper::rename_metadata_headers(opts['meta_hash'], '')
         @client.store(:blobs, blob)
@@ -587,8 +587,8 @@ module Deltacloud::Drivers::Mock
     end
 
     def attach_volume_instance(volume_id, device, instance_id)
-      volume = @client.load(:storage_volumes, volume_id)
-      instance = @client.load(:instances, instance_id)
+      volume = @client.load_collection(:storage_volumes, volume_id)
+      instance = @client.load_collection(:instances, instance_id)
       volume[:instance_id] = instance_id
       volume[:device] = device
       volume[:state] = "IN-USE"
@@ -600,8 +600,8 @@ module Deltacloud::Drivers::Mock
     end
 
     def detach_volume_instance(volume_id, instance_id)
-      volume = @client.load(:storage_volumes, volume_id)
-      instance = @client.load(:instances, instance_id)
+      volume = @client.load_collection(:storage_volumes, volume_id)
+      instance = @client.load_collection(:instances, instance_id)
       volume[:instance_id] = nil
       device = volume[:device]
       volume[:device] = nil

data/lib/deltacloud/drivers/openstack/openstack_driver.rb

@@ -16,6 +16,7 @@
 
 require 'openstack'
 require 'tempfile'
+require 'base64'
 
 module Deltacloud
   module Drivers
@@ -26,6 +27,7 @@ module Deltacloud
         feature :instances, :authentication_key
         feature :instances, :authentication_password
         feature :instances, :user_files
+        feature :instances, :user_data
         feature :images, :user_name
         feature :keys, :import_key
 
@@ -44,8 +46,8 @@ module Deltacloud
           #get the collections as defined by 'capability' and 'respond_to?' blocks
           super_collections = super
           begin
-             client = new_client(credentials, :buckets)
-          rescue Deltacloud::ExceptionHandler::NotImplemented #OpenStack::Exception::NotImplemented...
+             new_client(credentials, :buckets)
+          rescue Deltacloud::Exceptions::NotImplemented #OpenStack::Exception::NotImplemented...
              return super_collections - [Sinatra::Rabbit::BucketsCollection]
           end
           super_collections
@@ -110,8 +112,8 @@ module Deltacloud
           begin
             image = os.get_image(image_id)
             image.delete!
-          rescue => e
-            raise Deltacloud::ExceptionHandler::BackendError.new(e, "ERROR: Cannot delete image with ID:#{image_id}.")
+          rescue
+            raise Deltacloud::Exceptions.exception_from_status(500, "Cannot delete image with id #{image_id}")
           end
         end
 
@@ -165,13 +167,16 @@ module Deltacloud
           params[:name] = (opts[:name] && opts[:name].length>0)? opts[:name] : "server#{Time.now.to_s}"
           params[:imageRef] = image_id
           params[:flavorRef] =  (opts[:hwp_id] && opts[:hwp_id].length>0) ?
-                          opts[:hwp_id] : hardware_profiles(credentials).first.name
+                          opts[:hwp_id] : hardware_profiles(credentials).first.id
           if opts[:password] && opts[:password].length > 0
             params[:adminPass]=opts[:password]
           end
           if opts[:keyname] && opts[:keyname].length > 0
             params[:key_name]=opts[:keyname]
-          end
+	  end
+	  if opts[:user_data] && opts[:user_data].length > 0
+	    params[:user_data]=Base64.encode64(opts[:user_data])
+	  end
           safely do
             server = os.create_server(params)
             result = convert_from_server(server, os.connection.authuser)
@@ -190,11 +195,19 @@ module Deltacloud
 
         def destroy_instance(credentials, instance_id)
           os = new_client(credentials)
+          server = instance = nil
           safely do
             server = os.get_server(instance_id)
             server.delete!
-            convert_from_server(server, os.connection.authuser)
           end
+          begin
+            server.populate
+            instance = convert_from_server(server, os.connection.authuser)
+          rescue OpenStack::Exception::ItemNotFound
+            instance = convert_from_server(server, os.connection.authuser)
+            instance.state = "STOPPED"
+          end
+          instance
         end
 
         alias_method :stop_instance, :destroy_instance
@@ -371,12 +384,14 @@ private
 
         def convert_from_flavor(flavor)
           op = (flavor.class == Hash)? :fetch : :send
-          HardwareProfile.new(flavor.send(op, :id).to_s) do
+          hwp = HardwareProfile.new(flavor.send(op, :id).to_s) do
             architecture 'x86_64'
             memory flavor.send(op, :ram).to_i
             storage flavor.send(op, :disk).to_i
             cpu flavor.send(op, :vcpus).to_i
           end
+          hwp.name = flavor.send(op, :name)
+          return hwp
         end
 
         def convert_from_image(image, owner)
@@ -387,7 +402,8 @@ private
                     :description => image.send(op, :name),
                     :owner_id => owner,
                     :state => image.send(op, :status),
-                    :architecture => 'x86_64'
+                    :architecture => 'x86_64',
+                    :creation_time => image.send(op, :created)
                     })
         end
 

data/lib/deltacloud/drivers/rhevm/rhevm_driver.rb

@@ -309,7 +309,8 @@ class RhevmDriver < Deltacloud::BaseDriver
       :owner_id => client.credentials[:username],
       :architecture => 'x86_64', # All RHEV-M VMs are x86_64
       :hardware_profiles => hardware_profiles(nil),
-      :state => img.status.strip.upcase
+      :state => img.status.gsub('\\', '').strip.upcase,
+      :creation_time => img.creation_time
     )
   end
 

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

@@ -139,7 +139,7 @@ VAPP_STATE_MAP = { "0" =>  "PENDING", "1" =>  "PENDING", "2" =>  "STOPPED", "4"
     end
     unless ( (terremark_hwp.include?(:cpu, opts[:hwp_cpu].to_i)) &&
               (terremark_hwp.include?(:memory, opts[:hwp_memory].to_i)) ) then
-        raise Deltacloud::ExceptionHandler::ValidationFailure.new(
+        raise Deltacloud::Exceptions::ValidationFailure.new(
           StandardError.new("Error with cpu and/or memory values. you said cpu->#{opts[:hwp_cpu]} and mem->#{opts[:hwp_memory]}")
         )
     end

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

@@ -104,6 +104,7 @@ module Deltacloud::Drivers::Vsphere
             :owner_id => credentials.user,
             :description => properties[:full_name],
             :state => image_state,
+            :creation_time => image.storage[:timestamp],
             :hardware_profiles => profiles
           )
         end
@@ -194,6 +195,7 @@ module Deltacloud::Drivers::Vsphere
             :private_addresses => [],
             :instance_profile => instance_profile,
             :actions => instance_actions_for( instance_state ),
+            :launch_time => vm.runtime.props[:bootTime],
             :create_image => true
           )
         end

data/lib/deltacloud/helpers/deltacloud_helper.rb

@@ -18,6 +18,10 @@ module Deltacloud::Helpers
 
     require 'benchmark'
 
+    def request_headers
+      env.inject({}){|acc, (k,v)| acc[$1.downcase] = v if k =~ /^http_(.*)/i; acc}
+    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)
@@ -77,15 +81,32 @@ module Deltacloud::Helpers
       end
     end
 
+    # Log errors to the same logger as we use for logging requests
+    def log
+      Deltacloud::Exceptions.logger(Deltacloud.default_frontend.logger)
+    end
+
     def report_error(code=nil)
-      @error, @code = (request.env['sinatra.error'] || @exception), code
-      @code = 500 if not @code and not @error.class.method_defined? :code
-      response.status = @code || @error.code
-      log = Deltacloud::ExceptionHandler.logger
-      message = @error.respond_to?(:message) ? @error.message : translate_error_code(@code)
+
+      if !code.nil?
+        @error = Deltacloud::Exceptions.exception_from_status(code, translate_error_code(code)[:message])
+        @code = code
+        message = @error.message
+      else
+        @error = request.env['sinatra.error'] || @exception
+        @code = @error.respond_to?(:code) ? @error.code : 500
+        message = @error.respond_to?(:message) ? @error.message : translate_error_code(code)[:message]
+      end
+
+      response.status = @code
+
       backtrace = (@error.respond_to?(:backtrace) and !@error.backtrace.nil?) ?
         "\n\n#{@error.backtrace[0..10].join("\n")}\n\n" : ''
-      log.error "[#{@code}] #{[@error.class.to_s, message].join(':')}#{backtrace}"
+
+      if @code.to_s =~ /5(\d+)/
+        log.error(@code.to_s) { "[#{@error.class.to_s}] #{message}#{backtrace}" }
+      end
+
       respond_to do |format|
         format.xml {  haml :"errors/#{@code || @error.code}", :layout => false }
         format.json { xml_to_json("errors/#{@code || @error.code}") }
@@ -307,11 +328,11 @@ module Deltacloud::Helpers
     end
 
     def bt(trace)
+      return [] unless trace
       return trace.join("\n") if params['fulltrace']
       app_path = File::expand_path("../../..", __FILE__)
       dots = false
-
-        trace = trace.map { |t| t.match(%r{^#{app_path}(.*)$}) ? "$app#{$1}" : "..." }.select do |t|
+      trace = trace.map { |t| t.match(%r{^#{app_path}(.*)$}) ? "$app#{$1}" : "..." }.select do |t|
         if t == "..."
           keep = ! dots
           dots = true

data/lib/deltacloud/models/image.rb

@@ -23,5 +23,6 @@ class Image < BaseModel
   attr_accessor :architecture
   attr_accessor :state
   attr_accessor :hardware_profiles
+  attr_accessor :creation_time
 
 end

data/lib/deltacloud/models/instance_profile.rb

@@ -40,6 +40,10 @@ class InstanceProfile < BaseModel
     name
   end
 
+  def override?(property)
+    overrides.find { |p, v| p == property }
+  end
+
   def overrides
     [:memory, :storage, :architecture, :cpu].inject({}) do |h, p|
       if v = instance_variable_get("@#{p}")

data/lib/deltacloud/version.rb

@@ -15,5 +15,5 @@
 # under the License.
 
 module Deltacloud
-  API_VERSION = '1.0.4' unless defined?(API_VERSION)
+  API_VERSION = '1.0.5' unless defined?(API_VERSION)
 end

data/lib/ec2/query_parser.rb

@@ -24,7 +24,7 @@ module Deltacloud::EC2
       :describe_key_pairs => { :method => :keys, :params => {} },
       :create_key_pair => { :method => :create_key, :params => { 'KeyName' => :key_name }},
       :delete_key_pair => { :method => :destroy_key, :params => { 'KeyName' => :id }},
-      :run_instances => { :method => :create_instance, :params => { 'ImageId' => :image_id, 'InstanceType' => :hwp_id, 'Placement.AvailabilityZone' => :realm_id }},
+      :run_instances => { :method => :create_instance, :params => { 'ImageId' => :image_id, 'InstanceType' => :hwp_id, 'Placement.AvailabilityZone' => :realm_id, 'UserData' => :user_data }},
       :stop_instances => { :method => :stop_instance, :params => { 'InstanceId.1' => :id }},
       :start_instances => { :method => :start_instance, :params => { 'InstanceId.1' => :id }},
       :reboot_instances => { :method => :reboot_instance, :params => { 'InstanceId.1' => :id }},

data/lib/sinatra/rack_accept.rb

@@ -79,7 +79,11 @@ module Rack
         end
         yield wants
 
-        if Deltacloud.default_frontend.name == :cimi
+        if request.env["SCRIPT_NAME"].include?("cimi") || Deltacloud.default_frontend.name == :cimi
+          #when cimi and neither json or xml defined... default to _something_  -  json?
+          if ([:json, :xml] & accepting_formats.keys).empty?
+            request.env['rack-accept.formats'] = {:json=>0}
+          end
           @media_type = (accepting_formats.has_key?(:xml) ? [:xml, accepting_formats[:xml]] : nil)
         end if Deltacloud.respond_to? :default_frontend
 

data/lib/sinatra/rack_logger.rb

@@ -50,6 +50,11 @@ module Rack
       self
     end
 
+    def self.error(code, &block)
+      @logger ||= ::Logger.new(log_path || $stdout)
+      @logger.error(code, &block)
+    end
+
     # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
     # lilith.local - - [07/Aug/2006 23:58:02] "GET / HTTP/1.1" 500 -
     #             %{%s - %s [%s] "%s %s%s %s" %d %s\n} %
@@ -84,7 +89,8 @@ module Rack
       params = env['rack.request.form_hash'].nil? ? '' : ' '+env['rack.request.form_hash'].to_json
 
       logger = @logger || env['rack.errors']
-      logger << VERBOSE_FORMAT % [
+      logger_method = logger.respond_to?(:info) ? :info : :puts
+      logger.send logger_method, VERBOSE_FORMAT % [
         env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
         env["REMOTE_USER"] || "-",
         now.strftime("%d/%b/%Y %H:%M:%S"),
@@ -105,7 +111,8 @@ module Rack
       length = extract_content_length(header)
 
       logger = @logger || env['rack.errors']
-      logger << FORMAT % [
+      logger_method = logger.respond_to?(:info) ? :info : :puts
+      logger.send logger_method, FORMAT % [
         env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
         env["REMOTE_USER"] || "-",
         now.strftime("%d/%b/%Y %H:%M:%S"),

data/tests/cimi/collections/machine_images_test.rb

@@ -33,12 +33,29 @@ describe CIMI::Collections::MachineImages do
     xml.root.name.must_equal 'MachineImage'
   end
 
-  it 'should allow to filter using CIMISelect' do
-    get root_url '/machine_images?CIMISelect=description'
-    status.must_equal 200
-    xml.root.name.must_equal 'Collection'
-    (xml/'description').wont_be_empty
-    (xml/'id').must_be_empty
+  describe "filtering with $select" do
+    def machines(*select)
+      url = "/machine_images"
+      url += "?$select=#{select.join(",")}" unless select.empty?
+      get root_url url
+      status.must_equal 200
+    end
+
+    it 'should filter collection members' do
+      machines :description
+      (xml/'id').wont_be_empty
+      nimages = (xml/'MachineImage').size
+      (xml/'MachineImage/description').size.must_equal nimages
+      (xml/'MachineImage/id').must_be_empty
+    end
+
+    it 'should filter by multiple attributes' do
+      machines :description, :id
+      (xml/'id').wont_be_empty
+      nimages = (xml/'MachineImage').size
+      (xml/'MachineImage/description').size.must_equal nimages
+      (xml/'MachineImage/id').size.must_equal nimages
+    end
   end
 
 end