deltacloud-core 1.1.1 → 1.1.2

data/tests/drivers/openstack/images_test.rb

@@ -22,7 +22,7 @@ describe 'OpenStackDriver 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
@@ -40,7 +40,7 @@ describe 'OpenStackDriver Images' do
     @driver.image(:id => 'unknown').must_be_nil
     image = @driver.image :id => openstack_image_id
     image.wont_be_nil
-    image.must_be_kind_of Image
+    image.must_be_kind_of Deltacloud::Image
     image.id.must_equal openstack_image_id
     image.name.wont_be_empty
     image.owner_id.wont_be_empty

data/tests/drivers/openstack/instances_test.rb

@@ -29,7 +29,7 @@ describe 'OpenStackDriver 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
@@ -37,7 +37,6 @@ describe 'OpenStackDriver Instances' do
     instances.wont_be_empty
     instances.must_be_kind_of Array
     instances.size.must_equal 1
-    puts instances.inspect
     instances.first.id.must_equal '815215'
     @driver.instances(:id => 'unknown').must_be_empty
   end
@@ -61,7 +60,7 @@ describe 'OpenStackDriver Instances' do
     instance.image_id.must_equal '78265'
     instance.name.wont_be_empty
     instance.wait_for!(@driver, record_retries('inst_launch')) { |i| i.is_running? }
-    puts @driver.destroy_instance(instance.id).inspect
+    @driver.destroy_instance(instance.id)
   end
 
 end

data/tests/drivers/openstack/keys_test.rb

@@ -22,7 +22,7 @@ describe 'OpenStackDriver 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

data/tests/drivers/openstack/realms_test.rb

@@ -5,15 +5,6 @@ require_relative 'common.rb'
 
 describe 'OpenStackDriver Realms' do
 
-  def credentials
-  {
-    :user => "foo@fakedomain.eu+foo@fakedomain.eu-default-tenant",
-    :password => "1234fake56789",
-    :provider => "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/"
-  }
-  end
-
-
   before do
     @driver = Deltacloud::new(:openstack, credentials)
     VCR.insert_cassette __name__
@@ -23,7 +14,7 @@ describe 'OpenStackDriver Realms' do
     VCR.eject_cassette
   end
 
-  it 'must throw error when GET Realms with wrong credentials' do
+  it 'must throw error when wrong credentials' do
     Proc.new do
       @driver.backend.images(OpenStruct.new(:user => 'unknown+wrong', :password => 'wrong'))
     end.must_raise Deltacloud::Exceptions::AuthenticationFailure, 'Authentication Failure'
@@ -31,7 +22,7 @@ describe 'OpenStackDriver 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 retrieve single realm' do

data/tests/drivers/rhevm/common.rb

@@ -2,23 +2,44 @@ require 'vcr'
 
 require_relative '../../test_helper'
 
-# Credentials used to access RHEV-M server
+# The configuration for RHEVM in ~/.deltacloud/config should look like
+# this:
+#    rhevm:
+#      user: USERNAME
+#      password: PASSWORD
+#      provider: https://rhevm.example.com/api
+#      preferred:
+#        datacenter: UUID of a datacenter/realm
+#        vm: UUID of an existing instance
+#        template: UUID of an existing template
 #
-# NOTE: If these are changed, the VCR fixtures need to be re-recorded
-#
-def credentials
-  {
-    :user => 'admin@internal',
-    :password => 'redhat',
-    :provider => 'https://dell-per610-02.lab.eng.brq.redhat.com/api;9df72b84-0234-11e2-9b87-9386d9b09d4a'
-  }
+# Anything in the preferred part of the config is also written into
+# ./fixtures/preferences.yml and used when playing back fixtures
+
+if vcr_recording?
+  Deltacloud::Test::config.save(:rhevm, File.dirname(__FILE__)) do |h|
+    u = URI::parse(h["provider"])
+    u.host = "rhevm.example.com"
+    h["provider"] = u.to_s
+  end
+else
+  Deltacloud::Test::config.load(:rhevm, File.dirname(__FILE__))
 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
-  # Set this to :new_episodes when you want to 're-record'
-  #c.default_cassette_options = { :record => :new_episodes }
-  c.default_cassette_options = { :record => :none }
+  # Rewrite sensitive information before recording
+  c.before_record do |i|
+    u = URI::parse(i.request.uri)
+    u.host = "rhevm.example.com"
+    u.user = "fakeuser"
+    u.password = "fakepassword"
+    i.request.uri = u.to_s
+  end
+  c.default_cassette_options = {
+    :record => vcr_record_mode,
+    :match_requests_on => [ :method, :path, :query ]
+  }
 end

data/tests/drivers/rhevm/images_test.rb

@@ -6,7 +6,10 @@ require_relative 'common'
 describe 'RhevmDriver Images' do
 
   before do
-    @driver = Deltacloud::new(:rhevm, credentials)
+    prefs = Deltacloud::Test::config.preferences(:rhevm)
+    @template_id = prefs["template"]
+
+    @driver = Deltacloud::Test::config.driver(:rhevm)
     VCR.insert_cassette __name__
   end
 
@@ -22,16 +25,18 @@ describe 'RhevmDriver 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
-    @driver.images(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').wont_be_empty
-    @driver.images(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').must_be_kind_of Array
-    @driver.images(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').size.must_equal 1
-    @driver.images(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').first.id.must_equal '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5'
-    @driver.images(:owner_id => 'admin@internal').each do |img|
-      img.owner_id.must_equal 'admin@internal'
+    imgs = @driver.images(:id => @template_id)
+    imgs.wont_be_empty
+    imgs.must_be_kind_of Array
+    imgs.size.must_equal 1
+    imgs.first.id.must_equal @template_id
+    owner_id = imgs.first.owner_id
+    @driver.images(:owner_id => owner_id).each do |img|
+      img.owner_id.must_equal owner_id
     end
     @driver.images(:id => 'ami-aaaaaaaa').must_be_empty
     @driver.images(:id => 'unknown').must_be_empty
@@ -42,9 +47,10 @@ describe 'RhevmDriver Images' do
     # of YAML under Ruby 1.8.
     #
     if RUBY_VERSION =~ /^1\.9/
-      @driver.image(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').wont_be_nil
-      @driver.image(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').must_be_kind_of Image
-      @driver.image(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').id.must_equal '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5'
+      img = @driver.image(:id => @template_id)
+      img.wont_be_nil
+      img.must_be_kind_of Deltacloud::Image
+      img.id.must_equal @template_id
       @driver.image(:id => 'ami-aaaaaaaa').must_be_nil
       @driver.image(:id => 'unknown').must_be_nil
     end
@@ -52,7 +58,7 @@ describe 'RhevmDriver Images' do
 
   it 'must throw proper exception when destroying used image' do
     if RUBY_VERSION =~ /^1\.9/
-      image = @driver.image(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5')
+      image = @driver.image(:id => @template_id)
       image.wont_be_nil
       image.state.must_equal 'OK'
       Proc.new {
@@ -62,6 +68,8 @@ describe 'RhevmDriver Images' do
   end
 
   it 'must support destroying images' do
+    skip "Depends on hardcoded image"
+    # FIXME: we need to create a new image here, and then destroy it
     image = @driver.image(:id => '5472e759-dee1-4e90-a2bf-79b61a601e80')
     image.wont_be_nil
     image.state.must_equal 'OK'

data/tests/drivers/rhevm/instance_test.rb

@@ -6,7 +6,12 @@ require_relative 'common.rb'
 describe 'RhevmDriver Instances' do
 
   before do
-    @driver = Deltacloud::new(:rhevm, credentials)
+    prefs = Deltacloud::Test::config.preferences(:rhevm)
+    @dc_id = prefs["datacenter"]
+    @vm_id = prefs["vm"]
+    @template_id = prefs["template"]
+
+    @driver = Deltacloud::Test::config.driver(:rhevm)
     VCR.insert_cassette __name__
   end
 
@@ -22,83 +27,94 @@ describe 'RhevmDriver 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
-    @driver.instances(:id =>'a949192d-55eb-465c-9ef1-d59581a562a3').wont_be_empty
-    @driver.instances(:id =>'a949192d-55eb-465c-9ef1-d59581a562a3').must_be_kind_of Array
-    @driver.instances(:id =>'a949192d-55eb-465c-9ef1-d59581a562a3').size.must_equal 1
-    @driver.instances(:id => 'a949192d-55eb-465c-9ef1-d59581a562a3').first.id.must_equal 'a949192d-55eb-465c-9ef1-d59581a562a3'
-    @driver.instances(:owner_id => 'admin@internal').wont_be_empty
-    @driver.instances(:owner_id => 'admin@internal').each do |inst|
-      inst.owner_id.must_equal 'admin@internal'
-    end
+    insts = @driver.instances(:id =>@vm_id)
+    insts.wont_be_empty
+    insts.must_be_kind_of Array
+    insts.size.must_equal 1
+    insts.first.id.must_equal @vm_id
     @driver.instances(:id => 'i-00000000').must_be_empty
     @driver.instances(:id => 'unknown').must_be_empty
   end
 
   it 'must allow to retrieve single instance' do
-    @driver.instance(:id => 'a949192d-55eb-465c-9ef1-d59581a562a3').wont_be_nil
-    @driver.instance(:id => 'a949192d-55eb-465c-9ef1-d59581a562a3').must_be_kind_of Instance
-    @driver.instance(:id => 'a949192d-55eb-465c-9ef1-d59581a562a3').id.must_equal 'a949192d-55eb-465c-9ef1-d59581a562a3'
+    inst = @driver.instance(:id => @vm_id)
+    inst.wont_be_nil
+    inst.must_be_kind_of Deltacloud::Instance
+    inst.id.must_equal @vm_id
     @driver.instance(:id => 'i-00000000').must_be_nil
     @driver.instance(:id => 'unknown').must_be_nil
   end
 
   it 'must allow to create a new instance and destroy it' do
-    instance = @driver.create_instance('5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5',
-                                       :realm_id => '99408929-82cf-4dc7-a532-9d998063fa95',
+    instance = @driver.create_instance(@template_id,
+                                       :realm_id => @dc_id,
                                        :hwp_id => 'SERVER',
                                        :hwp_memory => '1024',
                                        :user_data => 'test user data'
                                       )
-    instance = instance.wait_for!(@driver, record_retries) { |i| i.is_stopped? }
-    instance.must_be_kind_of Instance
+    instance = instance.wait_for!(@driver, record_retries('', :timeout => 60)) { |i| i.is_stopped? }
+    instance.must_be_kind_of Deltacloud::Instance
     instance.is_running?.must_equal false
-    @driver.instance(:id => instance.id).wont_be_nil
-    @driver.instance(:id => instance.id).id.must_equal instance.id
-    @driver.instance(:id => instance.id).name.wont_be_nil
-    @driver.instance(:id => instance.id).instance_profile.name.must_equal 'SERVER'
-    @driver.instance(:id => instance.id).instance_profile.memory.must_equal 1024
-    @driver.instance(:id => instance.id).realm_id.must_equal '99408929-82cf-4dc7-a532-9d998063fa95'
-    @driver.instance(:id => instance.id).image_id.must_equal '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5'
-    @driver.instance(:id => instance.id).owner_id.must_equal 'admin@internal'
-    @driver.instance(:id => instance.id).state.must_equal 'STOPPED'
-    @driver.instance(:id => instance.id).actions.must_include :start
+
+    inst = @driver.instance(:id => instance.id)
+    inst.wont_be_nil
+    inst.id.must_equal instance.id
+    inst.name.wont_be_nil
+    inst.instance_profile.name.must_equal 'SERVER'
+    inst.instance_profile.memory.must_equal 1024
+    inst.realm_id.must_equal @dc_id
+    inst.image_id.must_equal @template_id
+    inst.state.must_equal 'STOPPED'
+    inst.actions.must_include :start
     @driver.destroy_instance(instance.id)
     instance.wait_for!(@driver, record_retries('destroy')) { |i| i.nil? }
   end
 
+
   it 'must allow to create a new instance and make it running' do
-    instance = @driver.create_instance('5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5',
-                                       :realm_id => '99408929-82cf-4dc7-a532-9d998063fa95',
+    instance = @driver.create_instance(@template_id,
+                                       :realm_id => @dc_id,
                                        :hwp_id => 'SERVER',
                                        :hwp_memory => '1024',
                                        :user_data => 'test user data'
                                       )
-    instance = instance.wait_for!(@driver, record_retries) { |i| i.is_stopped? }
-    instance.must_be_kind_of Instance
+    instance = instance.wait_for!(@driver, record_retries('', :timeout => 60)) { |i| i.is_stopped? }
+    skip "Skip this test due to RHEVm bug: https://bugzilla.redhat.com/show_bug.cgi?id=910741"
+    instance.must_be_kind_of Deltacloud::Instance
     instance.is_running?.must_equal false
-    @driver.instance(:id => instance.id).wont_be_nil
-    @driver.instance(:id => instance.id).id.must_equal instance.id
-    @driver.instance(:id => instance.id).name.wont_be_nil
-    @driver.instance(:id => instance.id).instance_profile.name.must_equal 'SERVER'
-    @driver.instance(:id => instance.id).instance_profile.memory.must_equal 1024
-    @driver.instance(:id => instance.id).realm_id.must_equal '99408929-82cf-4dc7-a532-9d998063fa95'
-    @driver.instance(:id => instance.id).image_id.must_equal '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5'
-    @driver.instance(:id => instance.id).owner_id.must_equal 'admin@internal'
-    @driver.instance(:id => instance.id).state.must_equal 'STOPPED'
-    @driver.instance(:id => instance.id).actions.must_include :start
+
+    inst = @driver.instance(:id => instance.id)
+    inst.wont_be_nil
+    inst.id.must_equal instance.id
+    inst.name.wont_be_nil
+    inst.instance_profile.name.must_equal 'SERVER'
+    inst.instance_profile.memory.must_equal 1024
+    inst.realm_id.must_equal @dc_id
+    inst.image_id.must_equal @template_id
+    inst.state.must_equal 'STOPPED'
+    inst.actions.must_include :start
+
     @driver.start_instance(instance.id)
-    instance = instance.wait_for!(@driver, record_retries('start')) { |i| i.is_running? }
-    @driver.instance(:id => instance.id).state.must_equal 'RUNNING'
-    Proc.new { @driver.destroy_instance(instance.id) }.must_raise Deltacloud::Exceptions::BackendError, 'Cannot remove VM. VM is running.'
+    instance = instance.wait_for!(@driver, record_retries('start', :timeout => 60)) { |i| i.is_running? }
+
+    inst = @driver.instance(:id => instance.id)
+    inst.state.must_equal 'RUNNING'
+    inst.actions.must_include :stop
+
+    Proc.new do
+      @driver.destroy_instance(instance.id)
+    end.must_raise Deltacloud::Exceptions::BackendError, 'Cannot remove VM. VM is running.'
+
     @driver.stop_instance(instance.id)
-    instance = instance.wait_for!(@driver, record_retries('stop')) { |i| i.is_stopped? }
+    instance = instance.wait_for!(@driver, record_retries('stop', :timeout => 60)) { |i| i.is_stopped?  }
     @driver.instance(:id => instance.id).state.must_equal 'STOPPED'
+
     @driver.destroy_instance(instance.id)
-    instance.wait_for!(@driver, record_retries('destroy')) { |i| i.nil? }
+    instance.wait_for!(@driver, record_retries('destroy', :timeout => 60)) { |i| i.nil? }
   end
 
 end

data/tests/drivers/rhevm/provider_test.rb

@@ -6,7 +6,8 @@ require_relative 'common.rb'
 describe 'RHEV-M provider test' do
 
   before do
-    @driver = Deltacloud::new(:rhevm, credentials)
+    @config = Deltacloud::Test::config
+    @driver = @config.driver(:rhevm)
     VCR.insert_cassette __name__
   end
 
@@ -15,7 +16,9 @@ describe 'RHEV-M provider test' do
   end
 
   it 'must throw error when using wrong provider' do
-    wrong_driver = Deltacloud::new(:rhevm, credentials.merge(:provider => 'unknown'))
+    creds = @config.credentials(:rhevm).merge(:provider => 'unknown')
+    creds[:provider] = 'unknown'
+    wrong_driver = Deltacloud::new(:rhevm, creds)
     Proc.new {
       wrong_driver.realms
     }.must_raise Deltacloud::Exceptions::BackendError
@@ -23,19 +26,22 @@ describe 'RHEV-M provider test' do
 
   it 'must support listing of available providers' do
     @driver.providers.wont_be_empty
-    @driver.providers.each { |p| p.must_be_kind_of Provider }
+    @driver.providers.each { |p| p.must_be_kind_of Deltacloud::Provider }
     @driver.providers.each { |p| p.name.wont_be_empty }
     @driver.providers.each { |p| p.id.wont_be_empty }
     @driver.providers.each { |p| p.url.wont_be_empty }
   end
 
   it 'must switch realms when switching between different clusters' do
-
-    provider1 = @driver.provider(:id => '9df72b84-0234-11e2-9b87-9386d9b09d4a')
+    provs = @driver.providers
+    if provs.size < 2
+      skip "We need at least two providers (clusters)"
+    end
+    provider1 = provs[0]
     provider1.wont_be_nil
     provider1.url.wont_be_empty
 
-    provider2 = @driver.provider(:id => '9df72b84-0234-11e2-9b87-9386d9b09d4a')
+    provider2 = provs[1]
     provider2.wont_be_nil
     provider2.url.wont_be_empty
 

data/tests/drivers/rhevm/realms_test.rb

@@ -6,7 +6,10 @@ require_relative 'common.rb'
 describe 'RhevmDriver Realms' do
 
   before do
-    @driver = Deltacloud::new(:rhevm, credentials)
+    prefs = Deltacloud::Test::config.preferences(:rhevm)
+    @dc_id = prefs["datacenter"]
+
+    @driver = Deltacloud::Test::config.driver(:rhevm)
     VCR.insert_cassette __name__
   end
 
@@ -21,21 +24,24 @@ describe 'RhevmDriver Realms' do
   end
 
   it 'must return list of realms' do
-    @driver.realms.wont_be_empty
-    @driver.realms.first.must_be_kind_of Realm
+    realms = @driver.realms
+    realms.wont_be_empty
+    realms.first.must_be_kind_of Deltacloud::Realm
   end
 
   it 'must allow to filter realms' do
-    @driver.realms(:id => '99408929-82cf-4dc7-a532-9d998063fa95').wont_be_empty
-    @driver.realms(:id => '99408929-82cf-4dc7-a532-9d998063fa95').must_be_kind_of Array
-    @driver.realms(:id => '99408929-82cf-4dc7-a532-9d998063fa95').size.must_equal 1
-    @driver.realms(:id => '99408929-82cf-4dc7-a532-9d998063fa95').first.id.must_equal '99408929-82cf-4dc7-a532-9d998063fa95'
+    realms = @driver.realms(:id => @dc_id)
+    realms.wont_be_empty
+    realms.must_be_kind_of Array
+    realms.size.must_equal 1
+    realms.first.id.must_equal @dc_id
     @driver.realms(:id => 'unknown').must_be_empty
   end
 
   it 'must allow to retrieve single realm' do
-    @driver.realm(:id => '99408929-82cf-4dc7-a532-9d998063fa95').wont_be_nil
-    @driver.realm(:id => '99408929-82cf-4dc7-a532-9d998063fa95').must_be_kind_of Realm
+    realm = @driver.realm(:id => @dc_id)
+    realm.wont_be_nil
+    realm.must_be_kind_of Deltacloud::Realm
     @driver.realm(:id => 'unknown').must_be_nil
   end