deltacloud-core 0.5.0 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (294) hide show
  1. data/NOTICE +1 -1
  2. data/Rakefile +63 -21
  3. data/bin/deltacloudd +10 -6
  4. data/config.ru +62 -6
  5. data/config/drivers/ec2.yaml +8 -0
  6. data/config/drivers/fgcp.yaml +13 -0
  7. data/deltacloud-core.gemspec +10 -2
  8. data/lib/cimi/collections.rb +58 -0
  9. data/lib/cimi/collections/address_templates.rb +49 -0
  10. data/lib/cimi/collections/addresses.rb +74 -0
  11. data/lib/cimi/collections/cloud_entry_point.rb +37 -0
  12. data/lib/{deltacloud/helpers/conversion_helper.rb → cimi/collections/entity_metadata.rb} +24 -16
  13. data/lib/cimi/collections/machine_admins.rb +74 -0
  14. data/lib/cimi/collections/machine_configurations.rb +49 -0
  15. data/lib/cimi/collections/machine_images.rb +50 -0
  16. data/lib/cimi/collections/machines.rb +157 -0
  17. data/lib/cimi/collections/network_configurations.rb +47 -0
  18. data/lib/cimi/collections/network_templates.rb +48 -0
  19. data/lib/cimi/collections/networks.rb +125 -0
  20. data/lib/cimi/collections/routing_group_templates.rb +47 -0
  21. data/lib/cimi/collections/routing_groups.rb +48 -0
  22. data/lib/cimi/collections/volume_configurations.rb +48 -0
  23. data/lib/cimi/collections/volume_images.rb +50 -0
  24. data/lib/cimi/collections/volumes.rb +80 -0
  25. data/lib/cimi/collections/vsp_configurations.rb +48 -0
  26. data/lib/cimi/collections/vsp_templates.rb +50 -0
  27. data/lib/cimi/collections/vsps.rb +108 -0
  28. data/lib/cimi/dependencies.rb +1 -0
  29. data/lib/cimi/helpers.rb +116 -0
  30. data/lib/cimi/helpers/cimi_helper.rb +6 -2
  31. data/lib/cimi/models.rb +72 -0
  32. data/lib/cimi/{model → models}/action.rb +1 -1
  33. data/lib/cimi/models/address.rb +72 -0
  34. data/lib/cimi/models/address_collection.rb +34 -0
  35. data/lib/cimi/models/address_template.rb +54 -0
  36. data/lib/cimi/models/address_template_collection.rb +34 -0
  37. data/lib/cimi/{model → models}/base.rb +2 -2
  38. data/lib/cimi/{model → models}/cloud_entry_point.rb +3 -5
  39. data/lib/cimi/{model → models}/entity_metadata.rb +7 -6
  40. data/lib/cimi/{model → models}/entity_metadata_collection.rb +2 -2
  41. data/lib/cimi/{model → models}/errors.rb +8 -0
  42. data/lib/cimi/{model → models}/machine.rb +10 -10
  43. data/lib/cimi/{model → models}/machine_admin.rb +1 -1
  44. data/lib/cimi/{model → models}/machine_admin_collection.rb +2 -2
  45. data/lib/cimi/{model → models}/machine_collection.rb +2 -2
  46. data/lib/cimi/{model → models}/machine_configuration.rb +9 -6
  47. data/lib/cimi/{model → models}/machine_configuration_collection.rb +2 -2
  48. data/lib/cimi/{model → models}/machine_image.rb +1 -1
  49. data/lib/cimi/{model → models}/machine_image_collection.rb +2 -2
  50. data/lib/cimi/{model → models}/machine_template.rb +0 -0
  51. data/lib/cimi/{model → models}/machine_template_collection.rb +2 -2
  52. data/lib/cimi/models/network.rb +109 -0
  53. data/lib/cimi/{model → models}/network_collection.rb +2 -2
  54. data/lib/cimi/{model → models}/network_configuration.rb +3 -4
  55. data/lib/cimi/{model → models}/network_configuration_collection.rb +2 -2
  56. data/lib/cimi/models/network_template.rb +36 -0
  57. data/lib/cimi/models/network_template_collection.rb +35 -0
  58. data/lib/cimi/models/routing_group.rb +34 -0
  59. data/lib/cimi/models/routing_group_collection.rb +34 -0
  60. data/lib/cimi/models/routing_group_template.rb +34 -0
  61. data/lib/cimi/models/routing_group_template_collection.rb +35 -0
  62. data/lib/cimi/{model → models}/schema.rb +0 -0
  63. data/lib/cimi/{model → models}/volume.rb +4 -4
  64. data/lib/cimi/{model → models}/volume_collection.rb +2 -2
  65. data/lib/cimi/{model → models}/volume_configuration.rb +1 -1
  66. data/lib/cimi/{model → models}/volume_configuration_collection.rb +2 -2
  67. data/lib/cimi/{model → models}/volume_image.rb +1 -1
  68. data/lib/cimi/{model → models}/volume_image_collection.rb +2 -2
  69. data/lib/cimi/{model → models}/volume_template.rb +0 -0
  70. data/lib/cimi/{model → models}/volume_template_collection.rb +2 -2
  71. data/lib/cimi/models/vsp.rb +102 -0
  72. data/lib/cimi/models/vsp_collection.rb +34 -0
  73. data/lib/cimi/models/vsp_configuration.rb +40 -0
  74. data/lib/cimi/models/vsp_configuration_collection.rb +34 -0
  75. data/lib/cimi/models/vsp_template.rb +34 -0
  76. data/lib/cimi/models/vsp_template_collection.rb +34 -0
  77. data/lib/cimi/server.rb +27 -549
  78. data/lib/deltacloud/api.rb +79 -0
  79. data/lib/deltacloud/collections.rb +54 -0
  80. data/lib/deltacloud/collections/addresses.rb +91 -0
  81. data/lib/deltacloud/collections/buckets.rb +273 -0
  82. data/lib/deltacloud/collections/drivers.rb +51 -0
  83. data/lib/deltacloud/collections/firewalls.rb +116 -0
  84. data/lib/deltacloud/collections/hardware_profiles.rb +29 -0
  85. data/lib/deltacloud/collections/images.rb +73 -0
  86. data/lib/deltacloud/collections/instance_states.rb +59 -0
  87. data/lib/deltacloud/collections/instances.rb +113 -0
  88. data/lib/deltacloud/collections/keys.rb +61 -0
  89. data/lib/deltacloud/collections/load_balancers.rb +102 -0
  90. data/lib/deltacloud/collections/metrics.rb +28 -0
  91. data/lib/deltacloud/collections/realms.rb +28 -0
  92. data/lib/deltacloud/collections/storage_snapshots.rb +51 -0
  93. data/lib/deltacloud/collections/storage_volumes.rb +99 -0
  94. data/lib/deltacloud/core_ext.rb +14 -6
  95. data/lib/deltacloud/core_ext/string.rb +17 -5
  96. data/lib/deltacloud/drivers.rb +6 -42
  97. data/lib/deltacloud/drivers/azure/azure_driver.rb +0 -4
  98. data/lib/deltacloud/{base_driver → drivers}/base_driver.rb +56 -18
  99. data/lib/deltacloud/drivers/condor/condor_driver.rb +1 -8
  100. data/lib/deltacloud/drivers/ec2/ec2_driver.rb +142 -33
  101. data/lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb +2 -6
  102. data/lib/deltacloud/{base_driver → drivers}/exceptions.rb +25 -2
  103. data/lib/deltacloud/drivers/features.rb +154 -0
  104. data/lib/deltacloud/drivers/fgcp/fgcp_client.rb +387 -0
  105. data/lib/deltacloud/drivers/fgcp/fgcp_driver.rb +1435 -0
  106. data/lib/deltacloud/drivers/gogrid/gogrid_driver.rb +8 -11
  107. data/lib/deltacloud/drivers/google/google_driver.rb +2 -5
  108. data/lib/deltacloud/drivers/mock/data/keys/test-key.yml +28 -0
  109. data/lib/deltacloud/drivers/mock/mock_client.rb +2 -2
  110. data/lib/deltacloud/drivers/mock/mock_driver.rb +58 -40
  111. data/lib/deltacloud/drivers/mock/mock_driver_cimi_methods.rb +145 -0
  112. data/lib/deltacloud/drivers/opennebula/cloud_client.rb +107 -73
  113. data/lib/deltacloud/drivers/opennebula/occi_client.rb +285 -145
  114. data/lib/deltacloud/drivers/opennebula/opennebula_driver.rb +189 -126
  115. data/lib/deltacloud/drivers/openstack/openstack_driver.rb +427 -8
  116. data/lib/deltacloud/drivers/rackspace/rackspace_driver.rb +7 -9
  117. data/lib/deltacloud/drivers/rhevm/rhevm_driver.rb +48 -66
  118. data/lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb +44 -51
  119. data/lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb +7 -8
  120. data/lib/deltacloud/drivers/sbc/sbc_client.rb +1 -1
  121. data/lib/deltacloud/drivers/sbc/sbc_driver.rb +3 -3
  122. data/lib/deltacloud/drivers/terremark/terremark_driver.rb +8 -8
  123. data/lib/deltacloud/drivers/vsphere/vsphere_driver.rb +39 -13
  124. data/lib/deltacloud/drivers/vsphere/vsphere_filemanager.rb +1 -0
  125. data/lib/deltacloud/helpers.rb +79 -7
  126. data/lib/{sinatra/lazy_auth.rb → deltacloud/helpers/auth_helper.rb} +5 -9
  127. data/lib/deltacloud/helpers/{blob_stream.rb → blob_stream_helper.rb} +7 -7
  128. data/lib/deltacloud/helpers/deltacloud_helper.rb +286 -0
  129. data/lib/deltacloud/helpers/driver_helper.rb +58 -0
  130. data/lib/deltacloud/helpers/rabbit_helper.rb +34 -0
  131. data/lib/{sinatra/url_for.rb → deltacloud/helpers/url_helper.rb} +31 -9
  132. data/lib/deltacloud/models.rb +19 -17
  133. data/lib/deltacloud/models/bucket.rb +4 -0
  134. data/lib/deltacloud/{hardware_profile.rb → models/hardware_profile.rb} +4 -2
  135. data/lib/deltacloud/models/image.rb +1 -0
  136. data/lib/deltacloud/models/instance.rb +4 -2
  137. data/lib/deltacloud/models/instance_address.rb +4 -0
  138. data/lib/deltacloud/models/key.rb +4 -0
  139. data/lib/deltacloud/models/metric.rb +40 -0
  140. data/lib/deltacloud/{state_machine.rb → models/state_machine.rb} +18 -1
  141. data/lib/deltacloud/server.rb +41 -1222
  142. data/lib/deltacloud_rack.rb +79 -0
  143. data/lib/{cimi/model/network_template.rb → ec2/helpers.rb} +7 -10
  144. data/lib/{deltacloud/backend_capability.rb → ec2/helpers/errors.rb} +24 -29
  145. data/lib/ec2/helpers/result.rb +31 -0
  146. data/lib/ec2/query_parser.rb +152 -0
  147. data/lib/ec2/server.rb +70 -0
  148. data/lib/{deltacloud.rb → sinatra.rb} +7 -12
  149. data/lib/sinatra/rack_accept.rb +13 -7
  150. data/lib/sinatra/rack_driver_select.rb +1 -1
  151. data/lib/sinatra/rack_matrix_params.rb +1 -3
  152. data/public/images/metric.png +0 -0
  153. data/public/javascripts/jquery.mobile-1.0.1.min.js +177 -0
  154. data/public/stylesheets/jquery.mobile-1.0.1.min.css +2 -0
  155. data/public/stylesheets/new.css +10 -0
  156. data/support/fedora/deltacloud-core.spec +1 -1
  157. data/tests/api/common.rb +1 -0
  158. data/tests/api/driver_test.rb +79 -0
  159. data/tests/api/library_test.rb +48 -0
  160. data/tests/cimi/features/step_definitions/common_steps.rb +2 -2
  161. data/tests/cimi/features/step_definitions/machines_steps.rb +5 -4
  162. data/tests/cimi/features/step_definitions/volumes_steps.rb +8 -8
  163. data/tests/cimi/features/support/env.rb +33 -11
  164. data/tests/common.rb +7 -8
  165. data/tests/drivers/ec2/api_test.rb +19 -0
  166. data/tests/drivers/ec2/common.rb +23 -0
  167. data/tests/drivers/ec2/drivers_test.rb +120 -0
  168. data/tests/drivers/ec2/hardware_profiles_test.rb +224 -0
  169. data/tests/drivers/ec2/images_test.rb +230 -0
  170. data/tests/drivers/ec2/instances_test.rb +356 -0
  171. data/tests/drivers/ec2/keys_test.rb +181 -0
  172. data/tests/drivers/ec2/realms_test.rb +146 -0
  173. data/tests/drivers/fgcp/api_test.rb +47 -0
  174. data/tests/drivers/fgcp/hardware_profiles_test.rb +54 -0
  175. data/tests/drivers/fgcp/realms_test.rb +42 -0
  176. data/tests/drivers/{rackspace → fgcp}/setup.rb +5 -6
  177. data/tests/drivers/google/api_test.rb +10 -26
  178. data/tests/drivers/google/buckets_test.rb +79 -95
  179. data/tests/drivers/google/common.rb +54 -0
  180. data/tests/drivers/mock/api_test.rb +4 -127
  181. data/tests/drivers/mock/buckets_test.rb +195 -0
  182. data/tests/drivers/mock/common.rb +7 -0
  183. data/tests/drivers/mock/drivers_test.rb +123 -0
  184. data/tests/drivers/mock/hardware_profiles_test.rb +190 -100
  185. data/tests/drivers/mock/images_test.rb +162 -103
  186. data/tests/drivers/mock/instances_test.rb +310 -220
  187. data/tests/drivers/mock/keys_test.rb +161 -0
  188. data/tests/drivers/mock/realms_test.rb +109 -70
  189. data/tests/drivers/mock/storage_snapshots_test.rb +114 -0
  190. data/tests/drivers/mock/storage_volumes_test.rb +122 -0
  191. data/tests/drivers/openstack/api_test.rb +8 -3
  192. data/tests/drivers/openstack/common.rb +21 -0
  193. data/tests/drivers/openstack/hardware_profiles_test.rb +20 -9
  194. data/tests/drivers/openstack/images_test.rb +11 -5
  195. data/tests/drivers/openstack/instances_test.rb +61 -16
  196. data/tests/drivers/openstack/realms_test.rb +11 -7
  197. data/tests/drivers/rackspace/api_test.rb +7 -2
  198. data/tests/drivers/rackspace/buckets_test.rb +7 -2
  199. data/tests/drivers/rackspace/common.rb +16 -0
  200. data/tests/drivers/rackspace/hardware_profiles_test.rb +7 -2
  201. data/tests/drivers/rackspace/images_test.rb +7 -2
  202. data/tests/drivers/rackspace/instances_test.rb +10 -5
  203. data/tests/drivers/rackspace/realms_test.rb +7 -2
  204. data/tests/drivers/rhevm/api_test.rb +12 -6
  205. data/tests/drivers/rhevm/{setup.rb → common.rb} +8 -1
  206. data/tests/drivers/rhevm/hardware_profiles_test.rb +7 -2
  207. data/tests/drivers/rhevm/images_test.rb +8 -2
  208. data/tests/drivers/rhevm/instances_test.rb +7 -2
  209. data/tests/drivers/rhevm/realms_test.rb +7 -2
  210. data/tests/minitest_common.rb +58 -0
  211. data/tests/minitest_common_api_test.rb +115 -0
  212. data/views/addresses/associate.html.haml +1 -1
  213. data/views/addresses/index.html.haml +1 -1
  214. data/views/addresses/show.html.haml +2 -3
  215. data/views/api/show.html.haml +22 -9
  216. data/views/api/show.xml.haml +8 -7
  217. data/views/blobs/show.xml.haml +7 -4
  218. data/views/buckets/new.html.haml +2 -2
  219. data/views/cimi/errors/401.xml.haml +1 -1
  220. data/views/error.html.haml +3 -3
  221. data/views/errors/400.html.haml +1 -1
  222. data/views/errors/400.xml.haml +1 -2
  223. data/views/errors/401.html.haml +8 -7
  224. data/views/errors/401.xml.haml +1 -1
  225. data/views/errors/404.xml.haml +1 -0
  226. data/views/errors/500.xml.haml +4 -2
  227. data/views/{cimi/errors/403.html.haml → errors/501.html.haml} +4 -2
  228. data/views/errors/501.xml.haml +1 -0
  229. data/views/errors/502.xml.haml +1 -7
  230. data/views/{cimi/errors/500.html.haml → errors/504.html.haml} +0 -0
  231. data/views/errors/504.xml.haml +1 -0
  232. data/views/firewalls/new.html.haml +2 -2
  233. data/views/firewalls/new_rule.html.haml +1 -1
  234. data/views/firewalls/show.html.haml +1 -1
  235. data/views/hardware_profiles/index.html.haml +3 -1
  236. data/views/hardware_profiles/index.xml.haml +2 -2
  237. data/views/hardware_profiles/show.html.haml +3 -3
  238. data/views/hardware_profiles/show.xml.haml +3 -3
  239. data/views/images/show.html.haml +5 -0
  240. data/views/images/show.xml.haml +6 -1
  241. data/views/instance_states/show.html.haml +1 -1
  242. data/views/instances/index.html.haml +1 -1
  243. data/views/instances/new.html.haml +54 -39
  244. data/views/instances/run_command.html.haml +24 -15
  245. data/views/instances/show.html.haml +7 -3
  246. data/views/instances/show.xml.haml +2 -2
  247. data/views/keys/show.xml.haml +1 -0
  248. data/views/layout.html.haml +5 -9
  249. data/views/load_balancers/show.html.haml +12 -6
  250. data/views/metrics/index.html.haml +13 -0
  251. data/views/metrics/index.xml.haml +5 -0
  252. data/views/metrics/show.html.haml +23 -0
  253. data/views/metrics/show.xml.haml +9 -0
  254. data/views/realms/show.xml.haml +2 -1
  255. data/views/root/index.html.haml +1 -1
  256. data/views/storage_snapshots/show.html.haml +1 -1
  257. data/views/storage_snapshots/show.xml.haml +1 -0
  258. data/views/storage_volumes/attach.html.haml +1 -2
  259. data/views/storage_volumes/index.html.haml +1 -1
  260. data/views/storage_volumes/new.html.haml +22 -16
  261. data/views/storage_volumes/show.html.haml +10 -4
  262. data/views/storage_volumes/show.xml.haml +3 -4
  263. metadata +547 -519
  264. data/DISCLAIMER +0 -8
  265. data/lib/cimi/model.rb +0 -52
  266. data/lib/cimi/model/network.rb +0 -69
  267. data/lib/deltacloud/base_driver.rb +0 -18
  268. data/lib/deltacloud/base_driver/features.rb +0 -262
  269. data/lib/deltacloud/base_driver/mock_driver.rb +0 -78
  270. data/lib/deltacloud/drivers/ec2/ec2_mock_driver.rb +0 -186
  271. data/lib/deltacloud/drivers/rhevm/rhevm_client.rb +0 -521
  272. data/lib/deltacloud/helpers/application_helper.rb +0 -267
  273. data/lib/deltacloud/helpers/hardware_profiles_helper.rb +0 -50
  274. data/lib/deltacloud/helpers/json_helper.rb +0 -31
  275. data/lib/deltacloud/method_serializer.rb +0 -83
  276. data/lib/deltacloud/validation.rb +0 -107
  277. data/lib/sinatra/rabbit.rb +0 -441
  278. data/lib/sinatra/rack_runtime.rb +0 -47
  279. data/lib/sinatra/rack_syslog.rb +0 -86
  280. data/lib/sinatra/sinatra_verbose.rb +0 -73
  281. data/lib/sinatra/static_assets.rb +0 -99
  282. data/public/javascripts/jquery.mobile-1.0rc1.min.js +0 -170
  283. data/public/stylesheets/jquery.mobile-1.0rc1.min.css +0 -12
  284. data/tests/drivers/google/setup.rb +0 -38
  285. data/tests/drivers/mock/instance_states_test.rb +0 -71
  286. data/tests/drivers/mock/setup.rb +0 -3
  287. data/tests/drivers/mock/url_for_test.rb +0 -67
  288. data/tests/drivers/openstack/setup.rb +0 -20
  289. data/views/cimi/errors/400.html.haml +0 -41
  290. data/views/cimi/errors/401.html.haml +0 -41
  291. data/views/cimi/errors/404.html.haml +0 -29
  292. data/views/cimi/errors/405.html.haml +0 -29
  293. data/views/cimi/errors/502.html.haml +0 -43
  294. data/views/cimi/errors/backend_capability_failure.html.haml +0 -29
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rackspace/common'
3
3
 
4
4
  module RackspaceTest
5
5
 
@@ -7,7 +7,12 @@ module RackspaceTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  def test_01_it_returns_entry_points
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rackspace/common'
3
3
  #require 'webmock/test_unit'
4
4
  module RackspaceTest
5
5
 
@@ -7,7 +7,12 @@ module RackspaceTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  @@created_bucket_name="testbucki2rpux3wdelme"
@@ -0,0 +1,16 @@
1
+ load File.join(File.dirname(__FILE__), '..', '..', 'common.rb')
2
+
3
+ ENV['API_DRIVER'] = "rackspace"
4
+ ENV['API_USER'] = 'mandreou'
5
+ ENV['API_PASSWORD'] = 'a4d531ef02a37dd32cac1e8e516df9eb'
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
+
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rackspace/common'
3
3
 
4
4
  module RackspaceTest
5
5
 
@@ -7,7 +7,12 @@ module RackspaceTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  def test_01_it_returns_hardware_profiles
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rackspace/common'
3
3
 
4
4
  module RackspaceTest
5
5
 
@@ -7,7 +7,12 @@ module RackspaceTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  def test_01_it_returns_images
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rackspace/common'
3
3
 
4
4
  module RackspaceTest
5
5
 
@@ -7,7 +7,12 @@ module RackspaceTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  def test_01_01_it_can_create_instance_without_hardware_profile
@@ -118,7 +123,7 @@ module RackspaceTest
118
123
  :'api[driver]' => 'rackspace',
119
124
  }
120
125
  post_url "/api/instances/#{(@@instance/'instance').first[:id]}/reboot", params
121
- last_response.status.should == 200
126
+ last_response.status.should == 202
122
127
  20.times do |tick|
123
128
  get_auth_url "/api;driver=rackspace/instances/#{(@@instance/'instance').first[:id]}", { :tick => tick}
124
129
  last_response.status.should_not == 500
@@ -133,7 +138,7 @@ module RackspaceTest
133
138
  :'api[driver]' => 'rackspace',
134
139
  }
135
140
  post_url "/api/instances/#{(@@instance/'instance').first[:id]}/stop", params
136
- last_response.status.should == 200
141
+ last_response.status.should == 202
137
142
  20.times do |tick|
138
143
  get_auth_url "/api;driver=rackspace/instances/#{(@@instance/'instance').first[:id]}", { :tick => tick}
139
144
  last_response.status.should_not == 500
@@ -148,7 +153,7 @@ module RackspaceTest
148
153
  :'api[driver]' => 'rackspace',
149
154
  }
150
155
  post_url "/api/instances/#{(@@instance2/'instance').first[:id]}/stop", params, authenticate
151
- last_response.status.should == 200
156
+ last_response.status.should == 202
152
157
  20.times do |tick|
153
158
  get_auth_url "/api;driver=rackspace/instances/#{(@@instance2/'instance').first[:id]}", { :tick => tick}
154
159
  last_response.status.should_not == 500
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rackspace/common'
3
3
 
4
4
  module RackspaceTest
5
5
 
@@ -7,7 +7,12 @@ module RackspaceTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  def test_01_it_returns_realms
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rhevm/common'
3
3
 
4
4
  module RHEVMTest
5
5
 
@@ -7,11 +7,16 @@ module RHEVMTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  def test_01_it_returns_entry_points
14
- get_auth_url '/api;driver=rhevm?force_auth=1'
19
+ get_auth_url '/api;driver=rhevm'
15
20
  (last_xml_response/'/api').first[:driver].should == 'rhevm'
16
21
  (last_xml_response/'/api/link').length.should > 0
17
22
  end
@@ -20,8 +25,8 @@ module RHEVMTest
20
25
  get_url '/api;driver=rhevm'
21
26
  features = (last_xml_response/'/api/link[@rel="instances"]/feature').collect { |f| f[:name] }
22
27
  features.include?('user_name').should == true
23
- features.include?('hardware_profiles').should == true
24
- features.length.should == 3
28
+ features.include?('user_data').should == true
29
+ features.length.should == 2
25
30
  end
26
31
 
27
32
  def test_03_it_has_rhevm_collections
@@ -32,7 +37,8 @@ module RHEVMTest
32
37
  collections.include?('images').should == true
33
38
  collections.include?('realms').should == true
34
39
  collections.include?('hardware_profiles').should == true
35
- collections.length.should == 8
40
+ collections.include?('storage_volumes').should == true
41
+ collections.length.should == 7
36
42
  end
37
43
 
38
44
  end
@@ -1,3 +1,5 @@
1
+ load File.join(File.dirname(__FILE__), '..', '..', 'common.rb')
2
+
1
3
  ENV['API_USER'] = 'vdcadmin@rhev.lab.eng.brq.redhat.com'
2
4
  ENV['API_PASSWORD'] = '123456'
3
5
  ENV['API_PROVIDER'] = 'https://rhev30-dc.lab.eng.brq.redhat.com:8443/rhevm-api;645e425e-66fe-4ac9-8874-537bd10ef08d'
@@ -7,8 +9,13 @@ require 'vcr'
7
9
  DeltacloudTestCommon::record!
8
10
 
9
11
  VCR.config do |c|
10
- c.cassette_library_dir = "#{File.dirname(__FILE__)}/../../../tests/drivers/rhevm/fixtures/"
12
+ c.cassette_library_dir = File.join(File.dirname(__FILE__), 'fixtures')
11
13
  c.stub_with :webmock
12
14
  c.default_cassette_options = { :record => :none }
13
15
  end
14
16
 
17
+ class WebMock::Config
18
+ def net_http_connect_on_start
19
+ true
20
+ end
21
+ end
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rhevm/common'
3
3
 
4
4
  module RHEVMTest
5
5
 
@@ -7,7 +7,12 @@ module RHEVMTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  def test_01_it_returns_hardware_profiles
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rhevm/common'
3
3
 
4
4
  module RHEVMTest
5
5
 
@@ -7,11 +7,17 @@ module RHEVMTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  def test_01_it_returns_images
14
19
  get_auth_url '/api;driver=rhevm/images'
20
+ puts last_response.body
15
21
  (last_xml_response/'images/image').length.should > 0
16
22
  end
17
23
 
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rhevm/common'
3
3
 
4
4
  module RHEVMTest
5
5
 
@@ -7,7 +7,12 @@ module RHEVMTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  def test_01_01_it_can_create_instance_without_hardware_profile
@@ -1,5 +1,5 @@
1
1
  $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..')
2
- require 'tests/common'
2
+ require 'tests/drivers/rhevm/common'
3
3
 
4
4
  module RHEVMTest
5
5
 
@@ -7,7 +7,12 @@ module RHEVMTest
7
7
  include Rack::Test::Methods
8
8
 
9
9
  def app
10
- Sinatra::Application
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
+ }
11
16
  end
12
17
 
13
18
  def test_01_it_returns_realms
@@ -0,0 +1,58 @@
1
+ load File.join(File.dirname(__FILE__), '..', 'lib', 'deltacloud_rack.rb')
2
+
3
+ Deltacloud::configure do |server|
4
+ server.root_url '/api'
5
+ server.version '1.0.0'
6
+ server.klass 'Deltacloud::API'
7
+ end
8
+
9
+ Deltacloud.require_frontend!(:deltacloud)
10
+
11
+ require 'minitest/autorun'
12
+ require 'rack/test'
13
+ require 'nokogiri'
14
+ require 'json'
15
+ require 'pp'
16
+
17
+ module Deltacloud
18
+ module Test
19
+ include Rack::Test::Methods
20
+
21
+ def included?(sub)
22
+ sub.class_eval do
23
+ before do
24
+ header 'Accept', 'application/xml'
25
+ end
26
+ end
27
+ end
28
+
29
+ def xml_response
30
+ Nokogiri::XML(last_response.body)
31
+ end
32
+
33
+ def root_url
34
+ Deltacloud[:deltacloud].root_url
35
+ end
36
+
37
+ def api_version
38
+ Deltacloud[:deltacloud].version
39
+ end
40
+
41
+ def authenticate
42
+ authorize ENV['TESTS_API_USERNAME'], ENV['TESTS_API_PASSWORD']
43
+ end
44
+
45
+ def collection_url(collection)
46
+ [root_url, collection.to_s].join('/')
47
+ end
48
+
49
+ def app
50
+ Rack::Builder.new {
51
+ map '/' do
52
+ use Rack::Static, :urls => ["/stylesheets", "/javascripts"], :root => "public"
53
+ run Rack::Cascade.new([Deltacloud::API])
54
+ end
55
+ }
56
+ end
57
+ end
58
+ end
@@ -0,0 +1,115 @@
1
+ #these are common MiniTest::Spec assertions
2
+ #used across all drivers. See /drivers/*/api_test.rb
3
+
4
+ it 'return HTTP_OK when accessing API entrypoint' do
5
+ get root_url
6
+ last_response.status.must_equal 200
7
+ end
8
+
9
+ it 'advertise the current driver in API entrypoint' do
10
+ get root_url
11
+ xml_response.root[:driver].must_equal ENV['API_DRIVER']
12
+ end
13
+
14
+ it 'advertise the current API version in API entrypoint' do
15
+ get root_url
16
+ xml_response.root[:version].must_equal api_version
17
+ end
18
+
19
+ it 'advertise the current API version in HTTP headers' do
20
+ get root_url
21
+ last_response.headers['Server'].must_equal "Apache-Deltacloud/#{api_version}"
22
+ end
23
+
24
+ it 'must include the ETag in HTTP headers' do
25
+ get root_url
26
+ last_response.headers['ETag'].wont_be_nil
27
+ end
28
+
29
+ it 'advertise collections in API entrypoint' do
30
+ get root_url
31
+ (xml_response/'api/link').wont_be_empty
32
+ end
33
+
34
+ it 'include the :href and :rel attribute for each collection in API entrypoint' do
35
+ get root_url
36
+ (xml_response/'api/link').each do |collection|
37
+ collection[:href].wont_be_nil
38
+ collection[:rel].wont_be_nil
39
+ end
40
+ end
41
+
42
+ it 'uses the absolute URI in the :href attribute for each collection in API entrypoint' do
43
+ get root_url
44
+ (xml_response/'api/link').each do |collection|
45
+ collection[:href].must_match /^http/
46
+ end
47
+ end
48
+
49
+ it 'advertise features for some collections in API entrypoint' do
50
+ get root_url
51
+ (xml_response/'api/link/feature').wont_be_empty
52
+ end
53
+
54
+ it 'advertise the name of the feature for some collections in API entrypoint' do
55
+ get root_url
56
+ (xml_response/'api/link/feature').each do |f|
57
+ f[:name].wont_be_nil
58
+ end
59
+ end
60
+
61
+ it 'must change the media type from XML to JSON using Accept headers' do
62
+ header 'Accept', 'application/json'
63
+ get root_url
64
+ last_response.headers['Content-Type'].must_equal 'application/json'
65
+ end
66
+
67
+ it 'must change the media type to JSON using the "?format" parameter in URL' do
68
+ get root_url, { :format => 'json' }
69
+ last_response.headers['Content-Type'].must_equal 'application/json'
70
+ end
71
+
72
+ it 'must change the driver when using X-Deltacloud-Driver HTTP header' do
73
+ header 'X-Deltacloud-Driver', 'ec2'
74
+ get root_url
75
+ xml_response.root[:driver].must_equal 'ec2'
76
+ header 'X-Deltacloud-Driver', 'mock'
77
+ get root_url
78
+ xml_response.root[:driver].must_equal 'mock'
79
+ end
80
+
81
+ it 'must change the features when driver is swapped using HTTP headers' do
82
+ header 'X-Deltacloud-Driver', 'ec2'
83
+ get root_url
84
+ # The 'user_name' feature is not supported currently for the EC2 driver
85
+ (xml_response/'api/link/feature').map { |f| f[:name] }.wont_include 'user_name'
86
+ header 'X-Deltacloud-Driver', 'mock'
87
+ get root_url
88
+ # But it's supported in Mock driver
89
+ (xml_response/'api/link/feature').map { |f| f[:name] }.must_include 'user_name'
90
+ end
91
+
92
+ it 'must re-validate the driver credentials when using "?force_auth" parameter in URL' do
93
+ get root_url, { :force_auth => '1' }
94
+ last_response.status.must_equal 401
95
+ authenticate
96
+ get root_url, { :force_auth => '1' }
97
+ last_response.status.must_equal 200
98
+ end
99
+
100
+ it 'must change the API PROVIDER using the /api;provider matrix parameter in URI' do
101
+ get root_url + ';provider=test1'
102
+ xml_response.root[:provider].wont_be_nil
103
+ xml_response.root[:provider].must_equal 'test1'
104
+ get root_url + ';provider=test2'
105
+ xml_response.root[:provider].must_equal 'test2'
106
+ end
107
+
108
+ it 'must change the API DRIVER using the /api;driver matrix parameter in URI' do
109
+ get root_url + ';driver=ec2'
110
+ xml_response.root[:driver].must_equal 'ec2'
111
+ get root_url + ';driver=mock'
112
+ xml_response.root[:driver].must_equal 'mock'
113
+ end
114
+
115
+