deltacloud-core 1.0.2 → 1.0.3

data/lib/sinatra/rack_etag.rb

@@ -42,7 +42,7 @@ module Rack
 
       if etag_status?(status) && etag_body?(body) && !http_caching?(headers)
         digest, body = digest_body(body)
-        headers['ETag'] = %("#{digest}") if digest
+        headers['ETag'] = digest.to_s if digest
       end
 
       if not headers['Cache-Control'] and digest

data/tests/cimi/collections/cloud_entry_point_test.rb

@@ -17,8 +17,8 @@ describe CIMI::Collections::CloudEntryPoint do
 
   it 'set the CIMI-Version header' do
     get root_url
-    headers['X-CIMI-Specification-Version'].wont_be_nil
-    headers['X-CIMI-Specification-Version'].must_equal '1.0.0'
+    headers['CIMI-Specification-Version'].wont_be_nil
+    headers['CIMI-Specification-Version'].must_equal '1.0.0'
   end
 
   it 'advertise CIMI collections in XML format' do
@@ -43,4 +43,13 @@ describe CIMI::Collections::CloudEntryPoint do
     status.must_equal 200
   end
 
+  it 'advertise only supported CIMI collections by driver' do
+    header 'X-Deltacloud-Driver', 'ec2'
+    get root_url + '/cloudEntryPoint'
+    (xml/'CloudEntryPoint/routingGroups').must_be_empty
+    header 'X-Deltacloud-Driver', 'mock'
+    get root_url + '/cloudEntryPoint'
+    (xml/'CloudEntryPoint/routingGroups').wont_be_empty
+  end
+
 end

data/tests/deltacloud/common.rb

@@ -5,7 +5,7 @@ require_relative File.join('..', '..', 'lib', 'deltacloud_rack.rb')
 
 Deltacloud::configure do |server|
   server.root_url '/api'
-  server.version '1.0.2'
+  server.version Deltacloud::API_VERSION
   server.klass 'Deltacloud::API'
   server.logger Rack::DeltacloudLogger.setup(ENV['API_LOG'], ENV['API_VERBOSE'])
   server.default_driver :mock

data/tests/deltacloud/rack_test.rb

@@ -8,7 +8,7 @@ describe Deltacloud do
   before do
     Deltacloud::configure :cimi do |server|
       server.root_url '/cimi'
-      server.version '1.0.2'
+      server.version Deltacloud::API_VERSION
       server.klass 'CIMI'
       server.logger Logger
     end
@@ -37,8 +37,8 @@ describe Deltacloud do
     end
 
     it 'should provide the correct version' do
-      Deltacloud.config[:deltacloud].version.must_equal '1.0.2'
-      Deltacloud.config[:cimi].version.must_equal '1.0.2'
+      Deltacloud.config[:deltacloud].version.must_equal Deltacloud::API_VERSION
+      Deltacloud.config[:cimi].version.must_equal Deltacloud::API_VERSION
     end
 
     it 'should provide the logger facility' do

data/tests/drivers/base/base_driver_test.rb

@@ -1,5 +1,9 @@
-require 'minitest/autorun'
-require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'drivers', 'base_driver.rb')
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative 'common'
+
+require_relative '../../../lib/deltacloud/drivers/base_driver'
 
 describe Deltacloud::BaseDriver do
 

data/tests/drivers/base/common.rb

@@ -0,0 +1 @@
+require_relative '../../test_helper'

data/tests/drivers/base/library_test.rb

@@ -1,5 +1,9 @@
-require 'minitest/autorun'
-require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative 'common.rb'
+
+require_relative '../../../lib/deltacloud/api'
 
 describe 'Deltacloud API Library' do
 

data/tests/drivers/ec2/common.rb

@@ -3,29 +3,48 @@
 require 'right_http_connection'
 require 'vcr'
 
-# Freeze time, so EC2 signatures have all the same time
-# This will avoid IncorrectSignature exceptions
-
-# NOTE: This timestamp need to be changed when re-recording
-#       the fixtures.
+require_relative '../../test_helper.rb'
+require_relative '../../../lib/deltacloud/drivers/ec2/ec2_driver'
 
 def credentials
-  {
-    :user => 'AKIAJYOQYLLOIWN5LQ3A',
-    :password => 'Ra2ViYaYgocAJqPAQHxMVU/l2sGGU2pifmWT4q3H'
-  }
+  Deltacloud::Test::config.credentials('ec2')
 end
 
-unless Time.respond_to? :be
-  require_relative '../../test_helper.rb'
+# Monkey patch EC2 driver to return a client
+class Deltacloud::Drivers::Ec2::Ec2Driver
+  def client(credentials)
+    new_client(credentials)
+  end
 end
 
-Time.be(DateTime.parse("2012-07-30 11:05:00 +0000").to_s)
-
+# Configure VCR
 VCR.configure do |c|
   # NOTE: Empty this directory before re-recording
   c.cassette_library_dir = File.join(File.dirname(__FILE__), 'fixtures')
   c.hook_into :webmock
-  # Set this to :new_episodes when you want to 're-record'
-  c.default_cassette_options = { :record => :new_episodes }
+  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] }
+end
+
+# Setup resources we need for the tests
+def create_resources
+  VCR.use_cassette "create_resources" do
+    driver = Deltacloud::new(:ec2, credentials)
+    @@ec2 = driver.client
+    @@vpc = @@ec2.create_vpc("172.16.0.0/16").first
+    @@subnet = @@ec2.create_subnet(@@vpc[:vpc_id], "172.16.3.0/24", "us-east-1b").first
+  end
 end
+
+def destroy_resources
+  VCR.use_cassette "destroy_resources" do
+    @@ec2.delete_subnet(@@subnet[:subnet_id]) if @@subnet
+    @@ec2.delete_vpc(@@vpc[:vpc_id]) if @@vpc
+  end
+end
+
+MiniTest::Unit::after_tests { destroy_resources }
+
+create_resources

data/tests/drivers/ec2/images_test.rb

@@ -1,6 +1,6 @@
-require 'minitest/autorun'
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
 
-require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
 require_relative 'common.rb'
 
 describe 'Ec2Driver Images' do
@@ -46,4 +46,3 @@ describe 'Ec2Driver Images' do
   end
 
 end
-

data/tests/drivers/ec2/instance_test.rb

@@ -1,6 +1,6 @@
-require 'minitest/autorun'
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
 
-require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
 require_relative 'common.rb'
 
 describe 'Ec2Driver Instances' do
@@ -90,6 +90,16 @@ describe 'Ec2Driver Instances' do
     instances.each { |i| i.is_stopped?.must_equal true }
   end
 
+  it 'must allow creating instance in a VPC subnet' do
+    realm_id = "#{@@subnet[:availability_zone]}:#{@@subnet[:subnet_id]}"
+    instance = @driver.create_instance('ami-aecd60c7',
+                                       :realm_id => realm_id,
+                                       :hwp_id => 'm1.small')
+    instance.must_be_kind_of Instance
+    instance.realm_id.must_equal realm_id
+    @driver.destroy_instance(instance.id)
+  end
+
   it 'must allow to reboot instance in running state' do
     instance = @driver.create_instance('ami-aecd60c7', :realm_id => 'us-east-1a', :hwp_id => 't1.micro')
     instance = instance.wait_for!(@driver, record_retries) { |i| i.is_running? }

data/tests/drivers/ec2/keys_test.rb

@@ -1,6 +1,6 @@
-require 'minitest/autorun'
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
 
-require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
 require_relative 'common.rb'
 
 describe 'Ec2Driver Instances' do

data/tests/drivers/ec2/realms_test.rb

@@ -1,6 +1,6 @@
-require 'minitest/autorun'
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
 
-require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
 require_relative 'common.rb'
 
 describe 'Ec2Driver Realms' do
@@ -40,5 +40,9 @@ describe 'Ec2Driver Realms' do
     @driver.realm(:id => 'unknown').must_be_nil
   end
 
-end
+  it 'must list VPC subnets as realms' do
+    id = "#{@@subnet[:availability_zone]}:#{@@subnet[:subnet_id]}"
+    @driver.realms.find { |r| r.id == id }.wont_be_nil
+  end
 
+end

data/tests/drivers/ec2/storage_snapshots_test.rb

@@ -1,11 +1,10 @@
-require 'minitest/autorun'
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
 
-require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
 require_relative 'common.rb'
 
 describe 'Ec2Driver StorageSnapshots' do
   before do
-    Time.be(DateTime.parse("2012-08-13 13:03:00 +0000").to_s)
     @driver = Deltacloud::new(:ec2, credentials)
     VCR.insert_cassette __name__
   end

data/tests/drivers/gogrid/common.rb

@@ -0,0 +1,24 @@
+require 'vcr'
+
+require_relative '../../test_helper.rb'
+
+def credentials
+  Deltacloud::Test::config.credentials("gogrid")
+end
+
+def fixed_image_id
+  # A fixed image we use throughout the tests; if GoGrid ever removes it
+  # we need to change it here
+  "9928"
+end
+
+VCR.configure do |c|
+  # NOTE: Empty this directory before re-recording
+  c.cassette_library_dir = File.join(File.dirname(__FILE__), 'fixtures')
+  c.hook_into :webmock
+  matcher = VCR.request_matchers.uri_without_param("api_key", "sig")
+  c.register_request_matcher(:gogrid_matcher, &matcher)
+  # Set this to :new_episodes to rerecord
+  c.default_cassette_options[:record] =:none
+  c.default_cassette_options[:match_requests_on] = [:method, :gogrid_matcher]
+end

data/tests/drivers/gogrid/hardware_profiles_test.rb

@@ -0,0 +1,51 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative 'common'
+
+describe 'GoGrid Hardware Profiles' do
+
+  before do
+    @driver = Deltacloud::new(:gogrid, credentials)
+    VCR.insert_cassette __name__
+  end
+
+  after do
+    VCR.eject_cassette
+  end
+
+  it 'must throw error when wrong credentials' do
+    Proc.new do
+      @driver.backend.realms(OpenStruct.new(:user => 'unknown', :password => 'wrong'))
+    end.must_raise Deltacloud::ExceptionHandler::AuthenticationFailure, 'Authentication Failure'
+  end
+
+  it 'must return list of hardware profiles' do
+    @driver.hardware_profiles.wont_be_empty
+    @driver.hardware_profiles.first.must_be_kind_of Deltacloud::HardwareProfile
+  end
+
+  it 'must allow to filter hardware profiles' do
+    @driver.hardware_profiles(:id => 'web-server').wont_be_empty
+    @driver.hardware_profiles(:id => 'web-server').must_be_kind_of Array
+    @driver.hardware_profiles(:id => 'web-server').size.must_equal 1
+    @driver.hardware_profiles(:id => 'web-server').first.name.must_equal 'web-server'
+    @driver.hardware_profiles(:id => 'unknown').must_be_empty
+  end
+
+  it 'must allow to retrieve single hardware_profile' do
+    profile = @driver.hardware_profile(:id => 'database-server')
+    profile.wont_be_nil
+    profile.must_be_kind_of Deltacloud::HardwareProfile
+    profile.name.must_equal 'database-server'
+    profile.properties.must_be_kind_of Array
+    profile.properties.wont_be_empty
+    profile.properties.each do |p|
+      p.must_be_kind_of Deltacloud::HardwareProfile::Property
+      p.name.to_s.wont_be_empty
+      p.kind.to_s.wont_be_empty
+    end
+    @driver.hardware_profile(:id => 'unknown').must_be_nil
+  end
+
+end

data/tests/drivers/gogrid/images_test.rb

@@ -0,0 +1,57 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative 'common'
+
+describe 'GoGridDriver Images' do
+
+  before do
+    @driver = Deltacloud::new(:gogrid, credentials)
+    VCR.insert_cassette __name__
+  end
+
+  after do
+    VCR.eject_cassette
+  end
+
+  it 'must throw error when wrong credentials' do
+    Proc.new do
+      @driver.backend.images(OpenStruct.new(:user => 'unknown', :password => 'wrong'))
+    end.must_raise Deltacloud::ExceptionHandler::AuthenticationFailure, 'Authentication Failure'
+  end
+
+  it 'must return list of images' do
+    @driver.images.wont_be_empty
+    @driver.images.first.must_be_kind_of Image
+  end
+
+  it 'must allow to filter images' do
+    img = @driver.images.first
+    img.wont_be_nil
+
+    imgs = @driver.images(:id => img.id)
+    imgs.wont_be_empty
+    imgs.must_be_kind_of Array
+    imgs.size.must_equal 1
+    imgs.first.id.must_equal img.id
+    imgs.first.name.must_equal img.name
+  end
+
+  it 'must return an empty array for nonexistent image' do
+    @driver.images(:id => 'unknown').must_be_empty
+  end
+
+  it 'must allow to retrieve single image' do
+    some_img = @driver.images.first
+    some_img.wont_be_nil
+    by_id = @driver.image(:id => some_img.id)
+
+    by_id.wont_be_nil
+    by_id.must_be_kind_of Image
+    by_id.id.must_equal some_img.id
+  end
+
+  it 'must return nil when retrieving a single nonexistent image' do
+    @driver.image(:id => 'unknown').must_be_nil
+  end
+end

data/tests/drivers/gogrid/instances_test.rb

@@ -0,0 +1,92 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative 'common'
+
+describe 'GoGridDriver Instances' do
+
+  INSTANCE_ID = "test-instance"
+
+  before do
+    @driver = Deltacloud::new(:gogrid, credentials)
+    VCR.insert_cassette __name__
+  end
+
+  after do
+    VCR.eject_cassette
+  end
+
+  def self.create_test_instance
+    driver = Deltacloud::new(:gogrid, credentials)
+    VCR.use_cassette "instances_create_test_instance" do
+      @@instance = driver.instance(:id => INSTANCE_ID)
+      @@instance ||= driver.create_instance(fixed_image_id,
+                                            :name=> INSTANCE_ID)
+    end
+  end
+
+  # Destroy test instance when all test are done
+  def self.__name__
+    # record_retries below calls this
+    "instances_test_class"
+  end
+
+  def self.destroy_test_instance
+    driver = Deltacloud::new(:gogrid, credentials)
+
+    # Go fast when running off a recording
+    opts = record_retries('', :time_between_retry => 60)
+    @@instance.wait_for!(driver, opts) do |i|
+      i.actions.include?(:destroy)
+    end
+
+    VCR.use_cassette "instances_destroy_test_instance" do
+      driver.destroy_instance(@@instance.id)
+      @@instance = nil
+    end
+  end
+
+  # Setup/teardown before/after all tests
+  create_test_instance
+
+  MiniTest::Unit::after_tests { destroy_test_instance }
+
+  let :instance do
+    @@instance
+  end
+
+  it 'must throw error when wrong credentials' do
+    Proc.new do
+      @driver.backend.images(OpenStruct.new(:user => 'unknown', :password => 'wrong'))
+    end.must_raise Deltacloud::ExceptionHandler::AuthenticationFailure, 'Authentication Failure'
+  end
+
+  it 'must return list of instances' do
+    @driver.instances.wont_be_empty
+    @driver.instances.first.must_be_kind_of Instance
+  end
+
+  it 'must allow to filter instances' do
+    by_id = @driver.instances(:id => instance.id)
+    by_id.wont_be_empty
+    by_id.must_be_kind_of Array
+    by_id.size.must_equal 1
+    by_id.first.id.must_equal instance.id
+
+    by_owner = @driver.instances(:owner_id => instance.owner_id)
+    by_owner.wont_be_empty
+    by_owner.each do |inst|
+      inst.owner_id.must_equal instance.owner_id
+    end
+
+    @driver.instances(:id => 'unknown').must_be_empty
+  end
+
+  it 'must allow to retrieve single instance' do
+    by_id = @driver.instance(:id => instance.id)
+    by_id.wont_be_nil
+    by_id.must_be_kind_of Instance
+    by_id.id.must_equal instance.id
+    @driver.instance(:id => "unknown").must_be_nil
+  end
+end