deltacloud-core 1.0.3 → 1.0.4

data/lib/sinatra/rack_matrix_params.rb

@@ -36,15 +36,21 @@ module Rack
     #
     # All HTTP methods are supported, in case of POST they will be passed as a
     # regular <form> parameters.
-
     def call(env)
-      # Copy PATH_INFO to REQUEST_URI if Rack::Test
-      env['REQUEST_URI'] = env['PATH_INFO'] if env['rack.test']
-      env['REQUEST_PATH'] = env['PATH_INFO'] if env['rack.test']
+
+      # This ugly hack should fix the issue with Rack::Test where
+      # these two variables are empty and Rack::Test will always
+      # return 404.
+      #
+      if env['rack.test']
+        env['REQUEST_URI'] = env['PATH_INFO']
+        env['REQUEST_PATH'] = env['PATH_INFO']
+      end
 
       # Split URI to components and then extract ;var=value pairs
-      uri_components = env['REQUEST_URI'].split('/')
       matrix_params = {}
+      uri_components = (env['rack.test'] ? env['PATH_INFO'] : env['REQUEST_URI']).split('/')
+
       uri_components.each do |component|
         sub_components, value = component.split(/\;(\w+)\=/), nil
         next unless sub_components.first  # Skip subcomponent if it's empty (usually /)
@@ -73,15 +79,9 @@ module Rack
       #         does not trip over them
 
       # (1) Rewrite current path by stripping all matrix params from it
-      if env['REQUEST_PATH'] == '/'
-        env['REQUEST_URI'] = env['REQUEST_PATH']
-        env['REQUEST_PATH'] = env['PATH_INFO']
-      end
-
-      # This is needed for OpenShift deployment / Passenger
-      if env['REQUEST_PATH']
-        env['REQUEST_PATH'] = env['REQUEST_PATH'].gsub(/;([^\/]*)/, '').gsub(/\?(.*)$/, '')
-        env['PATH_INFO'] = env['REQUEST_PATH']
+      ['REQUEST_PATH', 'REQUEST_URI', 'PATH_INFO'].select { |k|
+        env[k] }.each do |k|
+        env[k] = env[k].remove_matrix_params
       end
 
       # (2) Append the matrix params to the 'normal' request params

data/public/javascripts/cmwgapp.js

@@ -29,7 +29,7 @@ function doXmlPut(theNode, addId, func)
   }
   else {
     xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode);
     xmlData += "</" + $(theNode.form).attr("xmlRootNode").value + ">";
   }
@@ -72,7 +72,7 @@ function doXmlPost(theNode, func)
   }
   else {
     xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode)
     xmlData += "</" + $(theNode.form).attr("xmlRootNode").value + ">";
   }

data/tests/cimi/collections/cloud_entry_point_test.rb

@@ -7,7 +7,7 @@ require_relative './common.rb'
 describe CIMI::Collections::CloudEntryPoint do
 
   before do
-    def app; CIMI::API; end
+    def app; run_frontend(:cimi) end
     @collection = CIMI::Collections.collection(:cloudEntryPoint)
   end
 
@@ -46,10 +46,10 @@ describe CIMI::Collections::CloudEntryPoint do
   it 'advertise only supported CIMI collections by driver' do
     header 'X-Deltacloud-Driver', 'ec2'
     get root_url + '/cloudEntryPoint'
-    (xml/'CloudEntryPoint/routingGroups').must_be_empty
+    (xml/'CloudEntryPoint/forwardingGroups').must_be_empty
     header 'X-Deltacloud-Driver', 'mock'
     get root_url + '/cloudEntryPoint'
-    (xml/'CloudEntryPoint/routingGroups').wont_be_empty
+    (xml/'CloudEntryPoint/forwardingGroups').wont_be_empty
   end
 
 end

data/tests/cimi/collections/machine_images_test.rb

@@ -6,7 +6,7 @@ require_relative './common.rb'
 describe CIMI::Collections::MachineImages do
 
   before do
-    def app; CIMI::API; end
+    def app; run_frontend(:cimi) end
     authorize 'mockuser', 'mockpassword'
     @collection = CIMI::Collections.collection(:machine_images)
   end
@@ -36,7 +36,7 @@ describe CIMI::Collections::MachineImages do
   it 'should allow to filter using CIMISelect' do
     get root_url '/machine_images?CIMISelect=description'
     status.must_equal 200
-    xml.root.name.must_equal 'MachineImageCollection'
+    xml.root.name.must_equal 'Collection'
     (xml/'description').wont_be_empty
     (xml/'id').must_be_empty
   end

data/tests/cimi/collections/machines_test.rb

@@ -6,7 +6,7 @@ require_relative './common.rb'
 describe CIMI::Collections::Machines do
 
   before do
-    def app; CIMI::API; end
+    def app; run_frontend(:cimi) end
     authorize 'mockuser', 'mockpassword'
     @collection = CIMI::Collections.collection(:machines)
   end

data/tests/cimi/collections/url_helper_test.rb

@@ -0,0 +1,31 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require 'minitest/autorun'
+require_relative './common.rb'
+
+class CIMITestHelper
+  def settings; OpenStruct.new(:root_url => '//'); end
+  def url(path); '/cimi' + path; end
+  include Sinatra::Rabbit::URLFor(CIMI.collections)
+end
+
+describe CIMI do
+
+  before do
+    @api = CIMITestHelper.new
+  end
+
+  it 'generate url helpers for CIMI model' do
+    @api.machines_url.must_equal '/cimi/machines'
+    @api.machine_url('123').must_equal '/cimi/machines/123'
+    @api.machines_url(:format => 'json').must_equal '/cimi/machines?format=json'
+  end
+
+  it 'generate proper url for ResourceMetadata' do
+    @api.resource_metadata_url.must_equal '/cimi/resource_metadata'
+    @api.resource_metadata_url('123').must_equal '/cimi/resource_metadata/123'
+    @api.resource_metadata_url(:format => 'json').must_equal '/cimi/resource_metadata/?format=json'
+  end
+
+end

data/tests/cimi/spec/cimi/model/{machine_admin_spec.rb → credential_spec.rb}

@@ -21,15 +21,15 @@ if require 'minitest/autorun'
   require_relative '../../spec_helper.rb'
 end
 
-describe "MachineAdmin model" do
+describe "Credential model" do
 
   before do
-    @xml = IO::read(File::join(DATA_DIR, "machine_admin.xml"))
-    @json = IO::read(File::join(DATA_DIR, "machine_admin.json"))
+    @xml = IO::read(File::join(DATA_DIR, "credential.xml"))
+    @json = IO::read(File::join(DATA_DIR, "credential.json"))
   end
 
   it "can be constructed from XML and JSON" do
-    should_properly_serialize_model CIMI::Model::MachineAdmin, @xml, @json
+    should_properly_serialize_model CIMI::Model::Credential, @xml, @json
   end
 
 end

data/tests/deltacloud/base_collection_test.rb

@@ -22,9 +22,4 @@ describe Deltacloud::Collections::Base do
     @base.version.must_equal  Deltacloud.config[:deltacloud].version
   end
 
-  it 'provides helper for routes' do
-    @base.must_respond_to :route_for
-    @base.route_for('/hardware_profiles').must_equal "#{Deltacloud.config[:deltacloud].root_url}/hardware_profiles"
-  end
-
 end

data/tests/deltacloud/collections/buckets_collection_test.rb

@@ -6,7 +6,7 @@ require_relative File.join('..', 'common.rb')
 describe Deltacloud::Collections::Buckets do
 
   before do
-    def app; Deltacloud::API; end
+    def app; run_frontend; end
     authorize 'mockuser', 'mockpassword'
     @collection = Deltacloud::Collections.collection(:buckets)
   end

data/tests/deltacloud/collections/drivers_collection_test.rb

@@ -6,7 +6,7 @@ require_relative File.join('..', 'common.rb')
 describe Deltacloud::Collections::Drivers do
 
   before do
-    def app; Deltacloud::API; end
+    def app; run_frontend; end
     @collection = Deltacloud::Collections.collection(:drivers)
   end
 

data/tests/deltacloud/collections/hardware_profiles_collection_test.rb

@@ -6,7 +6,7 @@ require_relative File.join('..', 'common.rb')
 describe Deltacloud::Collections::HardwareProfiles do
 
   before do
-    def app; Deltacloud::API; end
+    def app; run_frontend; end
     authorize 'mockuser', 'mockpassword'
     @collection = Deltacloud::Collections.collection(:hardware_profiles)
   end

data/tests/deltacloud/collections/images_collection_test.rb

@@ -6,7 +6,7 @@ require_relative File.join('..', 'common.rb')
 describe Deltacloud::Collections::Images do
 
   before do
-    def app; Deltacloud::API; end
+    def app; run_frontend; end
     authorize 'mockuser', 'mockpassword'
     @collection = Deltacloud::Collections.collection(:images)
   end

data/tests/deltacloud/collections/instance_states_collection_test.rb

@@ -6,7 +6,7 @@ require_relative File.join('..', 'common.rb')
 describe Deltacloud::Collections::InstanceStates do
 
   before do
-    def app; Deltacloud::API; end
+    def app; run_frontend; end
     authorize 'mockuser', 'mockpassword'
     @collection = Deltacloud::Collections.collection(:instance_states)
   end

data/tests/deltacloud/collections/instances_collection_test.rb

@@ -6,7 +6,7 @@ require_relative File.join('..', 'common.rb')
 describe Deltacloud::Collections::Instances do
 
   before do
-    def app; Deltacloud::API; end
+    def app; run_frontend; end
     authorize 'mockuser', 'mockpassword'
     @collection = Deltacloud::Collections.collection(:instances)
   end

data/tests/deltacloud/collections/keys_collection_test.rb

@@ -6,7 +6,7 @@ require_relative File.join('..', 'common.rb')
 describe Deltacloud::Collections::Keys do
 
   before do
-    def app; Deltacloud::API; end
+    def app; run_frontend; end
     authorize 'mockuser', 'mockpassword'
     @collection = Deltacloud::Collections.collection(:keys)
   end
@@ -48,9 +48,6 @@ describe Deltacloud::Collections::Keys do
     xml.root.name.must_equal 'key'
     xml.root[:id].must_equal 'unit-test1'
     (xml/'key/pem').wont_be_empty
-    Proc.new {
-      post root_url + '/keys', { :name => 'unit-test1' }
-    }.must_raise Deltacloud::ExceptionHandler::ProviderError, 'keyExist'
     delete root_url + '/keys/unit-test1'
     status.must_equal 204
   end

data/tests/deltacloud/deltacloud_helper_test.rb

@@ -13,15 +13,6 @@ describe Deltacloud::Helpers::Application do
     @helper = ApplicationHelper.new
   end
 
-  it 'provides list of supported collections for the current driver' do
-    @helper.supported_collections.wont_be_empty
-    @helper.supported_collections.must_include Sinatra::Rabbit::InstancesCollection
-    @helper.supported_collections.wont_include Sinatra::Rabbit::LoadBalancersCollection
-    Thread.current[:driver] = 'ec2'
-    @helper.supported_collections.must_include Sinatra::Rabbit::LoadBalancersCollection
-    Thread.current[:driver] = 'mock'
-  end
-
   it 'provides name for the authentication feature' do
     @helper.auth_feature_name.wont_be_nil
     @helper.auth_feature_name.must_equal 'key'

data/tests/deltacloud/server_test.rb

@@ -6,7 +6,7 @@ require_relative 'common.rb'
 describe Deltacloud::API do
 
   before do
-    def app; Deltacloud::API; end
+    def app; run_frontend; end
   end
 
   it 'has the config set property' do

data/tests/drivers/base/base_driver_test.rb

@@ -8,6 +8,7 @@ require_relative '../../../lib/deltacloud/drivers/base_driver'
 describe Deltacloud::BaseDriver do
 
   before do
+
     class TestDriver < Deltacloud::BaseDriver
 
       define_hardware_profile('t1.micro') do
@@ -36,8 +37,37 @@ describe Deltacloud::BaseDriver do
       end
 
       def realms(credentials, opts={}); end
+
+      def supported_collections(credentials)
+        collections = super
+        #lets add images/instances just for testing of method override from base
+        collections + [Sinatra::Rabbit::ImagesCollection, Sinatra::Rabbit::InstancesCollection]
+      end
     end
+
     @driver = TestDriver.new
+
+  end
+
+  describe 'supported driver collections' do
+
+    it 'provides list of supported collections' do
+      current_driver = Thread.current[:driver]
+      #change to test driver, mock defined in common.rb
+      Thread.current[:driver] = 'test'
+      credentials = OpenStruct.new(:user => 'unkown', :password => 'wrong')
+      @driver.supported_collections(credentials).wont_be_empty
+      @driver.supported_collections(credentials).must_include Sinatra::Rabbit::InstancesCollection
+      #check override of supported_collections, we added Images above
+      @driver.supported_collections(credentials).must_include Sinatra::Rabbit::ImagesCollection
+      @driver.supported_collections(credentials).wont_include Sinatra::Rabbit::KeysCollection
+      #switch driver, check supported_collections
+      Thread.current[:driver] = 'mock'
+      @driver.supported_collections(credentials).must_include Sinatra::Rabbit::KeysCollection
+      #restore driver to not impact other tests
+      Thread.current[:driver] = current_driver
+    end
+
   end
 
   describe 'when creating a new driver' do

data/tests/drivers/base/common.rb

@@ -1 +1,15 @@
 require_relative '../../test_helper'
+
+require_relative File.join('..', '..', '..', 'lib', 'deltacloud_rack.rb')
+
+# Setup Deltacloud::API Sinatra instance
+
+Deltacloud::configure do |server|
+  server.root_url '/api'
+  server.version Deltacloud::API_VERSION
+  server.klass 'Deltacloud::API'
+  server.logger Rack::DeltacloudLogger.setup(ENV['API_LOG'], ENV['API_VERBOSE'])
+  server.default_driver :mock
+end
+
+Deltacloud.require_frontend!

data/tests/drivers/base/exceptions_test.rb

@@ -0,0 +1,64 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+require_relative './common'
+require_relative '../../../lib/deltacloud/drivers/exceptions'
+
+class TestException < StandardError; end
+
+class ExceptionTestClass
+  include Deltacloud::ExceptionHandler
+
+  def raise_exception(id)
+    case id
+      when 1 then safely { raise 'test1 exception' }
+      when 2 then safely { raise TestException }
+      when 3 then safely { raise 'not captured' }
+    end
+  end
+
+  exceptions do
+    on /test1/ do
+      status 500
+      message 'Test1ErrorMessage'
+    end
+    on TestException do
+      status 400
+      message 'StandardErrorTest'
+    end
+  end
+end
+
+def raise_error(id); ExceptionTestClass.new.raise_exception(id); end
+
+describe Deltacloud::ExceptionHandler do
+
+  it 'should capture exception when match the exception message' do
+    lambda { raise_error 1 }.must_raise Deltacloud::ExceptionHandler::BackendError
+
+    begin raise_error(1); rescue Deltacloud::ExceptionHandler::BackendError => e
+      e.code.must_equal 500
+      e.message.must_equal 'Test1ErrorMessage'
+      e.backtrace.wont_be_empty
+    end
+
+  end
+
+  it 'should capture exception when match the exception class' do
+    lambda { raise_error 2 }.must_raise Deltacloud::ExceptionHandler::ValidationFailure
+    begin raise_error(2); rescue Deltacloud::ExceptionHandler::ValidationFailure => e
+      e.code.must_equal 400
+      e.message.must_equal 'StandardErrorTest'
+      e.backtrace.wont_be_empty
+    end
+  end
+
+  it 'should capture exception when no match found' do
+    lambda { raise_error 3 }.must_raise Deltacloud::ExceptionHandler::BackendError
+    begin raise_error(3); rescue Deltacloud::ExceptionHandler::BackendError => e
+      e.code.must_equal 500
+      e.message.must_equal 'Unhandled exception or status code (not captured)'
+      e.backtrace.wont_be_empty
+    end
+  end
+
+end

data/tests/drivers/ec2/buckets_test.rb

@@ -0,0 +1,45 @@
+require 'minitest/autorun'
+
+require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
+require_relative 'common.rb'
+
+describe 'Ec2Driver Buckets' do
+
+  def credentials
+  {
+    :user => "AKIAJATNOR5HKG3FK27Q",
+    :password => "dPe47rAlKhlBdTYNbL4ZsMthDga08vEL9d3MS5UO"
+  }
+  end
+
+  before do
+    @driver = Deltacloud::new(:ec2, credentials)
+    VCR.insert_cassette __name__
+  end
+
+  after do
+    VCR.eject_cassette
+  end
+
+  it 'must throw error when wrong credentials for buckets' do
+    Proc.new do
+      @driver.backend.buckets(OpenStruct.new(:user => 'unknown', :password => 'wrong'))
+    end.must_raise Deltacloud::ExceptionHandler::AuthenticationFailure, 'Authentication Failure'
+  end
+
+
+  it 'must handle us-east buckets from other regions' do
+    #create us-east bucket:
+    bucket = @driver.create_bucket("deltacloud-unit-test-bucket-2012-08-20-1704")
+    #get a new deltacloud handle using eu-west-1
+    @dcloud_other_provider = Deltacloud::new(:ec2, credentials.merge!(:provider=>"eu-west-1"))
+    #get the bucket and check
+    retrieved_bucket = @dcloud_other_provider.bucket(:id=>bucket.name)
+    retrieved_bucket.must_be_kind_of Bucket
+    retrieved_bucket.name.must_equal bucket.name
+    #delete the bucket
+    @driver.delete_bucket(bucket.id)
+  end
+
+end
+