deltacloud-core 1.0.1 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (222) hide show
  1. data/Rakefile +99 -141
  2. data/bin/deltacloudd +4 -1
  3. data/config.ru +13 -6
  4. data/config/drivers/aruba.yaml +8 -0
  5. data/config/drivers/fgcp.yaml +3 -2
  6. data/deltacloud-core.gemspec +13 -9
  7. data/lib/cimi/collections/cloud_entry_point.rb +1 -1
  8. data/lib/cimi/models.rb +1 -7
  9. data/lib/cimi/models/base.rb +1 -4
  10. data/lib/cimi/models/cloud_entry_point.rb +14 -0
  11. data/lib/cimi/models/machine.rb +4 -4
  12. data/lib/cimi/models/machine_admin.rb +1 -0
  13. data/lib/cimi/models/machine_configuration.rb +4 -4
  14. data/lib/cimi/models/schema.rb +17 -14
  15. data/lib/cimi/models/volume_image.rb +1 -1
  16. data/lib/cimi/server.rb +1 -1
  17. data/lib/deltacloud/api.rb +55 -3
  18. data/lib/deltacloud/collections/addresses.rb +1 -1
  19. data/lib/deltacloud/collections/buckets.rb +12 -10
  20. data/lib/deltacloud/collections/firewalls.rb +2 -1
  21. data/lib/deltacloud/collections/hardware_profiles.rb +1 -1
  22. data/lib/deltacloud/collections/images.rb +2 -2
  23. data/lib/deltacloud/collections/instance_states.rb +6 -3
  24. data/lib/deltacloud/collections/instances.rb +2 -1
  25. data/lib/deltacloud/collections/keys.rb +6 -2
  26. data/lib/deltacloud/collections/load_balancers.rb +8 -7
  27. data/lib/deltacloud/collections/metrics.rb +2 -1
  28. data/lib/deltacloud/collections/realms.rb +1 -1
  29. data/lib/deltacloud/collections/storage_snapshots.rb +2 -1
  30. data/lib/deltacloud/collections/storage_volumes.rb +2 -2
  31. data/lib/deltacloud/core_ext.rb +1 -7
  32. data/lib/deltacloud/core_ext/hash.rb +7 -5
  33. data/lib/deltacloud/core_ext/string.rb +1 -0
  34. data/lib/deltacloud/drivers/aruba/aruba_driver.rb +469 -0
  35. data/lib/deltacloud/drivers/base_driver.rb +12 -17
  36. data/lib/deltacloud/drivers/ec2/ec2_driver.rb +50 -22
  37. data/lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb +1 -1
  38. data/lib/deltacloud/drivers/exceptions.rb +12 -2
  39. data/lib/deltacloud/drivers/features.rb +8 -0
  40. data/lib/deltacloud/drivers/fgcp/fgcp_client.rb +21 -6
  41. data/lib/deltacloud/drivers/fgcp/fgcp_driver.rb +169 -57
  42. data/lib/deltacloud/drivers/gogrid/gogrid_driver.rb +1 -1
  43. data/lib/deltacloud/drivers/mock/mock_client.rb +2 -0
  44. data/lib/deltacloud/drivers/mock/mock_driver.rb +101 -13
  45. data/lib/deltacloud/drivers/opennebula/occi_client.rb +12 -6
  46. data/lib/deltacloud/drivers/opennebula/opennebula_driver.rb +10 -18
  47. data/lib/deltacloud/drivers/openstack/openstack_driver.rb +46 -1
  48. data/lib/deltacloud/drivers/rhevm/rhevm_driver.rb +17 -17
  49. data/lib/deltacloud/drivers/vsphere/vsphere_driver.rb +4 -4
  50. data/lib/deltacloud/helpers.rb +4 -4
  51. data/lib/deltacloud/helpers/blob_stream_helper.rb +4 -6
  52. data/lib/deltacloud/helpers/deltacloud_helper.rb +17 -1
  53. data/lib/deltacloud/helpers/driver_helper.rb +7 -3
  54. data/lib/deltacloud/helpers/url_helper.rb +4 -4
  55. data/lib/deltacloud/models/address.rb +1 -1
  56. data/lib/deltacloud/models/base_model.rb +0 -14
  57. data/lib/deltacloud/models/bucket.rb +0 -10
  58. data/lib/deltacloud/models/hardware_profile.rb +5 -26
  59. data/lib/deltacloud/models/image.rb +0 -12
  60. data/lib/deltacloud/models/instance.rb +6 -22
  61. data/lib/deltacloud/models/key.rb +2 -2
  62. data/lib/deltacloud/models/metric.rb +1 -1
  63. data/lib/deltacloud/models/storage_snapshot.rb +4 -0
  64. data/lib/deltacloud/server.rb +8 -2
  65. data/lib/deltacloud_rack.rb +40 -10
  66. data/lib/ec2/query_parser.rb +9 -4
  67. data/lib/ec2/server.rb +1 -1
  68. data/lib/ec2/views/create_key_pair.haml +3 -0
  69. data/lib/ec2/views/delete_key_pair.haml +1 -0
  70. data/lib/ec2/views/describe_availability_zones.haml +6 -0
  71. data/lib/ec2/views/describe_images.haml +10 -0
  72. data/lib/ec2/views/describe_instance_set.haml +24 -0
  73. data/lib/ec2/views/describe_instances.haml +9 -0
  74. data/lib/ec2/views/describe_key_pairs.haml +5 -0
  75. data/lib/ec2/views/error.haml +4 -0
  76. data/lib/ec2/views/instance_action.haml +9 -0
  77. data/lib/ec2/views/reboot_instances.haml +1 -0
  78. data/lib/ec2/views/run_instances.haml +7 -0
  79. data/lib/ec2/views/start_instances.haml +1 -0
  80. data/lib/ec2/views/stop_instances.haml +1 -0
  81. data/lib/ec2/views/terminate_instances.haml +9 -0
  82. data/lib/sinatra.rb +0 -1
  83. data/lib/sinatra/rack_accept.rb +1 -1
  84. data/lib/sinatra/rack_driver_select.rb +2 -2
  85. data/lib/sinatra/rack_etag.rb +5 -1
  86. data/lib/sinatra/rack_logger.rb +127 -0
  87. data/lib/sinatra/rack_matrix_params.rb +1 -1
  88. data/tests/cimi/collections/cloud_entry_point_test.rb +46 -0
  89. data/tests/cimi/collections/common.rb +17 -0
  90. data/tests/cimi/collections/machine_images_test.rb +44 -0
  91. data/tests/cimi/collections/machines_test.rb +41 -0
  92. data/tests/cimi/spec/cimi/model/machine_admin_spec.rb +35 -0
  93. data/tests/cimi/spec/cimi/model/machine_configuration_spec.rb +31 -0
  94. data/tests/cimi/spec/cimi/model/machine_image_spec.rb +33 -0
  95. data/tests/cimi/spec/cimi/model/machine_spec.rb +32 -0
  96. data/tests/cimi/spec/cimi/model/machine_template_spec.rb +32 -0
  97. data/tests/cimi/spec/cimi/model/schema_spec.rb +245 -0
  98. data/tests/cimi/spec/cimi/model/volume_configuration_spec.rb +34 -0
  99. data/tests/cimi/spec/cimi/model/volume_image_spec.rb +33 -0
  100. data/tests/cimi/spec/cimi/model/volume_spec.rb +32 -0
  101. data/tests/cimi/spec/cimi/model/volume_template_spec.rb +32 -0
  102. data/tests/cimi/spec/spec_helper.rb +136 -0
  103. data/tests/deltacloud/base_collection_test.rb +30 -0
  104. data/tests/deltacloud/collections/buckets_collection_test.rb +65 -0
  105. data/tests/deltacloud/collections/drivers_collection_test.rb +37 -0
  106. data/tests/deltacloud/collections/hardware_profiles_collection_test.rb +53 -0
  107. data/tests/deltacloud/collections/images_collection_test.rb +59 -0
  108. data/tests/deltacloud/collections/instance_states_collection_test.rb +34 -0
  109. data/tests/deltacloud/collections/instances_collection_test.rb +63 -0
  110. data/tests/deltacloud/collections/keys_collection_test.rb +63 -0
  111. data/tests/deltacloud/collections_test.rb +35 -0
  112. data/tests/deltacloud/common.rb +14 -0
  113. data/tests/deltacloud/deltacloud_helper_test.rb +55 -0
  114. data/tests/deltacloud/drivers_test.rb +73 -0
  115. data/tests/deltacloud/rack_test.rb +51 -0
  116. data/tests/deltacloud/server_test.rb +149 -0
  117. data/tests/{api → deprecated/api}/common.rb +0 -0
  118. data/tests/{api → deprecated/api}/driver_test.rb +0 -0
  119. data/tests/deprecated/api/library_test.rb +6 -0
  120. data/tests/{cimi → deprecated/cimi}/features/step_definitions/common_steps.rb +0 -0
  121. data/tests/{cimi → deprecated/cimi}/features/step_definitions/machine_images_steps.rb +0 -0
  122. data/tests/{cimi → deprecated/cimi}/features/step_definitions/machines_steps.rb +0 -0
  123. data/tests/{cimi → deprecated/cimi}/features/step_definitions/volumes_steps.rb +0 -0
  124. data/tests/{cimi → deprecated/cimi}/features/support/env.rb +0 -0
  125. data/tests/{common.rb → deprecated/common.rb} +0 -0
  126. data/tests/{core_ext → deprecated/core_ext}/string.rb +0 -0
  127. data/tests/{drivers → deprecated/drivers}/ec2/api_test.rb +0 -0
  128. data/tests/deprecated/drivers/ec2/common.rb +23 -0
  129. data/tests/{drivers → deprecated/drivers}/ec2/drivers_test.rb +0 -0
  130. data/tests/{drivers → deprecated/drivers}/ec2/hardware_profiles_test.rb +0 -0
  131. data/tests/deprecated/drivers/ec2/images_test.rb +230 -0
  132. data/tests/{drivers → deprecated/drivers}/ec2/instances_test.rb +0 -0
  133. data/tests/deprecated/drivers/ec2/keys_test.rb +181 -0
  134. data/tests/deprecated/drivers/ec2/realms_test.rb +146 -0
  135. data/tests/{drivers → deprecated/drivers}/fgcp/api_test.rb +0 -0
  136. data/tests/{drivers → deprecated/drivers}/fgcp/hardware_profiles_test.rb +0 -0
  137. data/tests/{drivers → deprecated/drivers}/fgcp/realms_test.rb +0 -0
  138. data/tests/{drivers → deprecated/drivers}/fgcp/setup.rb +0 -0
  139. data/tests/{drivers → deprecated/drivers}/google/api_test.rb +0 -0
  140. data/tests/{drivers → deprecated/drivers}/google/buckets_test.rb +0 -0
  141. data/tests/{drivers → deprecated/drivers}/google/common.rb +2 -2
  142. data/tests/{drivers → deprecated/drivers}/mock/api_test.rb +0 -0
  143. data/tests/{drivers → deprecated/drivers}/mock/buckets_test.rb +0 -0
  144. data/tests/{drivers → deprecated/drivers}/mock/common.rb +0 -0
  145. data/tests/{drivers → deprecated/drivers}/mock/drivers_test.rb +0 -0
  146. data/tests/{drivers → deprecated/drivers}/mock/hardware_profiles_test.rb +0 -0
  147. data/tests/deprecated/drivers/mock/images_test.rb +197 -0
  148. data/tests/deprecated/drivers/mock/instances_test.rb +343 -0
  149. data/tests/deprecated/drivers/mock/keys_test.rb +161 -0
  150. data/tests/deprecated/drivers/mock/realms_test.rb +132 -0
  151. data/tests/deprecated/drivers/mock/storage_snapshots_test.rb +114 -0
  152. data/tests/deprecated/drivers/mock/storage_volumes_test.rb +122 -0
  153. data/tests/{drivers → deprecated/drivers}/openstack/api_test.rb +0 -0
  154. data/tests/{drivers → deprecated/drivers}/openstack/common.rb +0 -0
  155. data/tests/{drivers → deprecated/drivers}/openstack/hardware_profiles_test.rb +0 -0
  156. data/tests/{drivers → deprecated/drivers}/openstack/images_test.rb +0 -0
  157. data/tests/{drivers → deprecated/drivers}/openstack/instances_test.rb +0 -0
  158. data/tests/{drivers → deprecated/drivers}/openstack/realms_test.rb +0 -0
  159. data/tests/{drivers → deprecated/drivers}/rackspace/api_test.rb +0 -0
  160. data/tests/{drivers → deprecated/drivers}/rackspace/buckets_test.rb +0 -0
  161. data/tests/{drivers → deprecated/drivers}/rackspace/common.rb +0 -0
  162. data/tests/{drivers → deprecated/drivers}/rackspace/hardware_profiles_test.rb +0 -0
  163. data/tests/{drivers → deprecated/drivers}/rackspace/images_test.rb +0 -0
  164. data/tests/{drivers → deprecated/drivers}/rackspace/instances_test.rb +0 -0
  165. data/tests/{drivers → deprecated/drivers}/rackspace/realms_test.rb +0 -0
  166. data/tests/{drivers → deprecated/drivers}/rhevm/api_test.rb +0 -0
  167. data/tests/deprecated/drivers/rhevm/common.rb +21 -0
  168. data/tests/{drivers → deprecated/drivers}/rhevm/hardware_profiles_test.rb +0 -0
  169. data/tests/deprecated/drivers/rhevm/images_test.rb +48 -0
  170. data/tests/{drivers → deprecated/drivers}/rhevm/instances_test.rb +0 -0
  171. data/tests/deprecated/drivers/rhevm/realms_test.rb +40 -0
  172. data/tests/{minitest_common.rb → deprecated/minitest_common.rb} +0 -0
  173. data/tests/{minitest_common_api_test.rb → deprecated/minitest_common_api_test.rb} +0 -0
  174. data/tests/{rabbit_test.rb → deprecated/rabbit_test.rb} +0 -0
  175. data/tests/drivers/base/base_driver_test.rb +124 -0
  176. data/tests/{api → drivers/base}/library_test.rb +2 -8
  177. data/tests/drivers/ec2/common.rb +23 -15
  178. data/tests/drivers/ec2/images_test.rb +30 -211
  179. data/tests/drivers/ec2/instance_test.rb +104 -0
  180. data/tests/drivers/ec2/keys_test.rb +32 -161
  181. data/tests/drivers/ec2/realms_test.rb +26 -128
  182. data/tests/drivers/ec2/storage_snapshots_test.rb +54 -0
  183. data/tests/drivers/mock/images_test.rb +37 -179
  184. data/tests/drivers/mock/instances_test.rb +103 -340
  185. data/tests/drivers/mock/keys_test.rb +30 -145
  186. data/tests/drivers/mock/realms_test.rb +23 -118
  187. data/tests/drivers/mock/storage_snapshots_test.rb +23 -100
  188. data/tests/drivers/mock/storage_volumes_test.rb +41 -104
  189. data/tests/drivers/models/address_test.rb +18 -0
  190. data/tests/drivers/models/base_test.rb +33 -0
  191. data/tests/drivers/models/blob_test.rb +18 -0
  192. data/tests/drivers/models/hardware_profile_test.rb +52 -0
  193. data/tests/drivers/models/instance_address_test.rb +24 -0
  194. data/tests/drivers/models/instance_profile_test.rb +21 -0
  195. data/tests/drivers/models/instance_test.rb +29 -0
  196. data/tests/drivers/models/keys_test.rb +25 -0
  197. data/tests/drivers/models/metrics_test.rb +20 -0
  198. data/tests/drivers/rhevm/common.rb +15 -15
  199. data/tests/drivers/rhevm/images_test.rb +61 -36
  200. data/tests/drivers/rhevm/instance_test.rb +104 -0
  201. data/tests/drivers/rhevm/provider_test.rb +48 -0
  202. data/tests/drivers/rhevm/realms_test.rb +40 -37
  203. data/tests/ec2/common.rb +24 -0
  204. data/tests/ec2/query_parser_test.rb +98 -0
  205. data/tests/ec2/server_test.rb +45 -0
  206. data/tests/helpers/core_ext/array_test.rb +24 -0
  207. data/tests/helpers/core_ext/hash_test.rb +42 -0
  208. data/tests/helpers/core_ext/integer_test.rb +19 -0
  209. data/tests/helpers/core_ext/string_test.rb +74 -0
  210. data/tests/test_helper.rb +66 -0
  211. data/views/api/show.html.haml +1 -2
  212. data/views/api/show.xml.haml +1 -2
  213. data/views/blobs/show.xml.haml +1 -2
  214. data/views/keys/new.html.haml +9 -2
  215. data/views/load_balancers/new.html.haml +35 -34
  216. data/views/metrics/index.html.haml +1 -1
  217. data/views/metrics/show.html.haml +2 -2
  218. data/views/metrics/show.xml.haml +6 -2
  219. data/views/storage_volumes/attach.html.haml +1 -1
  220. data/views/storage_volumes/show.html.haml +1 -1
  221. metadata +853 -544
  222. data/lib/sinatra/accept_media_types.rb +0 -154
@@ -0,0 +1,21 @@
1
+ load File.join(File.dirname(__FILE__), '..', '..', 'common.rb')
2
+
3
+ ENV['API_USER'] = 'vdcadmin@rhev.lab.eng.brq.redhat.com'
4
+ ENV['API_PASSWORD'] = '123456'
5
+ ENV['API_PROVIDER'] = 'https://rhev30-dc.lab.eng.brq.redhat.com:8443/rhevm-api;645e425e-66fe-4ac9-8874-537bd10ef08d'
6
+
7
+ require 'vcr'
8
+
9
+ DeltacloudTestCommon::record!
10
+
11
+ VCR.config do |c|
12
+ c.cassette_library_dir = File.join(File.dirname(__FILE__), 'fixtures')
13
+ c.stub_with :webmock
14
+ c.default_cassette_options = { :record => :none }
15
+ end
16
+
17
+ class WebMock::Config
18
+ def net_http_connect_on_start
19
+ true
20
+ end
21
+ end
@@ -0,0 +1,48 @@
1
+ $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
+ require 'tests/drivers/rhevm/common'
3
+
4
+ module RHEVMTest
5
+
6
+ class ImagesTest < Test::Unit::TestCase
7
+ include Rack::Test::Methods
8
+
9
+ def app
10
+ Rack::Builder.new {
11
+ map '/' do
12
+ use Rack::Static, :urls => ["/stylesheets", "/javascripts"], :root => "public"
13
+ run Rack::Cascade.new([Deltacloud::API])
14
+ end
15
+ }
16
+ end
17
+
18
+ def test_01_it_returns_images
19
+ get_auth_url '/api;driver=rhevm/images'
20
+ puts last_response.body
21
+ (last_xml_response/'images/image').length.should > 0
22
+ end
23
+
24
+ def test_02_each_image_has_correct_properties
25
+ get_auth_url '/api;driver=rhevm/images'
26
+ (last_xml_response/'images/image').each do |image|
27
+ (image/'name').should_not == nil
28
+ (image/'name').should_not == ''
29
+ (image/'description').should_not == nil
30
+ (image/'description').should_not == ''
31
+ (image/'architecture').should_not == nil
32
+ (image/'architecture').should_not == ''
33
+ (image/'state').text.should == 'OK'
34
+ (image/'owner_id').text.should == ENV['API_USER']
35
+ (image/'actions/link').length.should == 1
36
+ (image/'actions/link').first[:rel].should == 'create_instance'
37
+ end
38
+ end
39
+
40
+ def test_03_it_returns_single_image
41
+ get_auth_url '/api;driver=rhevm/images/3e82e2d5-913f-4095-ae72-ebcfa9d0571d'
42
+ (last_xml_response/'image').length.should == 1
43
+ (last_xml_response/'image/name').text.should == 'f15-minimal-2'
44
+ (last_xml_response/'image/state').text.should == 'OK'
45
+ end
46
+
47
+ end
48
+ end
@@ -0,0 +1,40 @@
1
+ $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
+ require 'tests/drivers/rhevm/common'
3
+
4
+ module RHEVMTest
5
+
6
+ class RealmsTest < Test::Unit::TestCase
7
+ include Rack::Test::Methods
8
+
9
+ def app
10
+ Rack::Builder.new {
11
+ map '/' do
12
+ use Rack::Static, :urls => ["/stylesheets", "/javascripts"], :root => "public"
13
+ run Rack::Cascade.new([Deltacloud::API])
14
+ end
15
+ }
16
+ end
17
+
18
+ def test_01_it_returns_realms
19
+ get_auth_url '/api;driver=rhevm/realms'
20
+ (last_xml_response/'realms/realm').length.should == 1
21
+ end
22
+
23
+ def test_02_each_realm_has_a_name
24
+ get_auth_url '/api;driver=rhevm/realms'
25
+ (last_xml_response/'realms/realm').each do |profile|
26
+ (profile/'name').text.should_not == nil
27
+ (profile/'name').text.should_not == ''
28
+ (profile/'name').text.should_not == 'Default'
29
+ end
30
+ end
31
+
32
+ def test_03_it_returns_single_realm
33
+ get_auth_url '/api;driver=rhevm/realms/3c8af388-cff6-11e0-9267-52540013f702'
34
+ (last_xml_response/'realm').first[:id].should == '3c8af388-cff6-11e0-9267-52540013f702'
35
+ (last_xml_response/'realm/name').first.text.should == 'engops-nfs'
36
+ (last_xml_response/'realm/state').first.text.should == 'AVAILABLE'
37
+ end
38
+
39
+ end
40
+ end
File without changes
@@ -0,0 +1,124 @@
1
+ require 'minitest/autorun'
2
+ require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'drivers', 'base_driver.rb')
3
+
4
+ describe Deltacloud::BaseDriver do
5
+
6
+ before do
7
+ class TestDriver < Deltacloud::BaseDriver
8
+
9
+ define_hardware_profile('t1.micro') do
10
+ cpu 1
11
+ memory 613
12
+ storage 160
13
+ architecture ['i386','x86_64']
14
+ end
15
+
16
+ feature :instances, :user_data
17
+ feature :instances, :user_name do
18
+ { :max_length => 50 }
19
+ end
20
+
21
+ define_instance_states do
22
+ start.to( :pending ) .automatically
23
+ pending.to( :running ) .automatically
24
+ pending.to( :stopping ) .on( :stop )
25
+ pending.to( :stopped ) .automatically
26
+ stopped.to( :running ) .on( :start )
27
+ running.to( :running ) .on( :reboot )
28
+ running.to( :stopping ) .on( :stop )
29
+ stopping.to(:stopped) .automatically
30
+ stopping.to(:finish) .automatically
31
+ stopped.to( :finish ) .automatically
32
+ end
33
+
34
+ def realms(credentials, opts={}); end
35
+ end
36
+ @driver = TestDriver.new
37
+ end
38
+
39
+ describe 'when creating a new driver' do
40
+
41
+ it 'must return the proper driver name' do
42
+ @driver.name.must_equal 'test'
43
+ TestDriver.name.must_equal 'TestDriver'
44
+ end
45
+
46
+ end
47
+
48
+ describe 'hardware profiles' do
49
+
50
+ it 'must allow to define custom hardware profiles' do
51
+ TestDriver.must_respond_to :define_hardware_profile
52
+ end
53
+
54
+ it 'should not allow to create duplicated profile' do
55
+ TestDriver.define_hardware_profile('t1.micro').must_be_nil
56
+ TestDriver.hardware_profiles.size.must_equal 1
57
+ end
58
+
59
+ it 'should return all defined hardware profiles' do
60
+ TestDriver.must_respond_to :hardware_profiles
61
+ TestDriver.hardware_profiles.wont_be_empty
62
+ end
63
+
64
+ it 'should allow to filter hardware profiles' do
65
+ @driver.filter_hardware_profiles(TestDriver.hardware_profiles, :architecture => 'i386').wont_be_empty
66
+ @driver.filter_hardware_profiles(TestDriver.hardware_profiles, :architecture => 'unknown').must_be_empty
67
+ @driver.filter_hardware_profiles(TestDriver.hardware_profiles, :id => 't1.micro').wont_be_empty
68
+ @driver.filter_hardware_profiles(TestDriver.hardware_profiles, :id => 'm1.unknown').must_be_empty
69
+ end
70
+
71
+ end
72
+
73
+ describe 'features' do
74
+
75
+ it 'should return all defined features' do
76
+ TestDriver.features.must_be_kind_of Hash
77
+ TestDriver.features.keys.must_include :instances
78
+ TestDriver.features[:instances].must_be_kind_of Array
79
+ TestDriver.features[:instances].must_include :user_data
80
+ end
81
+
82
+ it 'must have method to check if feature is defined' do
83
+ TestDriver.must_respond_to :'has_feature?'
84
+ TestDriver.has_feature?(:instances, :user_data).must_equal true
85
+ TestDriver.has_feature?(:instances, :user_unknown).must_equal false
86
+ end
87
+
88
+ it 'must return feature defined constraints' do
89
+ TestDriver.must_respond_to :'constraints'
90
+ TestDriver.constraints.must_be_kind_of Hash
91
+ TestDriver.constraints[:instances].must_be_kind_of Hash
92
+ TestDriver.constraints[:instances][:user_name].must_be_kind_of Hash
93
+ TestDriver.constraints[:instances][:user_name][:max_length].must_equal 50
94
+ TestDriver.constraints(:collection => :instances, :feature => :user_name).must_be_kind_of Hash
95
+ TestDriver.constraints(:collection => :instances, :feature => :user_name)[:max_length].must_equal 50
96
+ end
97
+
98
+ end
99
+
100
+ describe 'instance states' do
101
+
102
+ it 'should return defined instance state machine' do
103
+ TestDriver.must_respond_to :instance_state_machine
104
+ TestDriver.instance_state_machine.must_be_kind_of Deltacloud::StateMachine
105
+ end
106
+
107
+ it 'should return actions for given state' do
108
+ @driver.must_respond_to :instance_actions_for
109
+ @driver.instance_actions_for('RUNNING').must_be_kind_of Array
110
+ @driver.instance_actions_for('RUNNING').must_include :stop
111
+ end
112
+
113
+ end
114
+
115
+ describe 'capabilities' do
116
+
117
+ it 'should return if driver has given capability' do
118
+ @driver.has_capability?(:realms).must_equal true
119
+ @driver.has_capability?(:images).must_equal false
120
+ end
121
+
122
+ end
123
+
124
+ end
@@ -1,7 +1,5 @@
1
- require_relative './common'
2
- require_relative '../../lib/deltacloud/api'
3
-
4
- require 'pp'
1
+ require 'minitest/autorun'
2
+ require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
5
3
 
6
4
  describe 'Deltacloud API Library' do
7
5
 
@@ -30,10 +28,6 @@ describe 'Deltacloud API Library' do
30
28
  Deltacloud.new(:mock).current_provider.must_be_nil
31
29
  end
32
30
 
33
- it 'should return pre-defined providers for the driver' do
34
- Deltacloud.new(:ec2).providers[:entrypoints].must_be_kind_of Hash
35
- end
36
-
37
31
  it 'should yield the backend driver' do
38
32
  Deltacloud.new :mock do |mock|
39
33
  mock.must_be_instance_of Deltacloud::Drivers::Mock::MockDriver
@@ -1,23 +1,31 @@
1
- ENV['API_DRIVER'] = 'ec2'
2
- ENV['TESTS_API_USERNAME'] = 'AKIAIZ63KHGXIWDMBY6Q'
3
- ENV['TESTS_API_PASSWORD'] = 'zUfBCbML2S6pXKS44eEEXw0Cf/G8z9hMSxP2hcLV'
4
- ENV['RACK_ENV'] = 'test'
1
+ # Warning: RightHttpConnection has to be required before WebMock is required !!!
2
+ # Lets require that:
3
+ require 'right_http_connection'
4
+ require 'vcr'
5
5
 
6
- $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
7
- require 'tests/minitest_common'
6
+ # Freeze time, so EC2 signatures have all the same time
7
+ # This will avoid IncorrectSignature exceptions
8
8
 
9
- require 'vcr'
10
- require 'timecop'
9
+ # NOTE: This timestamp need to be changed when re-recording
10
+ # the fixtures.
11
+
12
+ def credentials
13
+ {
14
+ :user => 'AKIAJYOQYLLOIWN5LQ3A',
15
+ :password => 'Ra2ViYaYgocAJqPAQHxMVU/l2sGGU2pifmWT4q3H'
16
+ }
17
+ end
18
+
19
+ unless Time.respond_to? :be
20
+ require_relative '../../test_helper.rb'
21
+ end
22
+
23
+ Time.be(DateTime.parse("2012-07-30 11:05:00 +0000").to_s)
11
24
 
12
25
  VCR.configure do |c|
26
+ # NOTE: Empty this directory before re-recording
13
27
  c.cassette_library_dir = File.join(File.dirname(__FILE__), 'fixtures')
14
28
  c.hook_into :webmock
29
+ # Set this to :new_episodes when you want to 're-record'
15
30
  c.default_cassette_options = { :record => :new_episodes }
16
- #c.default_cassette_options = { :record => :none }
17
31
  end
18
-
19
- # Let's set time that timecop will use to freeze
20
- # Time.now will then return this time instead of 'real' system time
21
-
22
- FREEZED_TIME = DateTime.parse("2012-05-31 12:58:00 +0200")
23
- Timecop.freeze(FREEZED_TIME)
@@ -1,9 +1,12 @@
1
- $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/drivers/ec2/common'
1
+ require 'minitest/autorun'
2
+
3
+ require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'api.rb')
4
+ require_relative 'common.rb'
5
+
6
+ describe 'Ec2Driver Images' do
3
7
 
4
- describe 'Deltacloud API Images' do
5
8
  before do
6
- Timecop.freeze(FREEZED_TIME)
9
+ @driver = Deltacloud::new(:ec2, credentials)
7
10
  VCR.insert_cassette __name__
8
11
  end
9
12
 
@@ -11,220 +14,36 @@ describe 'Deltacloud API Images' do
11
14
  VCR.eject_cassette
12
15
  end
13
16
 
14
- include Deltacloud::Test
15
-
16
- it 'must advertise have the images collection in API entrypoint' do
17
- get root_url
18
- (xml_response/'api/link[@rel=images]').wont_be_empty
19
- end
20
-
21
- it 'must require authentication to access the "image" collection' do
22
- get collection_url(:images)
23
- last_response.status.must_equal 401
24
- end
25
-
26
- it 'should respond with HTTP_OK when accessing the :images collection with authentication' do
27
- authenticate
28
- get collection_url(:images)
29
- last_response.status.must_equal 200
30
- end
31
-
32
- it 'should support the JSON media type' do
33
- authenticate
34
- header 'Accept', 'application/json'
35
- get collection_url(:images)
36
- last_response.status.must_equal 200
37
- last_response.headers['Content-Type'].must_equal 'application/json'
38
- end
39
-
40
- it 'must include the ETag in HTTP headers' do
41
- authenticate
42
- get collection_url(:images)
43
- last_response.headers['ETag'].wont_be_nil
44
- end
45
-
46
- it 'must have the "images" element on top level' do
47
- authenticate
48
- get collection_url(:images)
49
- xml_response.root.name.must_equal 'images'
50
- end
51
-
52
- it 'must have some "image" elements inside "images"' do
53
- authenticate
54
- get collection_url(:images)
55
- (xml_response/'images/image').wont_be_empty
56
- end
57
-
58
- it 'must provide the :id attribute for each image in collection' do
59
- authenticate
60
- get collection_url(:images)
61
- (xml_response/'images/image').each do |r|
62
- r[:id].wont_be_nil
63
- end
64
- end
65
-
66
- it 'must include the :href attribute for each "image" element in collection' do
67
- authenticate
68
- get collection_url(:images)
69
- (xml_response/'images/image').each do |r|
70
- r[:href].wont_be_nil
71
- end
72
- end
73
-
74
- it 'must use the absolute URL in each :href attribute' do
75
- authenticate
76
- get collection_url(:images)
77
- (xml_response/'images/image').each do |r|
78
- r[:href].must_match /^http/
79
- end
17
+ it 'must throw error when wrong credentials' do
18
+ Proc.new do
19
+ @driver.backend.images(OpenStruct.new(:user => 'unknown', :password => 'wrong'))
20
+ end.must_raise Deltacloud::ExceptionHandler::AuthenticationFailure, 'Authentication Failure'
80
21
  end
81
22
 
82
- it 'must have the URL ending with the :id of the image' do
83
- authenticate
84
- get collection_url(:images)
85
- (xml_response/'images/image').each do |r|
86
- r[:href].must_match /#{r[:id]}$/
87
- end
23
+ it 'must return list of images' do
24
+ @driver.images.wont_be_empty
25
+ @driver.images.first.must_be_kind_of Image
88
26
  end
89
27
 
90
- it 'must return the list of valid parameters for the :index action' do
91
- authenticate
92
- options collection_url(:images) + '/index'
93
- last_response.headers['Allow'].wont_be_nil
94
- end
95
-
96
- it 'must have the "name" element defined for each image in collection' do
97
- authenticate
98
- get collection_url(:images)
99
- (xml_response/'images/image').each do |r|
100
- (r/'name').wont_be_empty
28
+ it 'must allow to filter images' do
29
+ @driver.images(:id => 'ami-aecd60c7').wont_be_empty
30
+ @driver.images(:id => 'ami-aecd60c7').must_be_kind_of Array
31
+ @driver.images(:id => 'ami-aecd60c7').size.must_equal 1
32
+ @driver.images(:id => 'ami-aecd60c7').first.id.must_equal 'ami-aecd60c7'
33
+ @driver.images(:owner_id => '137112412989').each do |img|
34
+ img.owner_id.must_equal '137112412989'
101
35
  end
36
+ @driver.images(:id => 'ami-aaaaaaaa').must_be_empty
37
+ @driver.images(:id => 'unknown').must_be_empty
102
38
  end
103
39
 
104
- it 'must have the "state" element defined for each image in collection' do
105
- authenticate
106
- get collection_url(:images)
107
- (xml_response/'images/image').each do |r|
108
- (r/'state').wont_be_empty
109
- end
110
- end
111
-
112
- it 'must return the full "image" when following the URL in image element' do
113
- authenticate
114
- get collection_url(:images)
115
- (xml_response/'images/image').wont_be_empty
116
- (xml_response/'images/image')[0..10].each do |r|
117
- VCR.use_cassette "#{__name__}_image_#{r[:id]}" do
118
- get collection_url(:images) + '/' + r[:id]
119
- end
120
- last_response.status.must_equal 200
121
- end
122
- end
123
-
124
- it 'must have the "name" element for the image and it should match with the one in collection' do
125
- authenticate
126
- get collection_url(:images)
127
- (xml_response/'images/image').wont_be_empty
128
- (xml_response/'images/image')[0..10].each do |r|
129
- VCR.use_cassette "#{__name__}_image_#{r[:id]}" do
130
- get collection_url(:images) + '/' + r[:id]
131
- end
132
- (xml_response/'name').wont_be_empty
133
- (xml_response/'name').first.text.must_equal((r/'name').first.text)
134
- end
135
- end
136
-
137
- it 'must have the "name" element for the image and it should match with the one in collection' do
138
- authenticate
139
- get collection_url(:images)
140
- (xml_response/'images/image').wont_be_empty
141
- (xml_response/'images/image')[0..10].each do |r|
142
- VCR.use_cassette "#{__name__}_image_#{r[:id]}" do
143
- get collection_url(:images) + '/' + r[:id]
144
- end
145
- (xml_response/'state').wont_be_empty
146
- (xml_response/'state').first.text.must_equal((r/'state').first.text)
147
- end
148
- end
149
-
150
- it 'should have the "owner_id" element for each image' do
151
- authenticate
152
- get collection_url(:images)
153
- (xml_response/'images/image').wont_be_empty
154
- (xml_response/'images/image')[0..10].each do |r|
155
- VCR.use_cassette "#{__name__}_image_#{r[:id]}" do
156
- get collection_url(:images) + '/' + r[:id]
157
- end
158
- (xml_response/'owner_id').wont_be_empty
159
- end
160
- end
161
-
162
- it 'should have the "description" element for each image' do
163
- authenticate
164
- get collection_url(:images)
165
- (xml_response/'images/image').wont_be_empty
166
- (xml_response/'images/image')[0..10].each do |r|
167
- VCR.use_cassette "#{__name__}_image_#{r[:id]}" do
168
- get collection_url(:images) + '/' + r[:id]
169
- end
170
- (xml_response/'description').wont_be_empty
171
- end
172
- end
173
-
174
- it 'should have the "architecture" element for each image' do
175
- authenticate
176
- get collection_url(:images)
177
- (xml_response/'images/image').wont_be_empty
178
- (xml_response/'images/image')[0..10].each do |r|
179
- VCR.use_cassette "#{__name__}_image_#{r[:id]}" do
180
- get collection_url(:images) + '/' + r[:id]
181
- end
182
- (xml_response/'architecture').wont_be_empty
183
- end
184
- end
185
-
186
- it 'should include the list of compatible hardware_profiles for each image' do
187
- authenticate
188
- get collection_url(:images)
189
- (xml_response/'images/image').wont_be_empty
190
- (xml_response/'images/image')[0..10].each do |r|
191
- VCR.use_cassette "#{__name__}_image_#{r[:id]}" do
192
- get collection_url(:images) + '/' + r[:id]
193
- end
194
- (xml_response/'hardware_profiles/hardware_profile').wont_be_empty
195
- (xml_response/'hardware_profiles/hardware_profile').each do |hwp|
196
- hwp[:href].wont_be_nil
197
- hwp[:href].must_match /^http/
198
- hwp[:id].wont_be_nil
199
- hwp[:href].must_match /\/#{hwp[:id]}$/
200
- hwp[:rel].must_equal 'hardware_profile'
201
- end
202
- end
203
- end
204
-
205
- it 'should advertise the list of actions that can be executed for each image' do
206
- authenticate
207
- get collection_url(:images)
208
- (xml_response/'images/image').wont_be_empty
209
- (xml_response/'images/image')[0..10].each do |r|
210
- VCR.use_cassette "#{__name__}_image_#{r[:id]}" do
211
- get collection_url(:images) + '/' + r[:id]
212
- end
213
- (xml_response/'actions/link').wont_be_empty
214
- (xml_response/'actions/link').each do |l|
215
- l[:href].wont_be_nil
216
- l[:href].must_match /^http/
217
- l[:method].wont_be_nil
218
- l[:rel].wont_be_nil
219
- end
220
- end
221
- end
222
-
223
- it 'should give client HTML form to create new image' do
224
- authenticate
225
- header 'Accept', 'text/html'
226
- get collection_url(:images) + '/new'
227
- last_response.status.must_equal 200
40
+ it 'must allow to retrieve single image' do
41
+ @driver.image(:id => 'ami-aecd60c7').wont_be_nil
42
+ @driver.image(:id => 'ami-aecd60c7').must_be_kind_of Image
43
+ @driver.image(:id => 'ami-aecd60c7').id.must_equal 'ami-aecd60c7'
44
+ @driver.image(:id => 'ami-aaaaaaaa').must_be_nil
45
+ @driver.image(:id => 'unknown').must_be_nil
228
46
  end
229
47
 
230
48
  end
49
+