deltacloud-core 1.1.1 → 1.1.2

data/tests/deltacloud/collections/storage_snapshots_collection_test.rb

@@ -12,11 +12,11 @@ describe Deltacloud::Collections::StorageSnapshots do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::StorageSnapshotsCollection::IndexOperation
+    @collection.operation(:index).must_equal Deltacloud::Rabbit::StorageSnapshotsCollection::IndexOperation
   end
 
   it 'has show operation' do
-    @collection.operation(:show).must_equal Sinatra::Rabbit::StorageSnapshotsCollection::ShowOperation
+    @collection.operation(:show).must_equal Deltacloud::Rabbit::StorageSnapshotsCollection::ShowOperation
   end
 
   it 'returns list of storage_snapshots in various formats with index operation' do

data/tests/deltacloud/collections/storage_volumes_collection_test.rb

@@ -12,11 +12,11 @@ describe Deltacloud::Collections::StorageVolumes do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::StorageVolumesCollection::IndexOperation
+    @collection.operation(:index).must_equal Deltacloud::Rabbit::StorageVolumesCollection::IndexOperation
   end
 
   it 'has show operation' do
-    @collection.operation(:show).must_equal Sinatra::Rabbit::StorageVolumesCollection::ShowOperation
+    @collection.operation(:show).must_equal Deltacloud::Rabbit::StorageVolumesCollection::ShowOperation
   end
 
   it 'returns list of storage_volumes in various formats with index operation' do

data/tests/deltacloud/collections_test.rb

@@ -12,7 +12,7 @@ describe Deltacloud do
 
   it 'must provide access to collection classes' do
     Deltacloud.collections.wont_be_empty
-    Deltacloud.collections.must_include Sinatra::Rabbit::DriversCollection
+    Deltacloud.collections.must_include Deltacloud::Rabbit::DriversCollection
   end
 
   describe Deltacloud::Collections do
@@ -20,13 +20,13 @@ describe Deltacloud do
     it 'must return collection by name' do
       Deltacloud::Collections.must_respond_to :collection
       Deltacloud::Collections.collection(:drivers).wont_be_nil
-      Deltacloud::Collections.collection(:drivers).must_equal Sinatra::Rabbit::DriversCollection
+      Deltacloud::Collections.collection(:drivers).must_equal Deltacloud::Rabbit::DriversCollection
     end
 
     it 'must provide access to Deltacloud Sinatra modules' do
-      Deltacloud::Collections.must_respond_to :deltacloud_modules
-      Deltacloud::Collections.deltacloud_modules.wont_be_empty
-      Deltacloud::Collections.deltacloud_modules.must_include Deltacloud::Collections::Drivers
+      Deltacloud::Collections.must_respond_to :modules
+      Deltacloud::Collections.modules(:deltacloud).wont_be_empty
+      Deltacloud::Collections.modules(:deltacloud).must_include Deltacloud::Collections::Drivers
     end
 
   end

data/tests/deltacloud/common.rb

@@ -1,17 +1,6 @@
 require_relative '../test_helper.rb'
-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!
+Deltacloud.require_frontend! :deltacloud
 
 def check_json_serialization_for(model, sample_id, optional_attrs=[])
   header 'Accept', 'application/json'
@@ -21,7 +10,7 @@ def check_json_serialization_for(model, sample_id, optional_attrs=[])
   get root_url + "/#{model.to_s.pluralize}/#{sample_id}"
   status.must_equal 200
   json[model.to_s].wont_be_empty
-  klass = self.class.const_get(model.to_s.camelize)
+  klass = Deltacloud.const_get(model.to_s.camelize)
   klass.attributes.each do |attr|
     attr = attr.to_s.gsub(/_id$/,'') if attr.to_s =~ /_id$/
     json[model.to_s].keys.must_include attr.to_s unless optional_attrs.include? attr

data/tests/deltacloud/launcher_test.rb

@@ -53,7 +53,7 @@ describe "deltacloudd" do
     pid = Process.fork
     if pid.nil? then
       Dir.chdir(File.join(File.dirname(__FILE__), '..', '..'))
-      exec("./bin/deltacloudd -i mock -p 3011")
+      exec("./bin/deltacloudd -e test -i mock -p 3011")
     else
       Process.detach(pid) && @pids << pid
       wait_for_port_open(3011).must_equal true
@@ -67,7 +67,7 @@ describe "deltacloudd" do
     pid = Process.fork
     if pid.nil? then
       Dir.chdir(File.join(File.dirname(__FILE__), '..', '..'))
-      exec("./bin/deltacloudd -i mock -f deltacloud,cimi,ec2 -p 3011")
+      exec("./bin/deltacloudd -e test -i mock -f deltacloud,cimi,ec2 -p 3011")
     else
       Process.detach(pid) && @pids << pid
       wait_for_port_open(3011).must_equal true
@@ -82,7 +82,7 @@ describe "deltacloudd" do
     pid = Process.fork
     if pid.nil? then
       Dir.chdir(File.join(File.dirname(__FILE__), '..', '..'))
-      exec("./bin/deltacloudd -w -i mock -p 3011")
+      exec("./bin/deltacloudd -e test -w -i mock -p 3011")
     else
       Process.detach(pid) && @pids << pid
       wait_for_port_open(3011).must_equal true

data/tests/deltacloud/rack_test.rb

@@ -38,12 +38,12 @@ describe Deltacloud do
 
     it 'should provide the correct version' do
       Deltacloud.config[:deltacloud].version.must_equal Deltacloud::API_VERSION
-      Deltacloud.config[:cimi].version.must_equal Deltacloud::API_VERSION
+      Deltacloud.config[:cimi].version.must_equal Deltacloud::CIMI_API_VERSION
     end
 
     it 'should provide the logger facility' do
       Deltacloud.config[:deltacloud].logger.must_equal Rack::DeltacloudLogger
-      Deltacloud.config[:cimi].logger.must_equal Logger
+      Deltacloud.config[:cimi].logger.must_equal Rack::DeltacloudLogger
     end
 
   end

data/tests/deltacloud/server_test.rb

@@ -43,7 +43,7 @@ describe Deltacloud::API do
   it 'must return list of collections on OPTIONS' do
     options root_url
     headers['Allow'].wont_be_nil
-    headers['Allow'].split(',').must_include 'Sinatra::Rabbit::DriversCollection'
+    headers['Allow'].split(',').must_include 'Deltacloud::Rabbit::DriversCollection'
   end
 
   it 'must support setting driver and provider using POST' do

data/tests/drivers/base/base_driver_test.rb

@@ -41,7 +41,7 @@ describe Deltacloud::BaseDriver do
       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]
+        collections + [Deltacloud::Rabbit::ImagesCollection, Deltacloud::Rabbit::InstancesCollection]
       end
     end
 
@@ -57,13 +57,13 @@ describe Deltacloud::BaseDriver do
       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
+      @driver.supported_collections(credentials).must_include Deltacloud::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
+      @driver.supported_collections(credentials).must_include Deltacloud::Rabbit::ImagesCollection
+      @driver.supported_collections(credentials).wont_include Deltacloud::Rabbit::KeysCollection
       #switch driver, check supported_collections
       Thread.current[:driver] = 'mock'
-      @driver.supported_collections(credentials).must_include Sinatra::Rabbit::KeysCollection
+      @driver.supported_collections(credentials).must_include Deltacloud::Rabbit::KeysCollection
       #restore driver to not impact other tests
       Thread.current[:driver] = current_driver
     end

data/tests/drivers/base/common.rb

@@ -1,15 +1,5 @@
 require_relative '../../test_helper'
 
-require_relative File.join('..', '..', '..', 'lib', 'deltacloud_rack.rb')
+require_relative File.join('..', '..', '..', 'lib', 'initializers', 'frontend_initialize')
 
-# 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!
+Deltacloud.require_frontend!(:deltacloud)

data/tests/drivers/ec2/buckets_test.rb

@@ -36,7 +36,7 @@ describe 'Ec2Driver Buckets' do
     @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.must_be_kind_of Deltacloud::Bucket
     retrieved_bucket.name.must_equal bucket.name
     #delete the bucket
     @driver.delete_bucket(bucket.id)

data/tests/drivers/ec2/images_test.rb

@@ -22,7 +22,7 @@ describe 'Ec2Driver Images' do
 
   it 'must return list of images' do
     @driver.images.wont_be_empty
-    @driver.images.first.must_be_kind_of Image
+    @driver.images.first.must_be_kind_of Deltacloud::Image
   end
 
   it 'must allow to filter images' do
@@ -39,7 +39,7 @@ describe 'Ec2Driver Images' do
 
   it 'must allow to retrieve single image' do
     @driver.image(:id => 'ami-aecd60c7').wont_be_nil
-    @driver.image(:id => 'ami-aecd60c7').must_be_kind_of Image
+    @driver.image(:id => 'ami-aecd60c7').must_be_kind_of Deltacloud::Image
     @driver.image(:id => 'ami-aecd60c7').id.must_equal 'ami-aecd60c7'
     @driver.image(:id => 'ami-aaaaaaaa').must_be_nil
     @driver.image(:id => 'unknown').must_be_nil

data/tests/drivers/ec2/instance_test.rb

@@ -22,7 +22,7 @@ describe 'Ec2Driver Instances' do
 
   it 'must return list of instances' do
     @driver.instances.wont_be_empty
-    @driver.instances.first.must_be_kind_of Instance
+    @driver.instances.first.must_be_kind_of Deltacloud::Instance
   end
 
   it 'must allow to filter instances' do
@@ -40,7 +40,7 @@ describe 'Ec2Driver Instances' do
 
   it 'must allow to retrieve single instance' do
     @driver.instance(:id => 'i-4d15f036').wont_be_nil
-    @driver.instance(:id => 'i-4d15f036').must_be_kind_of Instance
+    @driver.instance(:id => 'i-4d15f036').must_be_kind_of Deltacloud::Instance
     @driver.instance(:id => 'i-4d15f036').id.must_equal 'i-4d15f036'
     @driver.instance(:id => 'i-00000000').must_be_nil
     @driver.instance(:id => 'unknown').must_be_nil
@@ -55,7 +55,7 @@ describe 'Ec2Driver Instances' do
                                        :'firewalls1' => 'default'
                                       )
     instance = instance.wait_for!(@driver, record_retries) { |i| i.is_running? }
-    instance.must_be_kind_of Instance
+    instance.must_be_kind_of Deltacloud::Instance
     instance.is_running?.must_equal true
     @driver.instance(:id => instance.id).wont_be_nil
     @driver.instance(:id => instance.id).id.must_equal instance.id
@@ -82,7 +82,7 @@ describe 'Ec2Driver Instances' do
                                       )
     instances.wont_be_empty
     instances.size.must_equal 2
-    instances.each { |i| i.must_be_kind_of Instance }
+    instances.each { |i| i.must_be_kind_of Deltacloud::Instance }
     instances = instances.map { |instance| instance.wait_for!(@driver, record_retries("#{instance.id}-running")) { |i| i.is_running? } }
     instances.each { |i| i.is_running?.must_equal true }
     instances.each { |i| @driver.destroy_instance(i.id) }
@@ -95,7 +95,7 @@ describe 'Ec2Driver Instances' do
     instance = @driver.create_instance('ami-aecd60c7',
                                        :realm_id => realm_id,
                                        :hwp_id => 'm1.small')
-    instance.must_be_kind_of Instance
+    instance.must_be_kind_of Deltacloud::Instance
     instance.realm_id.must_equal realm_id
     @driver.destroy_instance(instance.id)
   end
@@ -103,7 +103,7 @@ describe 'Ec2Driver Instances' do
   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? }
-    instance.must_be_kind_of Instance
+    instance.must_be_kind_of Deltacloud::Instance
     instance.is_running?.must_equal true
     @driver.reboot_instance(instance.id)
     @driver.instance(:id => instance.id).state.must_equal 'RUNNING'

data/tests/drivers/ec2/keys_test.rb

@@ -22,7 +22,7 @@ describe 'Ec2Driver Keys' do
 
   it 'must return list of keys' do
     @driver.keys.wont_be_empty
-    @driver.keys.first.must_be_kind_of Key
+    @driver.keys.first.must_be_kind_of Deltacloud::Key
   end
 
   it 'must allow to filter keys' do
@@ -35,7 +35,7 @@ describe 'Ec2Driver Keys' do
 
   it 'must allow to retrieve single key' do
     @driver.key(:id => 'test1').wont_be_nil
-    @driver.key(:id => 'test1').must_be_kind_of Key
+    @driver.key(:id => 'test1').must_be_kind_of Deltacloud::Key
     @driver.key(:id => 'test1').id.must_equal 'test1'
     @driver.key(:id => 'unknown').must_be_nil
   end
@@ -43,7 +43,7 @@ describe 'Ec2Driver Keys' do
   it 'must allow to create a new key' do
     key = @driver.create_key(:key_name => 'test-key-1')
     key.wont_be_nil
-    key.must_be_kind_of Key
+    key.must_be_kind_of Deltacloud::Key
     Proc.new { @driver.create_key(:key_name => 'test-key-1') }.must_raise Deltacloud::Exceptions::ProviderError, 'KeyExist'
     @driver.destroy_key :id => key.id
     @driver.key(:id => key.id).must_be_nil

data/tests/drivers/ec2/realms_test.rb

@@ -22,7 +22,7 @@ describe 'Ec2Driver Realms' do
 
   it 'must return list of realms' do
     @driver.realms.wont_be_empty
-    @driver.realms.first.must_be_kind_of Realm
+    @driver.realms.first.must_be_kind_of Deltacloud::Realm
   end
 
   it 'must allow to filter realms' do
@@ -35,7 +35,7 @@ describe 'Ec2Driver Realms' do
 
   it 'must allow to retrieve single realm' do
     @driver.realm(:id => 'us-east-1a').wont_be_nil
-    @driver.realm(:id => 'us-east-1a').must_be_kind_of Realm
+    @driver.realm(:id => 'us-east-1a').must_be_kind_of Deltacloud::Realm
     @driver.realm(:id => 'us-east-1b').id.must_equal 'us-east-1b'
     @driver.realm(:id => 'unknown').must_be_nil
   end

data/tests/drivers/ec2/storage_snapshots_test.rb

@@ -21,7 +21,7 @@ describe 'Ec2Driver StorageSnapshots' do
 
   it 'must return list of storage snapshots' do
     @driver.storage_snapshots.wont_be_empty
-    @driver.storage_snapshots.first.must_be_kind_of StorageSnapshot
+    @driver.storage_snapshots.first.must_be_kind_of Deltacloud::StorageSnapshot
   end
 
   it 'must allow to filter storage snapshots' do

data/tests/drivers/fgcp/common.rb

@@ -0,0 +1,32 @@
+require 'vcr'
+
+require 'require_relative' if RUBY_VERSION < '1.9'
+require_relative '../../test_helper.rb'
+
+
+# Credentials used to access FGCP server
+#
+ENV['FGCP_CERT_DIR'] =  File.join(File.dirname(__FILE__), 'cert')
+def credentials
+  {
+    :user => 'fgcp-testuser',
+    :password => 'fgcp-password',
+  }
+end
+
+#require 'turn' #internal_use_only
+#Turn.config.format = :outline #internal_use_only
+
+
+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
+  c.default_cassette_options = {
+    :record => :new_episodes,
+#    :record => :none,
+    :match_requests_on => [:method,
+    VCR.request_matchers.uri_without_param(:Signature, :AccessKeyId)]
+  }
+  #c.debug_logger = File.open(File.join('log', 'vcr.log'), 'w')
+end

data/tests/drivers/fgcp/firewall_test.rb

@@ -0,0 +1,70 @@
+#$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative 'common.rb'
+
+describe 'FgcpDriver Firewalls' do
+
+  before do
+    @driver = Deltacloud::new(:fgcp, 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.firewalls(OpenStruct.new(:user => 'unknown', :password => 'wrong'))
+    end.must_raise Deltacloud::Exceptions::AuthenticationFailure, 'Authentication Failure'
+  end
+
+  it 'must return list of firewalls' do
+    fws = @driver.firewalls
+    fws.wont_be_empty
+    fws.each { |fw| fw.must_be_kind_of Deltacloud::Firewall }
+    fws.each { |fw| fw.id.wont_be_nil }
+  end
+
+  it 'must allow to filter firewalls' do
+    fw = @driver.firewalls(:id => 'UZXC0GRT-ZG8ZJCJ07-S-0001')
+    fw.wont_be_empty
+    fw.must_be_kind_of Array
+    fw.size.must_equal 1
+    fw.first.id.must_equal 'UZXC0GRT-ZG8ZJCJ07-S-0001'
+    @driver.firewalls(:id => 'UZXC0GRT-ZG8ZJCJ07-S-0000').must_be_empty
+  end
+
+  it 'must allow to retrieve single firewall' do
+    fw = @driver.firewall(:id => 'UZXC0GRT-ZG8ZJCJ07-S-0001')
+    fw.wont_be_nil
+    fw.must_be_kind_of Deltacloud::Firewall
+    fw.id.must_equal 'UZXC0GRT-ZG8ZJCJ07-S-0001'
+    @driver.firewall(:id => 'UZXC0GRT-ZG8ZJCJ07-S-0000').must_be_nil
+  end
+
+  it 'must describe single firewall' do
+    fw = @driver.firewall(:id => 'UZXC0GRT-ZG8ZJCJ07-S-0001')
+    fw.wont_be_nil
+    fw.id.must_equal 'UZXC0GRT-ZG8ZJCJ07-S-0001'
+    fw.name.must_equal 'Firewall'
+    fw.owner_id.wont_be_nil
+    fw.description.wont_be_nil
+  end
+
+  it 'must list firewall rules' do
+    fw = @driver.firewall(:id => 'UZXC0GRT-ZG8ZJCJ07-S-0001')
+    fw.wont_be_nil
+    fw.rules.wont_be_empty
+    fw.rules.first.must_be_kind_of Deltacloud::FirewallRule
+    fw.rules.first.allow_protocol.wont_be_nil
+    fw.rules.first.port_from.wont_be_nil
+    fw.rules.first.port_to.wont_be_nil
+    fw.rules.first.direction.wont_be_nil
+    fw.rules.first.rule_action.wont_be_nil
+    fw.rules.first.log_rule.wont_be_nil
+    fw.rules.first.sources.wont_be_empty
+  end
+
+end

data/tests/drivers/fgcp/hardware_profiles_test.rb

@@ -0,0 +1,61 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative 'common.rb'
+
+describe 'FgcpDriver HardwareProfiles' do
+
+  before do
+    @driver = Deltacloud::new(:fgcp, 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.hardware_profiles(OpenStruct.new(:user => 'unknown', :password => 'wrong'))
+    end.must_raise Deltacloud::Exceptions::AuthenticationFailure, 'Authentication Failure'
+  end
+
+  it 'must return list of hardware_profiles' do
+    hardware_profiles = @driver.hardware_profiles
+    hardware_profiles.wont_be_empty
+    hardware_profiles.first.must_be_kind_of Deltacloud::HardwareProfile
+  end
+
+  it 'must allow to filter hardware_profiles' do
+    hardware_profiles = @driver.hardware_profiles :id => 'economy'
+    hardware_profiles.wont_be_empty
+    hardware_profiles.must_be_kind_of Array
+    hardware_profiles.size.must_equal 1
+    hardware_profiles.first.id.must_equal 'economy'
+    @driver.hardware_profiles(:id => 'unknown').must_be_empty
+  end
+
+  it 'must allow to retrieve single hardware_profile' do
+    hardware_profile = @driver.hardware_profile :id => 'economy'
+    hardware_profile.wont_be_nil
+    hardware_profile.id.must_equal 'economy'
+    hardware_profile.properties.must_be_kind_of Array
+    hardware_profile.properties.wont_be_empty
+    @driver.hardware_profile(:id => 'unknown').must_be_nil
+  end
+
+  it 'must include correct attributes' do
+    hardware_profile = @driver.hardware_profiles.first
+    hardware_profile.cpu.wont_be_nil
+    hardware_profile.cpu.value.wont_be :<, 1
+    hardware_profile.memory.wont_be_nil
+    hardware_profile.memory.value.wont_be :<=, 1740 #1740.8 is lowest (economy)
+    hardware_profile.storage.must_be_nil
+  end
+
+  it 'must include at least four profiles' do
+    hardware_profiles = @driver.hardware_profiles
+    hardware_profiles.size.wont_be :<, 4
+  end
+
+end