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
@@ -0,0 +1,102 @@
1
+ # Licensed to the Apache Software Foundation (ASF) under one or more
2
+ # contributor license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright ownership. The
4
+ # ASF licenses this file to you under the Apache License, Version 2.0 (the
5
+ # "License"); you may not use this file except in compliance with the
6
+ # License. You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13
+ # License for the specific language governing permissions and limitations
14
+ # under the License.
15
+
16
+ module Deltacloud::Collections
17
+ class LoadBalancers < Base
18
+ check_capability :for => lambda { |m| driver.has_capability? m }
19
+
20
+ new_route_for :load_balancers do
21
+ @realms = driver.realms(credentials)
22
+ end
23
+
24
+ collection :load_balancers do
25
+ description "Load balancers are used distribute workload across multiple instances"
26
+
27
+ standard_index_operation
28
+
29
+ operation :show, :with_capability => :load_balancer do
30
+ param :id, :string, :required
31
+ control do
32
+ @load_balancer = driver.load_balancer(credentials, params)
33
+ @registered_instances = @load_balancer.instances.collect{|i| {:id => i.id, :name=> i.name}}
34
+ @unregistered_instances = driver.instances(credentials).collect{|i| {:id => i.id, :name => i.name}} - @registered_instances
35
+ respond_to do |format|
36
+ format.xml { haml :'load_balancers/show' }
37
+ format.json { xml_to_json('load_balancers/show') }
38
+ format.html { haml :'load_balancers/show' }
39
+ end
40
+ end
41
+ end
42
+
43
+ operation :create do
44
+ param :name, :string, :required
45
+ param :realm_id, :string, :required
46
+ param :listener_protocol, :string, :required, ['HTTP', 'TCP']
47
+ param :listener_balancer_port, :string, :required
48
+ param :listener_instance_port, :string, :required
49
+ control do
50
+ @load_balancer = driver.create_load_balancer(credentials, params)
51
+ status 201 # Created
52
+ response['Location'] = load_balancer_url(@load_balancer.id)
53
+ respond_to do |format|
54
+ format.xml { haml :"load_balancers/show" }
55
+ format.json { convert_to_json(:load_balancer, @load_balancer) }
56
+ format.html { redirect load_balancer_url(@load_balancer.id)}
57
+ end
58
+ end
59
+ end
60
+
61
+ action :register do
62
+ param :instance_id, :string, :required
63
+ control do
64
+ driver.lb_register_instance(credentials, params)
65
+ @load_balancer = driver.load_balancer(credentials, params[:id])
66
+ respond_to do |format|
67
+ format.xml { haml :'load_balancers/show' }
68
+ format.json { xml_to_json('load_balancers/show') }
69
+ format.html { redirect load_balancer_url(@load_balancer.id)}
70
+ end
71
+ end
72
+ end
73
+
74
+ action :unregister do
75
+ param :instance_id, :string, :required
76
+ control do
77
+ driver.lb_unregister_instance(credentials, params)
78
+ @load_balancer = driver.load_balancer(credentials, params[:id])
79
+ respond_to do |format|
80
+ format.xml { haml :'load_balancers/show' }
81
+ format.json { xml_to_json('load_balancers/show')}
82
+ format.html { redirect load_balancer_url(@load_balancer.id) }
83
+ end
84
+ end
85
+ end
86
+
87
+ operation :destroy do
88
+ control do
89
+ driver.destroy_load_balancer(credentials, params[:id])
90
+ status 204
91
+ respond_to do |format|
92
+ format.xml
93
+ format.json
94
+ format.html { redirect(load_balancers_url) }
95
+ end
96
+ end
97
+ end
98
+
99
+ end
100
+
101
+ end
102
+ end
@@ -0,0 +1,28 @@
1
+ # Licensed to the Apache Software Foundation (ASF) under one or more
2
+ # contributor license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright ownership. The
4
+ # ASF licenses this file to you under the Apache License, Version 2.0 (the
5
+ # "License"); you may not use this file except in compliance with the
6
+ # License. You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13
+ # License for the specific language governing permissions and limitations
14
+ # under the License.
15
+
16
+ module Deltacloud::Collections
17
+ class Metrics < Base
18
+ check_capability :for => lambda { |m| driver.respond_to? m }
19
+
20
+ collection :metrics do
21
+ description 'Metrics provide monitoring for the cloud resources'
22
+
23
+ standard_index_operation
24
+ standard_show_operation
25
+
26
+ end
27
+ end
28
+ end
@@ -0,0 +1,28 @@
1
+ # Licensed to the Apache Software Foundation (ASF) under one or more
2
+ # contributor license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright ownership. The
4
+ # ASF licenses this file to you under the Apache License, Version 2.0 (the
5
+ # "License"); you may not use this file except in compliance with the
6
+ # License. You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13
+ # License for the specific language governing permissions and limitations
14
+ # under the License.
15
+
16
+ module Deltacloud::Collections
17
+ class Realms < Base
18
+ check_capability :for => lambda { |m| driver.respond_to? m }
19
+
20
+ collection :realms do
21
+ description "Within a cloud provider a realm represents a boundary containing resources"
22
+
23
+ standard_index_operation
24
+ standard_show_operation
25
+
26
+ end
27
+ end
28
+ end
@@ -0,0 +1,51 @@
1
+ # Licensed to the Apache Software Foundation (ASF) under one or more
2
+ # contributor license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright ownership. The
4
+ # ASF licenses this file to you under the Apache License, Version 2.0 (the
5
+ # "License"); you may not use this file except in compliance with the
6
+ # License. You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13
+ # License for the specific language governing permissions and limitations
14
+ # under the License.
15
+
16
+ module Deltacloud::Collections
17
+ class StorageSnapshots < Base
18
+ check_capability :for => lambda { |m| driver.respond_to? m }
19
+ check_features :for => lambda { |c, f| driver.class.has_feature?(c, f) }
20
+
21
+ new_route_for(:storage_snapshots)
22
+
23
+ collection :storage_snapshots do
24
+ standard_index_operation
25
+ standard_show_operation
26
+
27
+ operation :create, :with_capability => :create_storage_snapshot do
28
+ param :volume_id, :string, :required
29
+ control do
30
+ @storage_snapshot = driver.create_storage_snapshot(credentials, params)
31
+ status 201 # Created
32
+ response['Location'] = storage_snapshot_url(@storage_snapshot.id)
33
+ show(:storage_snapshot)
34
+ end
35
+ end
36
+
37
+ operation :destroy, :with_capability => :destroy_storage_snapshot do
38
+ control do
39
+ driver.destroy_storage_snapshot(credentials, params)
40
+ status 204
41
+ respond_to do |format|
42
+ format.xml
43
+ format.json
44
+ format.html { redirect(storage_snapshots_url) }
45
+ end
46
+ end
47
+ end
48
+ end
49
+
50
+ end
51
+ end
@@ -0,0 +1,99 @@
1
+ # Licensed to the Apache Software Foundation (ASF) under one or more
2
+ # contributor license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright ownership. The
4
+ # ASF licenses this file to you under the Apache License, Version 2.0 (the
5
+ # "License"); you may not use this file except in compliance with the
6
+ # License. You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12
+ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13
+ # License for the specific language governing permissions and limitations
14
+ # under the License.
15
+
16
+ module Deltacloud::Collections
17
+ class StorageVolumes < Base
18
+
19
+ check_capability :for => lambda { |m| driver.respond_to? m }
20
+ check_features :for => lambda { |c, f| driver.class.has_feature?(c, f) }
21
+
22
+ new_route_for(:storage_volumes)
23
+
24
+ get route_for("/storage_volumes/:id/attach_instance") do
25
+ @instances = driver.instances(credentials)
26
+ respond_to do |format|
27
+ format.html{ haml :"storage_volumes/attach"}
28
+ end
29
+ end
30
+
31
+ collection :storage_volumes do
32
+
33
+ standard_index_operation
34
+ standard_show_operation
35
+
36
+ operation :show, :with_capability => :storage_volume do
37
+ control { show(:storage_volume) }
38
+ end
39
+
40
+ operation :create do
41
+ param :snapshot_id, :string, :optional
42
+ param :capacity, :string, :optional
43
+ param :realm_id, :string, :optional
44
+ control do
45
+ @storage_volume = driver.create_storage_volume(credentials, params)
46
+ status 201
47
+ response['Location'] = storage_volume_url(@storage_volume.id)
48
+ respond_to do |format|
49
+ format.xml { haml :"storage_volumes/show" }
50
+ format.html { haml :"storage_volumes/show" }
51
+ format.json { convert_to_json(:storage_volume, @storage_volume) }
52
+ end
53
+ end
54
+ end
55
+
56
+ action :attach, :with_capability => :attach_storage_volume do
57
+ param :instance_id,:string, :required
58
+ param :device, :string, :required
59
+ control do
60
+ @storage_volume = driver.attach_storage_volume(credentials, params)
61
+ status 202
62
+ respond_to do |format|
63
+ format.html { redirect(storage_volume_url(params[:id]))}
64
+ format.xml { haml :"storage_volumes/show" }
65
+ format.json { convert_to_json(:storage_volume, @storage_volume) }
66
+ end
67
+ end
68
+ end
69
+
70
+ action :detach, :with_capability => :detach_storage_volume do
71
+ control do
72
+ volume = driver.storage_volume(credentials, :id => params[:id])
73
+ @storage_volume = driver.detach_storage_volume(credentials, :id => volume.id,
74
+ :instance_id => volume.instance_id,
75
+ :device => volume.device)
76
+ status 202
77
+ respond_to do |format|
78
+ format.html { redirect(storage_volume_url(params[:id]))}
79
+ format.xml { haml :"storage_volumes/show" }
80
+ format.json { convert_to_json(:storage_volume, @storage_volume) }
81
+ end
82
+ end
83
+ end
84
+
85
+ operation :destroy, :with_capability => :destroy_storage_volume do
86
+ control do
87
+ driver.destroy_storage_volume(credentials, params)
88
+ status 204
89
+ respond_to do |format|
90
+ format.xml
91
+ format.json
92
+ format.html { redirect(storage_volumes_url) }
93
+ end
94
+ end
95
+ end
96
+
97
+ end
98
+ end
99
+ end
@@ -1,4 +1,3 @@
1
- #
2
1
  # Licensed to the Apache Software Foundation (ASF) under one or more
3
2
  # contributor license agreements. See the NOTICE file distributed with
4
3
  # this work for additional information regarding copyright ownership. The
@@ -13,9 +12,18 @@
13
12
  # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14
13
  # License for the specific language governing permissions and limitations
15
14
  # under the License.
15
+ #
16
+
17
+ unless Kernel.respond_to?(:require_relative)
18
+ module Kernel
19
+ def require_relative(path)
20
+ require File.join(File.dirname(caller[0]), path.to_str)
21
+ end
22
+ end
23
+ end
16
24
 
17
- require 'deltacloud/core_ext/string'
18
- require 'deltacloud/core_ext/integer'
19
- require 'deltacloud/core_ext/hash'
20
- require 'deltacloud/core_ext/array'
21
- require 'deltacloud/core_ext/proc'
25
+ require_relative './core_ext/array'
26
+ require_relative './core_ext/hash'
27
+ require_relative './core_ext/integer'
28
+ require_relative './core_ext/proc'
29
+ require_relative './core_ext/string'
@@ -45,11 +45,12 @@ class String
45
45
  end
46
46
 
47
47
  def underscore
48
- gsub(/::/, '/').
49
- gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
50
- gsub(/([a-z\d])([A-Z])/,'\1_\2').
51
- tr("-", "_").
52
- downcase
48
+ return self.downcase if self =~ /VSPs$/i
49
+ gsub(/::/, '/').
50
+ gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
51
+ gsub(/([a-z\d])([A-Z])/,'\1_\2').
52
+ tr("-", "_").
53
+ downcase
53
54
  end
54
55
 
55
56
  def camelize(lowercase_first_letter=nil)
@@ -64,4 +65,15 @@ class String
64
65
  def upcase_first
65
66
  self[0, 1].upcase + self[1..-1]
66
67
  end
68
+
69
+ def truncate(length = 10)
70
+ return self if self.length <= length
71
+ end_string = "...#{self[(self.length-(length/2))..self.length]}"
72
+ "#{self[0..(length/2)]}#{end_string}"
73
+ end
74
+
75
+ unless "".respond_to? :each
76
+ alias :each :each_line
77
+ end
78
+
67
79
  end
@@ -13,25 +13,15 @@
13
13
  # License for the specific language governing permissions and limitations
14
14
  # under the License.
15
15
 
16
- module Deltacloud
16
+ require_relative 'drivers/exceptions'
17
+ require_relative 'drivers/base_driver'
18
+ require_relative 'drivers/features'
19
+ require 'yaml'
17
20
 
21
+ module Deltacloud
18
22
  module Drivers
19
23
 
20
- require 'yaml'
21
-
22
- DEFAULT_COLLECTIONS = [
23
- :hardware_profiles,
24
- :images,
25
- :instances,
26
- :instance_states,
27
- :realms,
28
- :storage_volumes,
29
- :storage_snapshots
30
- ]
31
-
32
- DRIVER=ENV['API_DRIVER'] ? ENV['API_DRIVER'].to_sym : :mock
33
-
34
- def driver_config
24
+ def self.driver_config
35
25
  if Thread::current[:drivers].nil?
36
26
  Thread::current[:drivers] = {}
37
27
  top_srcdir = File.join(File.dirname(__FILE__), '..', '..')
@@ -42,31 +32,5 @@ module Deltacloud
42
32
  Thread::current[:drivers]
43
33
  end
44
34
 
45
- def driver_symbol
46
- (Thread.current[:driver] || DRIVER).to_sym
47
- end
48
-
49
- def driver_name
50
- driver_config[:"#{driver_symbol}"][:name]
51
- end
52
-
53
- def driver_class
54
- basename = driver_config[:"#{driver_symbol}"][:class] || "#{driver_name}Driver"
55
- Deltacloud::Drivers.const_get(driver_name).const_get(basename)
56
- end
57
-
58
- def driver_source_name
59
- File.join("deltacloud", "drivers", "#{driver_symbol}", "#{driver_symbol}_driver.rb")
60
- end
61
-
62
- def driver_mock_source_name
63
- return File.join('deltacloud', 'drivers', "#{driver_symbol}",
64
- "#{driver_symbol}_driver.rb") if driver_name.eql? 'Mock'
65
- end
66
-
67
- def driver
68
- require driver_source_name
69
- @driver ||= driver_class.new
70
- end
71
35
  end
72
36
  end
@@ -15,7 +15,6 @@
15
15
  # under the License.
16
16
 
17
17
  #Windows Azure (WAZ) gem at http://github.com/johnnyhalife/waz-storage
18
- require 'deltacloud/base_driver'
19
18
  require 'waz-blobs'
20
19
 
21
20
  module Deltacloud
@@ -24,9 +23,6 @@ module Deltacloud
24
23
 
25
24
  class AzureDriver < Deltacloud::BaseDriver
26
25
 
27
- def supported_collections; [:buckets]
28
- end
29
-
30
26
  #--
31
27
  # Buckets
32
28
  #--