deltacloud-core 1.1.2 → 1.1.3

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

@@ -23,6 +23,7 @@ module Deltacloud
 class RhevmDriver < Deltacloud::BaseDriver
 
   feature :instances, :user_data
+  feature :instances, :first_boot_dev
   feature :instances, :user_name do
     { :max_length => 50 }
   end
@@ -192,6 +193,7 @@ class RhevmDriver < Deltacloud::BaseDriver
       params[:cores] = opts[:hwp_cpu] if opts[:hwp_cpu]
       params[:user_data] = opts[:user_data].gsub(/\n/,'') if opts[:user_data]
       params[:fileinject_path] = "deltacloud-user-data.txt"
+      params[:first_boot_dev] = opts[:first_boot_dev] if opts[:first_boot_dev]
       convert_instance(client, client.create_vm(params))
     end
   end

data/lib/deltacloud/helpers/blob_stream_helper.rb

@@ -13,8 +13,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-include Deltacloud
-
 begin
   require 'eventmachine'
   #--

data/lib/deltacloud/helpers/deltacloud_helper.rb

@@ -75,8 +75,8 @@ module Deltacloud::Helpers
         headers['X-Backend-Runtime'] = @benchmark.real.to_s
         instance_variable_set(:"@#{model}", @elements)
         respond_to do |format|
-          format.html { haml :"#{model}/index" }
-          format.xml { haml :"#{model}/index" }
+          format.html { haml :"#{model}/index", :locals => { :elements => @elements } }
+          format.xml { haml :"#{model}/index", :locals => { :elements => @elements } }
           format.json { JSON::dump({ model => @elements.map { |el| el.to_hash(self) }}) }
         end
       else
@@ -92,8 +92,8 @@ module Deltacloud::Helpers
       instance_variable_set("@#{model}", @element)
       if @element
         respond_to do |format|
-          format.html { haml :"#{model.to_s.pluralize}/show" }
-          format.xml { haml :"#{model.to_s.pluralize}/show" }
+          format.html { haml :"#{model.to_s.pluralize}/show", :locals=>{model=>@element}}
+          format.xml { haml :"#{model.to_s.pluralize}/show" , :locals=>{model=>@element}}
           format.json { JSON::dump(model => @element.to_hash(self)) }
         end
       else
@@ -109,30 +109,29 @@ module Deltacloud::Helpers
     def report_error(code=nil, message=nil)
 
       if !code.nil?
-        @error = Deltacloud::Exceptions.exception_from_status(code, message || translate_error_code(code)[:message])
-        @code = code
-        message = @error.message
+        error = Deltacloud::Exceptions.exception_from_status(code, message || translate_error_code(code)[:message])
+        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]
+        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
+      response.status = code
 
-      backtrace = (@error.respond_to?(:backtrace) and !@error.backtrace.nil?) ?
-        "\n\n#{@error.backtrace[0..20].join("\n")}\n\n" : ''
+      backtrace = (error.respond_to?(:backtrace) and !error.backtrace.nil?) ?
+        "\n\n#{error.backtrace[0..20].join("\n")}\n\n" : ''
 
-      if @code.to_s =~ /5(\d+)/
-        log.error(@code.to_s) { "[#{@error.class.to_s}] #{message}#{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/common", :layout => false }
-        format.json { JSON::dump({ :code => @code || @error.code, :message => message, :error => @error.class.name }) }
+        format.xml {  haml :"errors/common", :layout => false, :locals => { :err => error } }
+        format.json { JSON::dump({ :code => code || error.code, :message => message, :error => error.class.name }) }
         format.html {
           begin
-            haml :"errors/common", :layout => :error
+            haml :"errors/common", :layout => :error, :locals => { :err => error }
           rescue RuntimeError
             # If the HTML representation of error is missing, then try to report
             # it through XML
@@ -167,12 +166,12 @@ module Deltacloud::Helpers
         halt 204, response
       end
 
-      unless @instance.class == Instance
+      unless @instance.class == Deltacloud::Instance
         redirect instance_url(params[:id])
       else
         response = respond_to do |format|
-          format.xml { haml :"instances/show" }
-          format.html { haml :"instances/show" }
+          format.xml { haml :"instances/show", :locals => { :instance => @instance } }
+          format.html { haml :"instances/show", :locals => { :instance => @instance } }
           format.json { JSON::dump(@instance.to_hash(self)) }
         end
         halt 202, response
@@ -325,10 +324,11 @@ module Deltacloud::Helpers
 
       def new_route_for(route, &block)
         get '/%s/new' % route.to_s do
+          @opts = {}
           instance_eval(&block) if block_given?
           respond_to do |format|
             format.html do
-              haml :"#{route}/new"
+              haml :"#{route}/new", :locals => @opts
             end
           end
         end

data/lib/deltacloud/helpers/driver_helper.rb

@@ -45,19 +45,16 @@ module Deltacloud::Helpers
     end
 
     def driver_class
-      begin
-        m = Deltacloud::Drivers.const_get(driver_class_name)
-        m.const_get(driver_class_name + "Driver").new
-      rescue NameError
-        nil
-      end
+      m = Deltacloud::Drivers.const_get(driver_class_name)
+      m.const_get(driver_class_name + "Driver").new
     end
 
     def driver
       $:.unshift File.join(File.dirname(__FILE__), '..', '..')
       begin
-        require_relative(driver_source_name) unless driver_class
         driver_class
+      rescue NameError => e
+        require_relative(driver_source_name) ? retry : raise(LoadError.new(e.message))
       rescue LoadError => e
         raise "[ERROR] The driver '#{driver_name}' is unknown or not installed (#{driver_source_name})\n" +
           "\n#{e.message}\n"

data/lib/deltacloud/helpers/rabbit_helper.rb

@@ -45,6 +45,7 @@ module Sinatra::Rabbit
       c.operations.each do |operation|
         URLHelper.instance_eval(&generate_url_helper_for(c, operation)[0])
       end
+      URLFor(c.collections)
     end
     URLHelper
   end
@@ -53,6 +54,10 @@ module Sinatra::Rabbit
     operation_name = operation.operation_name.to_s
     collection_name = collection.collection_name.to_s
 
+    if collection.subcollection?
+      collection_name = "#{collection.parent_collection.collection_name.to_s.singularize}_#{collection_name}"
+    end
+
     # Construct OPERATION_COLLECTION_URL helper
     # The :index and :create operation does not get any prefix
     #

data/lib/deltacloud/server.rb

@@ -48,11 +48,11 @@ module Deltacloud
       if params[:force_auth]
         return [401, 'Authentication failed'] unless driver.valid_credentials?(credentials)
       end
-      @collections = driver.supported_collections(credentials)
+      collections = driver.supported_collections(credentials)
       respond_to do |format|
-        format.xml { haml :"api/show" }
-        format.json { collections_to_json(@collections) }
-        format.html { haml :"api/show" }
+        format.xml { haml :"api/show", :locals => { :collections => collections } }
+        format.json { collections_to_json(collections) }
+        format.html { haml :"api/show", :locals => { :collections => collections } }
       end
     end
 

data/lib/deltacloud/version.rb

@@ -15,6 +15,6 @@
 # under the License.
 
 module Deltacloud
-  API_VERSION = '1.1.2'
+  API_VERSION = '1.1.3'
   CIMI_API_VERSION = '1.0.1'
 end

data/lib/deltacloud_rack.rb

@@ -147,7 +147,12 @@ module Deltacloud
       @logger = logger
     end
 
-    def require!
+    # Require the Deltacloud API Rack middleware
+    #
+    # opts[:initialize] = true will require 'initialize.rb'
+    #
+    def require!(opts={})
+      require_relative './initializers/mock_initialize' if opts[:mock_initialize]
       Deltacloud.require_frontend!(@name)
     end
 

data/lib/ec2/server.rb

@@ -29,7 +29,7 @@ module Deltacloud::EC2
     extend Deltacloud::Helpers::Drivers
 
     use Rack::ETag
-    use Deltacloud[:ec2].logger
+    use Deltacloud[:ec2].logger unless RUBY_PLATFORM == 'java'
 
     helpers Sinatra::AuthHelper
     helpers Deltacloud::Helpers::Drivers
@@ -38,6 +38,7 @@ module Deltacloud::EC2
     enable :xhtml
     enable :dump_errors
     enable :show_errors
+    enable :logging
     disable :show_exceptions
 
     set :config, Deltacloud[:ec2]
@@ -57,6 +58,10 @@ module Deltacloud::EC2
       headers 'Server' => 'Apache-Deltacloud-EC2/' + settings.version
     end
 
+    error Deltacloud::Exceptions::AuthenticationFailure do
+      status 401
+    end
+
     get '/' do
       headers 'Connection' => 'close'
       unless params['Action']

data/tests/cimi/collections/common.rb

@@ -15,3 +15,36 @@ Deltacloud[:cimi].require!
 Deltacloud[:cimi].default_frontend!
 
 def formats; [ 'application/xml', 'application/json' ]; end
+
+def model_class
+  resource = nil
+  resp = last_response
+  ct = resp.content_type
+  if ct == "application/json"
+    json = JSON::parse(last_response.body)
+    json["resourceURI"].wont_be_nil
+    resource = json["resourceURI"].split("/").last
+  elsif ct == "application/xml"
+    xml = Nokogiri::XML(last_response.body)
+    if xml.root.name == "Collection"
+      resource = xml.root["resourceURI"].split("/").last
+    else
+      resource = xml.root.name
+    end
+  elsif resp.body.nil? || resp.body.size == 0
+    raise "Can not construct model from empty body"
+  else
+    raise "Unexpected content type #{resp.content_type}"
+  end
+  if resource == "DiskCollection"
+    # We scope subcollections within the containing class
+    # CIMI resource_uri's don't
+    CIMI::Model::Machine::DiskCollection
+  else
+    CIMI::Model::const_get(resource)
+  end
+end
+
+def model
+  model_class.parse(last_response.body, last_response.content_type)
+end

data/tests/cimi/collections/machines_test.rb

@@ -35,6 +35,25 @@ describe CIMI::Collections::Machines do
     xml.root.name.must_equal 'Machine'
   end
 
+  it 'should have an "add" operation for the machine collection' do
+    get root_url + '/machines'
+    model.operations.wont_be_empty
+    add_ops = model.operations.select { |op| op.rel == "add" }
+    add_ops.size.must_equal 1
+  end
+
+  it "should return the disks collection for a machine" do
+    get root_url + '/machines'
+    model.operations.wont_be_empty
+    href = model.entries.first.disks[:href]
+    href.wont_be_empty
+    get href
+    status.must_equal 200
+    model.must_be_kind_of CIMI::Model::Machine::DiskCollection
+    model.entries.size.must_equal 1
+    model.entries.first.name.must_equal "inst0_disk_0"
+  end
+
   describe "$expand" do
     def machine(*expand)
       url = '/machines/inst1'

data/tests/cimi/collections/system_templates_test.rb

@@ -38,4 +38,51 @@ describe CIMI::Collections::SystemTemplates do
     status.must_equal 404
   end
 
+  it 'should allow to retrieve system template\'s machine template\'s ref details' do
+    get root_url '/system_templates/template1'
+    (xml/'SystemTemplate/componentDescriptor').each do |c|
+      if (c/'name').inner_text == 'my third machine'
+        (c/'machineTemplate').wont_be_empty
+        (c/'machineTemplate').to_s.must_equal '<machineTemplate href="http://example.com/machine_templates/template1"/>'
+      end
+    end
+  end
+
+  it 'should allow to retrieve system template\'s machine template\'s inline details' do
+    get root_url '/system_templates/template1'
+    (xml/'SystemTemplate/componentDescriptor').each do |c|
+      if (c/'name').inner_text == 'my machine'
+        (c/'machineTemplate').wont_be_empty
+        (c/'machineTemplate/name').inner_text.must_equal 'machine in mock system'
+        (c/'machineTemplate/description').inner_text.must_equal 'machine in system'
+        (c/'machineTemplate/machineConfig').to_s.must_equal '<machineConfig href="http://example.com/configs/m1-small"/>'
+        (c/'machineTemplate/machineImage').to_s.must_equal '<machineImage href="http://example.com/images/img1"/>'
+        (c/'machineTemplate/volumeTemplate').to_s.must_equal '<volumeTemplate href="http://example.com/volumes/sysvol1"/>'
+      end
+    end
+  end
+
+  it 'should allow to retrieve system template\'s machine template\'s inline volume template' do
+    get root_url '/system_templates/template1'
+    (xml/'SystemTemplate/componentDescriptor').each do |c|
+      if (c/'name').inner_text == 'my second machine'
+        (c/'machineTemplate').wont_be_empty
+        (c/'machineTemplate/description').inner_text.must_equal 'another inline mock machine template'
+        (c/'machineTemplate/volumeTemplate').wont_be_empty
+        (c/'machineTemplate/volumeTemplate/volumeConfig').wont_be_empty
+        (c/'machineTemplate/volumeTemplate/volumeConfig/capacity').inner_text.must_equal '10485760'
+      end
+    end
+  end
+
+  it 'should allow to retrieve system template\'s network' do
+    get root_url '/system_templates/template1'
+    (xml/'SystemTemplate/componentDescriptor').each do |c|
+      if (c/'name').inner_text == 'network in mock system'
+        (c/'networkTemplate').inner_text.must_equal 'my network'
+        (c/'networkTemplate/networkConfig/networkType').inner_text.must_equal 'GOLD'
+      end
+    end
+  end
+
 end

data/tests/cimi/collections/volumes_test.rb

@@ -0,0 +1,42 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+require 'minitest/autorun'
+require_relative './common.rb'
+
+describe CIMI::Collections::Volumes do
+
+  def create_model(model_class, attr)
+    model = model_class.new(attr)
+    svc_class = CIMI::Service::const_get(model_class.name.split('::').last)
+    svc_class.new(nil, :model => model).save
+    model
+  end
+
+  before do
+    def app; run_frontend(:cimi) end
+    authorize 'mockuser', 'mockpassword'
+
+    @config = create_model CIMI::Model::VolumeConfiguration,
+      :id => "http://localhost:3001/cimi/volume_configurations/1",
+      :name => "volume_config",
+      :format => "ext3",
+      :capacity => 1
+
+    @collection = CIMI::Collections.collection(:volumes)
+  end
+
+  def make_volume_create
+    vt = CIMI::Model::VolumeTemplate.new
+    vt.volume_config.href = @config.id
+    CIMI::Model::VolumeCreate.new(:name => "new_cimi_volume_#{Time.now.to_i}",
+         :volume_template => vt)
+  end
+
+  it 'allows creation of a new volume' do
+    vc = make_volume_create
+    post '/cimi/volumes', vc.to_json, "CONTENT_TYPE" => "application/json"
+
+    last_response.status.must_equal 201
+    model.name.must_equal vc.name
+  end
+end

data/tests/cimi/db/database_helper_test.rb

@@ -16,7 +16,8 @@ describe Deltacloud::Helpers::Database do
   before do
     @provider = Deltacloud::Database::Provider
     @entity = Deltacloud::Database::Entity
-    @baseModel = CIMI::Model::Base
+    @baseService = CIMI::Service::Base
+    @baseModel = @baseService.model_class
 
     @db = DatabaseHelper.new
     @prov = @provider::lookup
@@ -98,7 +99,7 @@ describe Deltacloud::Helpers::Database do
     check_entity_base_attrs new_entity, @entity, @prov
 
     base = @baseModel.new(:id => 'base1')
-    base.destroy
+    @baseService.new(nil, :model => base).destroy
     entity = @entity.retrieve(base)
     entity.wont_be_nil
     entity.exists?.must_equal false
@@ -123,10 +124,12 @@ describe Deltacloud::Helpers::Database do
   }
 }
     '
-    machine = CIMI::Model::Machine.from_json(json)
+
+    model = CIMI::Model::Machine.from_json(json)
+    machine = CIMI::Service::Machine.new(nil, :model => model)
     machine.save
 
-    m2 = CIMI::Model::Machine.new(:id => machine.id)
+    m2 = CIMI::Service::Machine.new(nil, :values => { :id => machine.id })
     m2.name.must_equal 'myDatabaseMachine'
     m2.description.must_equal 'This is a demo machine'
     m2.property.must_be_kind_of Hash

data/tests/deltacloud/drivers_test.rb

@@ -64,7 +64,7 @@ describe Deltacloud::Helpers::Drivers do
   it 'should throw an exception on unknown driver' do
     begin
       Thread.current[:driver] = 'unknown'
-      Proc.new { @helper.driver }.must_raise RuntimeError
+      Proc.new { @helper.driver }.must_raise LoadError
     ensure
       Thread.current[:driver] = 'mock'
     end

data/tests/drivers/ec2/common.rb

@@ -25,7 +25,10 @@ VCR.configure do |c|
   matcher = VCR.request_matchers.uri_without_param("AWSAccessKeyId",
                                                    "Signature", "Timestamp")
   c.register_request_matcher(:ec2_matcher, &matcher)
-  c.default_cassette_options = { :record => :none, :match_requests_on => [:method, :ec2_matcher] }
+  c.default_cassette_options = {
+    :record => vcr_record_mode,
+    :match_requests_on => [:method, :ec2_matcher]
+  }
 end
 
 # Setup resources we need for the tests