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,48 @@
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 CIMI::Collections
17
+ class VspConfigurations < Base
18
+
19
+ check_capability :for => lambda { |m| driver.respond_to? m }
20
+ collection :vsp_configurations do
21
+
22
+ operation :index do
23
+ description 'List all VSPConfigurations in the VSPConfigurationCollection'
24
+ param :CIMISelect, :string, :optional
25
+ control do
26
+ vsp_configs = VSPConfigurationCollection.default(self).filter_by(params[:CIMISelect])
27
+ respond_to do |format|
28
+ format.xml {vsp_configs.to_xml}
29
+ format.json {vsp_configs.to_json}
30
+ end
31
+ end
32
+ end
33
+
34
+ operation :show do
35
+ description 'Show a specific VSPConfiguration'
36
+ control do
37
+ vsp_config = VSPConfiguration.find(params[:id], self)
38
+ respond_to do |format|
39
+ format.xml {vsp_config.to_xml}
40
+ format.json {vsp_config.to_json}
41
+ end
42
+ end
43
+ end
44
+
45
+ end
46
+
47
+ end
48
+ end
@@ -0,0 +1,50 @@
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 CIMI::Collections
17
+ class VspTemplates < Base
18
+
19
+ check_capability :for => lambda { |m| driver.respond_to? m }
20
+ collection :vsp_templates do
21
+
22
+ description 'The VSP Template is a set of Configuration values for realizing a VSP. A VSP Template may be used to create multiple VSPs'
23
+
24
+ operation :index do
25
+ description 'List all VSPTemplates in the VSPTemplateCollection'
26
+ param :CIMISelect, :string, :optional
27
+ control do
28
+ vsp_templates = VSPTemplateCollection.default(self).filter_by(params[:CIMISelect])
29
+ respond_to do |format|
30
+ format.xml {vsp_templates.to_xml}
31
+ format.json {vsp_templates.to_json}
32
+ end
33
+ end
34
+ end
35
+
36
+ operation :show do
37
+ description 'Show a specific VSPTemplate'
38
+ control do
39
+ vsp_template = VSPTemplate.find(params[:id], self)
40
+ respond_to do |format|
41
+ format.xml {vsp_template.to_xml}
42
+ format.json {vsp_template.to_json}
43
+ end
44
+ end
45
+ end
46
+
47
+ end
48
+
49
+ end
50
+ end
@@ -0,0 +1,108 @@
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 CIMI::Collections
17
+ class Vsps < Base
18
+
19
+ check_capability :for => lambda { |m| driver.respond_to? m }
20
+ collection :vsps do
21
+
22
+ description 'A VSP represents the connection parameters of a network port'
23
+
24
+ operation :index do
25
+ description 'List all VSPs in the VSPCollection'
26
+ param :CIMISelect, :string, :optional
27
+ control do
28
+ vsps = VSPCollection.default(self).filter_by(params[:CIMISelect])
29
+ respond_to do |format|
30
+ format.xml {vsps.to_xml}
31
+ format.json {vsps.to_json}
32
+ end
33
+ end
34
+ end
35
+
36
+ operation :show do
37
+ description 'Show a specific VSP'
38
+ control do
39
+ vsp = VSP.find(params[:id], self)
40
+ respond_to do |format|
41
+ format.xml {vsp.to_xml}
42
+ format.json {vsp.to_json}
43
+ end
44
+ end
45
+ end
46
+
47
+ operation :create do
48
+ description "Create a new VSP"
49
+ control do
50
+ if request.content_type.end_with?("json")
51
+ vsp = CIMI::Model::VSP.create(request.body.read, self, :json)
52
+ else
53
+ vsp = CIMI::Model::VSP.create(request.body.read, self, :xml)
54
+ end
55
+ respond_to do |format|
56
+ format.xml { vsp.to_xml }
57
+ format.json { vsp.to_json }
58
+ end
59
+ end
60
+ end
61
+
62
+ operation :destroy do
63
+ description "Delete a specified VSP"
64
+ control do
65
+ CIMI::Model::VSP.delete!(params[:id], self)
66
+ no_content_with_status(200)
67
+ end
68
+ end
69
+
70
+ action :start do
71
+ description "Start specific VSP."
72
+ param :id, :string, :required
73
+ control do
74
+ vsp = VSP.find(params[:id], self)
75
+ report_error(404) unless vsp
76
+ if request.content_type.end_with?("json")
77
+ action = Action.from_json(request.body.read)
78
+ else
79
+ action = Action.from_xml(request.body.read)
80
+ end
81
+ vsp.perform(action, self) do |operation|
82
+ no_content_with_status(202) if operation.success?
83
+ # Handle errors using operation.failure?
84
+ end
85
+ end
86
+ end
87
+
88
+ action :stop do
89
+ description "Stop specific VSP."
90
+ control do
91
+ vsp = VSP.find(params[:id], self)
92
+ report_error(404) unless vsp
93
+ if request.content_type.end_with?("json")
94
+ action = Action.from_json(request.body.read)
95
+ else
96
+ action = Action.from_xml(request.body.read)
97
+ end
98
+ vsp.perform(action, self) do |operation|
99
+ no_content_with_status(202) if operation.success?
100
+ # Handle errors using operation.failure?
101
+ end
102
+ end
103
+ end
104
+
105
+ end
106
+
107
+ end
108
+ end
@@ -41,6 +41,7 @@ require 'deltacloud/models/firewall_rule'
41
41
 
42
42
  require 'json'
43
43
  require 'sinatra/rack_accept'
44
+ require 'sinatra/rack_cimi'
44
45
  require 'sinatra/static_assets'
45
46
  require 'sinatra/rabbit'
46
47
  require 'sinatra/lazy_auth'
@@ -0,0 +1,116 @@
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; end
17
+ module CIMI; end
18
+
19
+ require_relative '../deltacloud/drivers/features'
20
+
21
+ # Declare namespace for CIMI models
22
+ #
23
+
24
+ module CIMI
25
+ module Model; end
26
+
27
+ class FakeCollection
28
+ extend Sinatra::Rabbit::Features
29
+ include Deltacloud::Features
30
+ end
31
+ end
32
+
33
+ require_relative '../deltacloud/drivers'
34
+ require_relative '../deltacloud/models'
35
+ require_relative '../deltacloud/helpers/driver_helper'
36
+ require_relative '../deltacloud/helpers/auth_helper'
37
+ require_relative '../deltacloud/helpers/url_helper'
38
+ require_relative '../deltacloud/helpers/deltacloud_helper'
39
+ require_relative '../deltacloud/helpers/rabbit_helper'
40
+ require_relative './helpers/cimi_helper'
41
+ require_relative './models'
42
+
43
+ module CIMI::Collections
44
+ class Base < Sinatra::Base
45
+
46
+ include Sinatra::Rabbit
47
+ extend Deltacloud::Helpers::Drivers
48
+ include Sinatra::Rabbit::Features
49
+ include CIMI::Model
50
+
51
+ helpers Deltacloud::Helpers::Drivers
52
+ helpers Sinatra::AuthHelper
53
+ helpers Sinatra::UrlForHelper
54
+ helpers Rack::RespondTo::Helpers
55
+ helpers Deltacloud::Helpers::Application
56
+ helpers CIMIHelper
57
+
58
+ register Rack::RespondTo
59
+
60
+ enable :xhtml
61
+ enable :dump_errors
62
+ enable :show_errors
63
+ disable :show_exceptions
64
+
65
+ set :config, Deltacloud[:cimi]
66
+ set :root_url, config.root_url
67
+ set :root_path, config.root_url
68
+ set :version, config.version
69
+ set :root, File.join(File.dirname(__FILE__), '..', '..')
70
+ set :views, root + '/views/cimi'
71
+ set :public_folder, root + '/public'
72
+
73
+ Sinatra::Rabbit.set :root_path, "#{config.root_url}/"
74
+
75
+ error do
76
+ report_error
77
+ end
78
+
79
+ error Deltacloud::ExceptionHandler::ValidationFailure do
80
+ report_error
81
+ end
82
+
83
+ before do
84
+ # Respond with 400, If we don't get a http Host header,
85
+ halt 400, "Unable to find HTTP Host header" if @env['HTTP_HOST'] == nil
86
+ end
87
+
88
+ after do
89
+ headers 'CIMI-Specification-Version' => Deltacloud[:cimi].version
90
+ end
91
+
92
+ def self.new_route_for(route, &block)
93
+ get route_for('/' + route.to_s + '/new') do
94
+ instance_eval(&block) if block_given?
95
+ respond_to do |format|
96
+ format.html do
97
+ haml :"#{route}/new"
98
+ end
99
+ end
100
+ end
101
+ end
102
+
103
+ def self.check_capability(opts={})
104
+ Sinatra::Rabbit.set :check_capability, opts[:for]
105
+ end
106
+
107
+ def self.check_features(opts={})
108
+ Sinatra::Rabbit.set :check_features, opts[:for]
109
+ end
110
+
111
+ def self.route_for(url)
112
+ "#{settings.root_url}#{url}"
113
+ end
114
+
115
+ end
116
+ end
@@ -20,9 +20,13 @@ module CIMIHelper
20
20
  status code
21
21
  end
22
22
 
23
- end
24
23
 
25
- helpers CIMIHelper
24
+ def href_id(href, entity)
25
+ split_on = self.send(:"#{entity.to_s}_url")
26
+ href.split("#{split_on}/").last
27
+ end
28
+
29
+ end
26
30
 
27
31
  class Array
28
32
  def to_xml_cimi_collection(_self)
@@ -0,0 +1,72 @@
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 require_relatived 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 CIMI
17
+ module Model; end
18
+ end
19
+
20
+ unless Kernel.respond_to?(:require_relative)
21
+ module Kernel
22
+ def require_relative(path)
23
+ require File.join(File.dirname(caller[0]), path.to_str)
24
+ end
25
+ end
26
+ end
27
+
28
+ require_relative './models/schema'
29
+ require_relative './models/base'
30
+ require_relative './models/errors'
31
+ require_relative './models/entity_metadata'
32
+ require_relative './models/entity_metadata_collection'
33
+ require_relative './models/cloud_entry_point'
34
+ require_relative './models/machine_template'
35
+ require_relative './models/machine_image'
36
+ require_relative './models/machine_configuration'
37
+ require_relative './models/action'
38
+ require_relative './models/machine'
39
+ require_relative './models/volume'
40
+ require_relative './models/machine_admin'
41
+ require_relative './models/volume_configuration'
42
+ require_relative './models/volume_image'
43
+ require_relative './models/volume_template'
44
+ require_relative './models/machine_template_collection'
45
+ require_relative './models/machine_image_collection'
46
+ require_relative './models/machine_configuration_collection'
47
+ require_relative './models/machine_collection'
48
+ require_relative './models/volume_collection'
49
+ require_relative './models/machine_admin_collection'
50
+ require_relative './models/volume_configuration_collection'
51
+ require_relative './models/volume_image_collection'
52
+ require_relative './models/volume_template_collection'
53
+ require_relative './models/network'
54
+ require_relative './models/network_collection'
55
+ require_relative './models/network_configuration'
56
+ require_relative './models/network_configuration_collection'
57
+ require_relative './models/network_template'
58
+ require_relative './models/network_template_collection'
59
+ require_relative './models/routing_group'
60
+ require_relative './models/routing_group_collection'
61
+ require_relative './models/routing_group_template'
62
+ require_relative './models/routing_group_template_collection'
63
+ require_relative './models/vsp'
64
+ require_relative './models/vsp_collection'
65
+ require_relative './models/vsp_configuration'
66
+ require_relative './models/vsp_configuration_collection'
67
+ require_relative './models/vsp_template'
68
+ require_relative './models/vsp_template_collection'
69
+ require_relative './models/address'
70
+ require_relative './models/address_collection'
71
+ require_relative './models/address_template'
72
+ require_relative './models/address_template_collection'
@@ -18,7 +18,7 @@ class CIMI::Model::Action < CIMI::Model::Base
18
18
  text :action
19
19
 
20
20
  def name
21
- action.split('/').last.intern
21
+ action.split('/').last.strip.intern
22
22
  end
23
23
 
24
24
  end
@@ -0,0 +1,72 @@
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
+ class CIMI::Model::Address < CIMI::Model::Base
17
+
18
+ text :ip
19
+
20
+ text :hostname
21
+
22
+ text :allocation
23
+
24
+ text :default_gateway
25
+
26
+ text :dns
27
+
28
+ text :mac_address
29
+
30
+ text :protocol
31
+
32
+ text :mask
33
+
34
+ href :network
35
+
36
+ href :resource
37
+
38
+ array :operations do
39
+ scalar :rel, :href
40
+ end
41
+
42
+ def self.find(id, context)
43
+ if id==:all
44
+ context.driver.addresses(context.credentials, {:env=>context})
45
+ else
46
+ context.driver.addresses(context.credentials, {:id=>id, :env=>context})
47
+ end
48
+ end
49
+
50
+ def self.create(request_body, context, type)
51
+ input = (type == :xml)? XmlSimple.xml_in(request_body, {"ForceArray"=>false, "NormaliseSpace"=>2}) : JSON.parse(request_body)
52
+ if input["addressTemplate"]["href"] #by reference
53
+ address_template = CIMI::Model::AddressTemplate.find(context.href_id(input["addressTemplate"]["href"], :address_templates), context)
54
+ else
55
+ case type
56
+ when :json
57
+ address_template = CIMI::Model::AddressTemplate.from_json(JSON.generate(input["addressTemplate"]))
58
+ when :xml
59
+ xml = XmlSimple.xml_in(request_body, {"NormaliseSpace"=>2})
60
+ address_template = CIMI::Model::AddressTemplate.from_xml(XmlSimple.xml_out(xml["addressTemplate"][0]))
61
+ end
62
+ end
63
+ params = {:name=>input["name"], :description=>input["description"], :address_template=>address_template, :env=>context }
64
+ raise CIMI::Model::BadRequest.new("Bad request - missing required parameters. Client sent: #{request_body} which produced #{params.inspect}") if params.has_value?(nil)
65
+ context.driver.create_address(context.credentials, params)
66
+ end
67
+
68
+ def self.delete!(id, context)
69
+ context.driver.delete_address(context.credentials, id)
70
+ end
71
+
72
+ end