fog 0.2.30 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (531) hide show
  1. data/Gemfile.lock +8 -8
  2. data/README.rdoc +15 -6
  3. data/Rakefile +12 -19
  4. data/bin/fog +12 -10
  5. data/fog.gemspec +298 -286
  6. data/lib/fog.rb +22 -12
  7. data/lib/fog/attributes.rb +2 -6
  8. data/lib/fog/aws.rb +10 -5
  9. data/lib/fog/aws/bin.rb +29 -65
  10. data/lib/fog/aws/compute.rb +220 -0
  11. data/lib/fog/aws/ec2.rb +9 -216
  12. data/lib/fog/aws/elb.rb +9 -12
  13. data/lib/fog/aws/models/{ec2 → compute}/address.rb +3 -3
  14. data/lib/fog/aws/models/{ec2 → compute}/addresses.rb +3 -11
  15. data/lib/fog/aws/models/{ec2 → compute}/flavor.rb +2 -2
  16. data/lib/fog/aws/models/compute/flavors.rb +39 -0
  17. data/lib/fog/aws/models/compute/image.rb +44 -0
  18. data/lib/fog/aws/models/{ec2 → compute}/images.rb +3 -9
  19. data/lib/fog/aws/models/compute/key_pair.rb +44 -0
  20. data/lib/fog/aws/models/{ec2 → compute}/key_pairs.rb +3 -9
  21. data/lib/fog/aws/models/{ec2 → compute}/security_group.rb +28 -6
  22. data/lib/fog/aws/models/{ec2 → compute}/security_groups.rb +3 -9
  23. data/lib/fog/aws/models/{ec2 → compute}/server.rb +65 -38
  24. data/lib/fog/aws/models/compute/servers.rb +80 -0
  25. data/lib/fog/aws/models/{ec2 → compute}/snapshot.rb +7 -7
  26. data/lib/fog/aws/models/{ec2 → compute}/snapshots.rb +5 -13
  27. data/lib/fog/aws/models/{ec2 → compute}/volume.rb +8 -8
  28. data/lib/fog/aws/models/{ec2 → compute}/volumes.rb +3 -11
  29. data/lib/fog/aws/models/{s3 → storage}/directories.rb +3 -9
  30. data/lib/fog/aws/models/{s3 → storage}/directory.rb +5 -5
  31. data/lib/fog/aws/models/{s3 → storage}/file.rb +9 -9
  32. data/lib/fog/aws/models/{s3 → storage}/files.rb +13 -8
  33. data/lib/fog/aws/parsers/{ec2 → compute}/allocate_address.rb +1 -1
  34. data/lib/fog/aws/parsers/{ec2 → compute}/attach_volume.rb +1 -1
  35. data/lib/fog/aws/parsers/{ec2 → compute}/basic.rb +1 -1
  36. data/lib/fog/aws/parsers/{ec2 → compute}/create_image.rb +1 -1
  37. data/lib/fog/aws/parsers/{ec2 → compute}/create_key_pair.rb +1 -1
  38. data/lib/fog/aws/parsers/{ec2 → compute}/create_snapshot.rb +2 -2
  39. data/lib/fog/aws/parsers/{ec2 → compute}/create_volume.rb +1 -1
  40. data/lib/fog/aws/parsers/{ec2 → compute}/deregister_image.rb +1 -1
  41. data/lib/fog/aws/parsers/{ec2 → compute}/describe_addresses.rb +1 -1
  42. data/lib/fog/aws/parsers/{ec2 → compute}/describe_availability_zones.rb +2 -2
  43. data/lib/fog/aws/parsers/{ec2 → compute}/describe_images.rb +1 -1
  44. data/lib/fog/aws/parsers/{ec2 → compute}/describe_instances.rb +1 -1
  45. data/lib/fog/aws/parsers/{ec2 → compute}/describe_key_pairs.rb +1 -1
  46. data/lib/fog/aws/parsers/{ec2 → compute}/describe_regions.rb +2 -2
  47. data/lib/fog/aws/parsers/{ec2 → compute}/describe_reserved_instances.rb +1 -1
  48. data/lib/fog/aws/parsers/{ec2 → compute}/describe_security_groups.rb +1 -1
  49. data/lib/fog/aws/parsers/{ec2 → compute}/describe_snapshots.rb +1 -1
  50. data/lib/fog/aws/parsers/{ec2 → compute}/describe_volumes.rb +1 -1
  51. data/lib/fog/aws/parsers/{ec2 → compute}/detach_volume.rb +1 -1
  52. data/lib/fog/aws/parsers/{ec2 → compute}/get_console_output.rb +2 -2
  53. data/lib/fog/aws/parsers/compute/import_key_pair.rb +20 -0
  54. data/lib/fog/aws/parsers/{ec2 → compute}/register_image.rb +1 -1
  55. data/lib/fog/aws/parsers/{ec2 → compute}/run_instances.rb +1 -1
  56. data/lib/fog/aws/parsers/{ec2 → compute}/start_stop_instances.rb +1 -1
  57. data/lib/fog/aws/parsers/{ec2 → compute}/terminate_instances.rb +1 -1
  58. data/lib/fog/aws/parsers/{s3 → storage}/access_control_list.rb +1 -1
  59. data/lib/fog/aws/parsers/{s3 → storage}/copy_object.rb +1 -1
  60. data/lib/fog/aws/parsers/{s3 → storage}/get_bucket.rb +1 -1
  61. data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_location.rb +1 -1
  62. data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_logging.rb +1 -1
  63. data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_object_versions.rb +1 -1
  64. data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_versioning.rb +1 -1
  65. data/lib/fog/aws/parsers/{s3 → storage}/get_request_payment.rb +1 -1
  66. data/lib/fog/aws/parsers/{s3 → storage}/get_service.rb +1 -1
  67. data/lib/fog/aws/requests/{ec2 → compute}/allocate_address.rb +3 -3
  68. data/lib/fog/aws/requests/{ec2 → compute}/associate_address.rb +4 -4
  69. data/lib/fog/aws/requests/{ec2 → compute}/attach_volume.rb +6 -6
  70. data/lib/fog/aws/requests/{ec2 → compute}/authorize_security_group_ingress.rb +3 -3
  71. data/lib/fog/aws/requests/{ec2 → compute}/create_image.rb +3 -3
  72. data/lib/fog/aws/requests/{ec2 → compute}/create_key_pair.rb +4 -4
  73. data/lib/fog/aws/requests/{ec2 → compute}/create_security_group.rb +3 -3
  74. data/lib/fog/aws/requests/{ec2 → compute}/create_snapshot.rb +3 -3
  75. data/lib/fog/aws/requests/{ec2 → compute}/create_volume.rb +3 -3
  76. data/lib/fog/aws/requests/{ec2 → compute}/delete_key_pair.rb +2 -2
  77. data/lib/fog/aws/requests/{ec2 → compute}/delete_security_group.rb +3 -3
  78. data/lib/fog/aws/requests/{ec2 → compute}/delete_snapshot.rb +3 -3
  79. data/lib/fog/aws/requests/{ec2 → compute}/delete_volume.rb +4 -4
  80. data/lib/fog/aws/requests/{ec2 → compute}/deregister_image.rb +4 -4
  81. data/lib/fog/aws/requests/{ec2 → compute}/describe_addresses.rb +4 -4
  82. data/lib/fog/aws/requests/{ec2 → compute}/describe_availability_zones.rb +4 -4
  83. data/lib/fog/aws/requests/{ec2 → compute}/describe_images.rb +3 -3
  84. data/lib/fog/aws/requests/{ec2 → compute}/describe_instances.rb +4 -4
  85. data/lib/fog/aws/requests/{ec2 → compute}/describe_key_pairs.rb +4 -4
  86. data/lib/fog/aws/requests/{ec2 → compute}/describe_regions.rb +4 -4
  87. data/lib/fog/aws/requests/{ec2 → compute}/describe_reserved_instances.rb +3 -3
  88. data/lib/fog/aws/requests/{ec2 → compute}/describe_security_groups.rb +4 -4
  89. data/lib/fog/aws/requests/{ec2 → compute}/describe_snapshots.rb +4 -4
  90. data/lib/fog/aws/requests/{ec2 → compute}/describe_volumes.rb +4 -4
  91. data/lib/fog/aws/requests/{ec2 → compute}/detach_volume.rb +4 -4
  92. data/lib/fog/aws/requests/{ec2 → compute}/disassociate_address.rb +3 -3
  93. data/lib/fog/aws/requests/{ec2 → compute}/get_console_output.rb +4 -4
  94. data/lib/fog/aws/requests/compute/import_key_pair.rb +54 -0
  95. data/lib/fog/aws/requests/{ec2 → compute}/modify_image_attributes.rb +2 -2
  96. data/lib/fog/aws/requests/{ec2 → compute}/modify_snapshot_attribute.rb +2 -2
  97. data/lib/fog/aws/requests/{ec2 → compute}/reboot_instances.rb +3 -3
  98. data/lib/fog/aws/requests/{ec2 → compute}/register_image.rb +4 -4
  99. data/lib/fog/aws/requests/{ec2 → compute}/release_address.rb +3 -3
  100. data/lib/fog/aws/requests/{ec2 → compute}/revoke_security_group_ingress.rb +3 -3
  101. data/lib/fog/aws/requests/{ec2 → compute}/run_instances.rb +4 -3
  102. data/lib/fog/aws/requests/{ec2 → compute}/start_instances.rb +3 -3
  103. data/lib/fog/aws/requests/{ec2 → compute}/stop_instances.rb +3 -3
  104. data/lib/fog/aws/requests/{ec2 → compute}/terminate_instances.rb +4 -4
  105. data/lib/fog/aws/requests/elb/create_load_balancer.rb +1 -1
  106. data/lib/fog/aws/requests/elb/delete_load_balancer.rb +1 -1
  107. data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb +1 -1
  108. data/lib/fog/aws/requests/elb/describe_instance_health.rb +1 -1
  109. data/lib/fog/aws/requests/elb/describe_load_balancers.rb +1 -1
  110. data/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb +1 -1
  111. data/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb +1 -1
  112. data/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb +1 -1
  113. data/lib/fog/aws/requests/simpledb/batch_put_attributes.rb +1 -1
  114. data/lib/fog/aws/requests/simpledb/create_domain.rb +1 -1
  115. data/lib/fog/aws/requests/simpledb/delete_attributes.rb +1 -1
  116. data/lib/fog/aws/requests/simpledb/delete_domain.rb +1 -1
  117. data/lib/fog/aws/requests/simpledb/domain_metadata.rb +1 -1
  118. data/lib/fog/aws/requests/simpledb/get_attributes.rb +1 -1
  119. data/lib/fog/aws/requests/simpledb/list_domains.rb +1 -1
  120. data/lib/fog/aws/requests/simpledb/put_attributes.rb +1 -1
  121. data/lib/fog/aws/requests/simpledb/select.rb +1 -1
  122. data/lib/fog/aws/requests/{s3 → storage}/copy_object.rb +3 -3
  123. data/lib/fog/aws/requests/{s3 → storage}/delete_bucket.rb +1 -1
  124. data/lib/fog/aws/requests/{s3 → storage}/delete_object.rb +2 -2
  125. data/lib/fog/aws/requests/{s3 → storage}/get_bucket.rb +3 -3
  126. data/lib/fog/aws/requests/{s3 → storage}/get_bucket_acl.rb +3 -3
  127. data/lib/fog/aws/requests/{s3 → storage}/get_bucket_location.rb +3 -3
  128. data/lib/fog/aws/requests/{s3 → storage}/get_bucket_logging.rb +3 -3
  129. data/lib/fog/aws/requests/{s3 → storage}/get_bucket_object_versions.rb +3 -3
  130. data/lib/fog/aws/requests/{s3 → storage}/get_bucket_versioning.rb +3 -3
  131. data/lib/fog/aws/requests/{s3 → storage}/get_object.rb +1 -1
  132. data/lib/fog/aws/requests/{s3 → storage}/get_object_acl.rb +3 -3
  133. data/lib/fog/aws/requests/{s3 → storage}/get_object_torrent.rb +1 -1
  134. data/lib/fog/aws/requests/{s3 → storage}/get_object_url.rb +1 -1
  135. data/lib/fog/aws/requests/{s3 → storage}/get_request_payment.rb +3 -3
  136. data/lib/fog/aws/requests/{s3 → storage}/get_service.rb +3 -3
  137. data/lib/fog/aws/requests/{s3 → storage}/head_object.rb +1 -1
  138. data/lib/fog/aws/requests/{s3 → storage}/put_bucket.rb +1 -1
  139. data/lib/fog/aws/requests/{s3 → storage}/put_bucket_acl.rb +1 -1
  140. data/lib/fog/aws/requests/{s3 → storage}/put_bucket_logging.rb +1 -1
  141. data/lib/fog/aws/requests/{s3 → storage}/put_bucket_versioning.rb +1 -1
  142. data/lib/fog/aws/requests/{s3 → storage}/put_object.rb +1 -1
  143. data/lib/fog/aws/requests/{s3 → storage}/put_object_url.rb +1 -1
  144. data/lib/fog/aws/requests/{s3 → storage}/put_request_payment.rb +1 -1
  145. data/lib/fog/aws/s3.rb +8 -205
  146. data/lib/fog/aws/simpledb.rb +10 -13
  147. data/lib/fog/aws/storage.rb +209 -0
  148. data/lib/fog/bin.rb +59 -50
  149. data/lib/fog/bluebox.rb +9 -78
  150. data/lib/fog/bluebox/bin.rb +10 -28
  151. data/lib/fog/bluebox/compute.rb +87 -0
  152. data/lib/fog/bluebox/models/compute/flavor.rb +45 -0
  153. data/lib/fog/bluebox/models/compute/flavors.rb +28 -0
  154. data/lib/fog/bluebox/models/compute/image.rb +19 -0
  155. data/lib/fog/bluebox/models/compute/images.rb +28 -0
  156. data/lib/fog/bluebox/models/compute/server.rb +81 -0
  157. data/lib/fog/bluebox/models/compute/servers.rb +29 -0
  158. data/lib/fog/bluebox/requests/compute/create_block.rb +41 -0
  159. data/lib/fog/bluebox/requests/compute/destroy_block.rb +34 -0
  160. data/lib/fog/bluebox/requests/compute/get_block.rb +34 -0
  161. data/lib/fog/bluebox/requests/compute/get_blocks.rb +36 -0
  162. data/lib/fog/bluebox/requests/compute/get_product.rb +34 -0
  163. data/lib/fog/bluebox/requests/compute/get_products.rb +33 -0
  164. data/lib/fog/bluebox/requests/compute/get_template.rb +34 -0
  165. data/lib/fog/bluebox/requests/compute/get_templates.rb +34 -0
  166. data/lib/fog/bluebox/requests/compute/reboot_block.rb +35 -0
  167. data/lib/fog/go_grid.rb +9 -88
  168. data/lib/fog/go_grid/bin.rb +17 -22
  169. data/lib/fog/go_grid/compute.rb +96 -0
  170. data/lib/fog/go_grid/requests/compute/common_lookup_list.rb +36 -0
  171. data/lib/fog/go_grid/requests/compute/grid_image_list.rb +39 -0
  172. data/lib/fog/go_grid/requests/compute/grid_ip_list.rb +38 -0
  173. data/lib/fog/go_grid/requests/compute/grid_loadbalancer_list.rb +36 -0
  174. data/lib/fog/go_grid/requests/compute/grid_server_add.rb +44 -0
  175. data/lib/fog/go_grid/requests/compute/grid_server_delete.rb +33 -0
  176. data/lib/fog/go_grid/requests/compute/grid_server_get.rb +33 -0
  177. data/lib/fog/go_grid/requests/compute/grid_server_list.rb +38 -0
  178. data/lib/fog/go_grid/requests/compute/grid_server_power.rb +34 -0
  179. data/lib/fog/linode.rb +10 -71
  180. data/lib/fog/linode/bin.rb +17 -22
  181. data/lib/fog/linode/compute.rb +79 -0
  182. data/lib/fog/linode/requests/compute/avail_datacenters.rb +31 -0
  183. data/lib/fog/linode/requests/compute/avail_distributions.rb +38 -0
  184. data/lib/fog/linode/requests/compute/avail_kernels.rb +36 -0
  185. data/lib/fog/linode/requests/compute/avail_linodeplans.rb +35 -0
  186. data/lib/fog/linode/requests/compute/avail_stackscripts.rb +37 -0
  187. data/lib/fog/linode/requests/compute/linode_create.rb +41 -0
  188. data/lib/fog/linode/requests/compute/linode_delete.rb +36 -0
  189. data/lib/fog/linode/requests/compute/linode_list.rb +38 -0
  190. data/lib/fog/linode/requests/compute/linode_reboot.rb +36 -0
  191. data/lib/fog/local.rb +10 -51
  192. data/lib/fog/local/bin.rb +17 -26
  193. data/lib/fog/local/models/storage/directories.rb +33 -0
  194. data/lib/fog/local/models/storage/directory.rb +52 -0
  195. data/lib/fog/local/models/storage/file.rb +60 -0
  196. data/lib/fog/local/models/storage/files.rb +73 -0
  197. data/lib/fog/local/storage.rb +58 -0
  198. data/lib/fog/model.rb +1 -1
  199. data/lib/fog/new_servers.rb +9 -80
  200. data/lib/fog/new_servers/bin.rb +17 -22
  201. data/lib/fog/new_servers/compute.rb +88 -0
  202. data/lib/fog/new_servers/requests/compute/add_server.rb +41 -0
  203. data/lib/fog/new_servers/requests/compute/cancel_server.rb +38 -0
  204. data/lib/fog/new_servers/requests/compute/get_server.rb +44 -0
  205. data/lib/fog/new_servers/requests/compute/list_images.rb +35 -0
  206. data/lib/fog/new_servers/requests/compute/list_plans.rb +38 -0
  207. data/lib/fog/new_servers/requests/compute/list_servers.rb +44 -0
  208. data/lib/fog/new_servers/requests/compute/reboot_server.rb +32 -0
  209. data/lib/fog/provider.rb +18 -0
  210. data/lib/fog/rackspace.rb +8 -3
  211. data/lib/fog/rackspace/bin.rb +26 -41
  212. data/lib/fog/rackspace/compute.rb +107 -0
  213. data/lib/fog/rackspace/files.rb +9 -130
  214. data/lib/fog/rackspace/models/{servers → compute}/flavor.rb +1 -1
  215. data/lib/fog/rackspace/models/{servers → compute}/flavors.rb +4 -10
  216. data/lib/fog/rackspace/models/{servers → compute}/image.rb +4 -4
  217. data/lib/fog/rackspace/models/{servers → compute}/images.rb +4 -12
  218. data/lib/fog/rackspace/models/{servers → compute}/server.rb +20 -16
  219. data/lib/fog/rackspace/models/{servers → compute}/servers.rb +5 -11
  220. data/lib/fog/rackspace/models/{files → storage}/directories.rb +4 -10
  221. data/lib/fog/rackspace/models/{files → storage}/directory.rb +4 -4
  222. data/lib/fog/rackspace/models/{files → storage}/file.rb +6 -6
  223. data/lib/fog/rackspace/models/{files → storage}/files.rb +11 -15
  224. data/lib/fog/rackspace/requests/{servers → compute}/create_image.rb +1 -1
  225. data/lib/fog/rackspace/requests/{servers → compute}/create_server.rb +1 -1
  226. data/lib/fog/rackspace/requests/{servers → compute}/delete_image.rb +1 -1
  227. data/lib/fog/rackspace/requests/{servers → compute}/delete_server.rb +2 -2
  228. data/lib/fog/rackspace/requests/{servers → compute}/get_flavor_details.rb +1 -1
  229. data/lib/fog/rackspace/requests/{servers → compute}/get_image_details.rb +1 -1
  230. data/lib/fog/rackspace/requests/{servers → compute}/get_server_details.rb +2 -2
  231. data/lib/fog/rackspace/requests/{servers → compute}/list_addresses.rb +2 -2
  232. data/lib/fog/rackspace/requests/{servers → compute}/list_flavors.rb +1 -1
  233. data/lib/fog/rackspace/requests/{servers → compute}/list_flavors_detail.rb +1 -1
  234. data/lib/fog/rackspace/requests/{servers → compute}/list_images.rb +1 -1
  235. data/lib/fog/rackspace/requests/{servers → compute}/list_images_detail.rb +1 -1
  236. data/lib/fog/rackspace/requests/{servers → compute}/list_private_addresses.rb +2 -2
  237. data/lib/fog/rackspace/requests/{servers → compute}/list_public_addresses.rb +2 -2
  238. data/lib/fog/rackspace/requests/{servers → compute}/list_servers.rb +1 -1
  239. data/lib/fog/rackspace/requests/{servers → compute}/list_servers_detail.rb +1 -1
  240. data/lib/fog/rackspace/requests/{servers → compute}/reboot_server.rb +1 -1
  241. data/lib/fog/rackspace/requests/{servers → compute}/update_server.rb +2 -2
  242. data/lib/fog/rackspace/requests/{files → storage}/delete_container.rb +1 -1
  243. data/lib/fog/rackspace/requests/{files → storage}/delete_object.rb +1 -1
  244. data/lib/fog/rackspace/requests/{files → storage}/get_container.rb +1 -1
  245. data/lib/fog/rackspace/requests/{files → storage}/get_containers.rb +1 -1
  246. data/lib/fog/rackspace/requests/{files → storage}/get_object.rb +1 -1
  247. data/lib/fog/rackspace/requests/{files → storage}/head_container.rb +1 -1
  248. data/lib/fog/rackspace/requests/{files → storage}/head_containers.rb +1 -1
  249. data/lib/fog/rackspace/requests/{files → storage}/head_object.rb +1 -1
  250. data/lib/fog/rackspace/requests/{files → storage}/put_container.rb +1 -1
  251. data/lib/fog/rackspace/requests/{files → storage}/put_object.rb +1 -1
  252. data/lib/fog/rackspace/servers.rb +9 -104
  253. data/lib/fog/rackspace/storage.rb +151 -0
  254. data/lib/fog/service.rb +111 -59
  255. data/lib/fog/slicehost.rb +9 -83
  256. data/lib/fog/slicehost/bin.rb +17 -34
  257. data/lib/fog/slicehost/compute.rb +91 -0
  258. data/lib/fog/slicehost/models/compute/flavor.rb +45 -0
  259. data/lib/fog/slicehost/models/compute/flavors.rb +28 -0
  260. data/lib/fog/slicehost/models/compute/image.rb +17 -0
  261. data/lib/fog/slicehost/models/compute/images.rb +27 -0
  262. data/lib/fog/slicehost/models/compute/server.rb +64 -0
  263. data/lib/fog/slicehost/models/compute/servers.rb +31 -0
  264. data/lib/fog/slicehost/parsers/compute/create_slice.rb +31 -0
  265. data/lib/fog/slicehost/parsers/compute/get_backups.rb +32 -0
  266. data/lib/fog/slicehost/parsers/compute/get_flavor.rb +26 -0
  267. data/lib/fog/slicehost/parsers/compute/get_flavors.rb +30 -0
  268. data/lib/fog/slicehost/parsers/compute/get_image.rb +26 -0
  269. data/lib/fog/slicehost/parsers/compute/get_images.rb +30 -0
  270. data/lib/fog/slicehost/parsers/compute/get_slice.rb +31 -0
  271. data/lib/fog/slicehost/parsers/compute/get_slices.rb +35 -0
  272. data/lib/fog/slicehost/requests/compute/create_slice.rb +49 -0
  273. data/lib/fog/slicehost/requests/compute/delete_slice.rb +45 -0
  274. data/lib/fog/slicehost/requests/compute/get_backups.rb +37 -0
  275. data/lib/fog/slicehost/requests/compute/get_flavor.rb +40 -0
  276. data/lib/fog/slicehost/requests/compute/get_flavors.rb +37 -0
  277. data/lib/fog/slicehost/requests/compute/get_image.rb +38 -0
  278. data/lib/fog/slicehost/requests/compute/get_images.rb +35 -0
  279. data/lib/fog/slicehost/requests/compute/get_slice.rb +46 -0
  280. data/lib/fog/slicehost/requests/compute/get_slices.rb +43 -0
  281. data/lib/fog/slicehost/requests/compute/reboot_slice.rb +44 -0
  282. data/lib/fog/ssh.rb +16 -7
  283. data/lib/fog/terremark/bin.rb +25 -33
  284. data/lib/fog/terremark/models/shared/address.rb +1 -1
  285. data/lib/fog/terremark/models/shared/task.rb +6 -6
  286. data/lib/fog/vcloud.rb +60 -36
  287. data/lib/fog/vcloud/bin.rb +2 -2
  288. data/lib/fog/vcloud/collection.rb +1 -1
  289. data/lib/fog/vcloud/generators.rb +1 -1
  290. data/lib/fog/vcloud/model.rb +1 -1
  291. data/lib/fog/vcloud/models/vdc.rb +1 -1
  292. data/lib/fog/vcloud/models/vdcs.rb +3 -9
  293. data/lib/fog/vcloud/requests/get_network.rb +1 -1
  294. data/lib/fog/vcloud/requests/get_organization.rb +1 -1
  295. data/lib/fog/vcloud/requests/get_vdc.rb +1 -1
  296. data/lib/fog/vcloud/requests/get_versions.rb +1 -1
  297. data/lib/fog/vcloud/requests/login.rb +1 -1
  298. data/lib/fog/vcloud/terremark/ecloud.rb +19 -14
  299. data/lib/fog/vcloud/terremark/ecloud/models/catalog.rb +2 -2
  300. data/lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb +3 -3
  301. data/lib/fog/vcloud/terremark/ecloud/models/firewall_acl.rb +3 -3
  302. data/lib/fog/vcloud/terremark/ecloud/models/firewall_acls.rb +4 -2
  303. data/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb +4 -4
  304. data/lib/fog/vcloud/terremark/ecloud/models/internet_services.rb +4 -8
  305. data/lib/fog/vcloud/terremark/ecloud/models/ip.rb +4 -4
  306. data/lib/fog/vcloud/terremark/ecloud/models/ips.rb +4 -2
  307. data/lib/fog/vcloud/terremark/ecloud/models/network.rb +2 -2
  308. data/lib/fog/vcloud/terremark/ecloud/models/networks.rb +4 -8
  309. data/lib/fog/vcloud/terremark/ecloud/models/node.rb +3 -3
  310. data/lib/fog/vcloud/terremark/ecloud/models/nodes.rb +4 -2
  311. data/lib/fog/vcloud/terremark/ecloud/models/public_ip.rb +3 -3
  312. data/lib/fog/vcloud/terremark/ecloud/models/public_ips.rb +4 -14
  313. data/lib/fog/vcloud/terremark/ecloud/models/server.rb +4 -4
  314. data/lib/fog/vcloud/terremark/ecloud/models/servers.rb +4 -2
  315. data/lib/fog/vcloud/terremark/ecloud/models/task.rb +3 -3
  316. data/lib/fog/vcloud/terremark/ecloud/models/tasks.rb +4 -2
  317. data/lib/fog/vcloud/terremark/ecloud/models/vdc.rb +2 -2
  318. data/lib/fog/vcloud/terremark/ecloud/models/vdcs.rb +25 -15
  319. data/lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb +4 -4
  320. data/lib/fog/vcloud/terremark/ecloud/requests/add_node.rb +4 -4
  321. data/lib/fog/vcloud/terremark/ecloud/requests/clone_vapp.rb +4 -4
  322. data/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb +4 -4
  323. data/lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb +4 -4
  324. data/lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb +4 -4
  325. data/lib/fog/vcloud/terremark/ecloud/requests/configure_node.rb +4 -4
  326. data/lib/fog/vcloud/terremark/ecloud/requests/configure_vapp.rb +4 -4
  327. data/lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb +4 -4
  328. data/lib/fog/vcloud/terremark/ecloud/requests/delete_node.rb +4 -4
  329. data/lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb +4 -4
  330. data/lib/fog/vcloud/terremark/ecloud/requests/get_catalog.rb +4 -4
  331. data/lib/fog/vcloud/terremark/ecloud/requests/get_catalog_item.rb +4 -4
  332. data/lib/fog/vcloud/terremark/ecloud/requests/get_customization_options.rb +4 -4
  333. data/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acl.rb +4 -4
  334. data/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acls.rb +4 -4
  335. data/lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb +4 -4
  336. data/lib/fog/vcloud/terremark/ecloud/requests/get_network.rb +4 -4
  337. data/lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb +4 -4
  338. data/lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb +4 -4
  339. data/lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb +4 -4
  340. data/lib/fog/vcloud/terremark/ecloud/requests/get_node.rb +4 -4
  341. data/lib/fog/vcloud/terremark/ecloud/requests/get_nodes.rb +4 -4
  342. data/lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb +4 -4
  343. data/lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb +4 -4
  344. data/lib/fog/vcloud/terremark/ecloud/requests/get_task.rb +4 -4
  345. data/lib/fog/vcloud/terremark/ecloud/requests/get_task_list.rb +4 -4
  346. data/lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb +4 -4
  347. data/lib/fog/vcloud/terremark/ecloud/requests/get_vapp_template.rb +4 -4
  348. data/lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb +4 -4
  349. data/lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb +4 -4
  350. data/lib/fog/vcloud/terremark/ecloud/requests/power_off.rb +4 -4
  351. data/lib/fog/vcloud/terremark/ecloud/requests/power_on.rb +4 -4
  352. data/lib/fog/vcloud/terremark/ecloud/requests/power_reset.rb +4 -4
  353. data/lib/fog/vcloud/terremark/ecloud/requests/power_shutdown.rb +4 -4
  354. data/lib/fog/vcloud/terremark/vcloud.rb +9 -5
  355. data/lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb +4 -4
  356. data/spec/aws/models/{ec2 → compute}/address_spec.rb +12 -12
  357. data/spec/aws/models/compute/addresses_spec.rb +70 -0
  358. data/spec/aws/models/{ec2 → compute}/flavors_spec.rb +2 -2
  359. data/spec/aws/models/{ec2 → compute}/key_pair_spec.rb +12 -12
  360. data/spec/aws/models/compute/key_pairs_spec.rb +71 -0
  361. data/spec/aws/models/{ec2 → compute}/security_group_spec.rb +12 -12
  362. data/spec/aws/models/compute/security_groups_spec.rb +71 -0
  363. data/spec/aws/models/{ec2 → compute}/server_spec.rb +9 -9
  364. data/spec/aws/models/{ec2 → compute}/servers_spec.rb +2 -2
  365. data/spec/aws/models/{ec2 → compute}/snapshot_spec.rb +7 -7
  366. data/spec/aws/models/{ec2 → compute}/snapshots_spec.rb +12 -12
  367. data/spec/aws/models/{ec2 → compute}/volume_spec.rb +16 -16
  368. data/spec/aws/models/compute/volumes_spec.rb +71 -0
  369. data/spec/aws/models/storage/directories_spec.rb +49 -0
  370. data/spec/aws/models/{s3 → storage}/directory_spec.rb +13 -13
  371. data/spec/aws/models/{s3 → storage}/file_spec.rb +6 -6
  372. data/spec/aws/models/{s3 → storage}/files_spec.rb +6 -6
  373. data/spec/aws/requests/{ec2 → compute}/describe_images_spec.rb +4 -4
  374. data/spec/aws/requests/s3/copy_object_spec.rb +12 -12
  375. data/spec/aws/requests/s3/delete_bucket_spec.rb +9 -9
  376. data/spec/aws/requests/s3/delete_object_spec.rb +9 -9
  377. data/spec/aws/requests/s3/get_bucket_location_spec.rb +5 -5
  378. data/spec/aws/requests/s3/get_bucket_spec.rb +13 -13
  379. data/spec/aws/requests/s3/get_object_spec.rb +10 -10
  380. data/spec/aws/requests/s3/get_request_payment_spec.rb +5 -5
  381. data/spec/aws/requests/s3/get_service_spec.rb +6 -6
  382. data/spec/aws/requests/s3/head_object_spec.rb +6 -6
  383. data/spec/aws/requests/s3/put_bucket_spec.rb +4 -4
  384. data/spec/aws/requests/s3/put_object_spec.rb +12 -12
  385. data/spec/aws/requests/s3/put_request_payment_spec.rb +5 -5
  386. data/spec/{rackspace/models/servers → bluebox/models/compute}/flavors_spec.rb +3 -3
  387. data/spec/bluebox/models/{server_spec.rb → compute/server_spec.rb} +4 -4
  388. data/spec/bluebox/models/{servers_spec.rb → compute/servers_spec.rb} +4 -4
  389. data/spec/rackspace/models/compute/flavors_spec.rb +14 -0
  390. data/spec/rackspace/models/{servers → compute}/server_spec.rb +4 -4
  391. data/spec/rackspace/models/compute/servers_spec.rb +22 -0
  392. data/spec/rackspace/requests/{files → storage}/delete_container_spec.rb +5 -5
  393. data/spec/rackspace/requests/storage/delete_object_spec.rb +37 -0
  394. data/spec/rackspace/requests/{files → storage}/get_container_spec.rb +9 -9
  395. data/spec/rackspace/requests/{files → storage}/get_containers_spec.rb +4 -4
  396. data/spec/rackspace/requests/storage/get_object_spec.rb +21 -0
  397. data/spec/rackspace/requests/storage/head_container_spec.rb +30 -0
  398. data/spec/rackspace/requests/storage/head_containers_spec.rb +19 -0
  399. data/spec/rackspace/requests/storage/head_object_spec.rb +21 -0
  400. data/spec/rackspace/requests/{files → storage}/put_container_spec.rb +3 -3
  401. data/spec/rackspace/requests/storage/put_object_spec.rb +20 -0
  402. data/spec/slicehost/models/compute/flavors_spec.rb +14 -0
  403. data/spec/slicehost/models/{server_spec.rb → compute/server_spec.rb} +8 -8
  404. data/spec/{rackspace/models/servers → slicehost/models/compute}/servers_spec.rb +4 -4
  405. data/spec/spec_helper.rb +14 -14
  406. data/spec/vcloud/models/vdc_spec.rb +1 -1
  407. data/spec/vcloud/spec_helper.rb +7 -7
  408. data/spec/vcloud/terremark/ecloud/models/internet_service_spec.rb +1 -1
  409. data/tests/aws/helper.rb +8 -8
  410. data/tests/aws/models/storage/directory_tests.rb +8 -0
  411. data/tests/aws/requests/compute/address_tests.rb +80 -0
  412. data/tests/aws/requests/{ec2 → compute}/availability_zone_tests.rb +5 -5
  413. data/tests/aws/requests/{ec2 → compute}/instance_tests.rb +17 -17
  414. data/tests/aws/requests/{ec2 → compute}/key_pair_tests.rb +12 -12
  415. data/tests/aws/requests/{ec2 → compute}/region_tests.rb +5 -5
  416. data/tests/aws/requests/{ec2 → compute}/security_group_tests.rb +31 -31
  417. data/tests/aws/requests/{ec2 → compute}/snapshot_tests.rb +12 -12
  418. data/tests/aws/requests/{ec2 → compute}/volume_tests.rb +23 -23
  419. data/tests/bluebox/helper.rb +13 -9
  420. data/tests/bluebox/requests/{block_tests.rb → compute/block_tests.rb} +16 -17
  421. data/tests/bluebox/requests/compute/product_tests.rb +25 -0
  422. data/tests/bluebox/requests/{template_tests.rb → compute/template_tests.rb} +5 -5
  423. data/tests/linode/helper.rb +12 -8
  424. data/tests/linode/requests/{datacenter_tests.rb → compute/datacenter_tests.rb} +3 -3
  425. data/tests/linode/requests/{distribution_tests.rb → compute/distribution_tests.rb} +4 -4
  426. data/tests/linode/requests/{linode_tests.rb → compute/linode_tests.rb} +13 -13
  427. data/tests/linode/requests/{linodeplans_tests.rb → compute/linodeplans_tests.rb} +4 -4
  428. data/tests/rackspace/helper.rb +5 -13
  429. data/tests/rackspace/requests/compute/address_tests.rb +40 -0
  430. data/tests/rackspace/requests/compute/flavor_tests.rb +34 -0
  431. data/tests/rackspace/requests/compute/image_tests.rb +62 -0
  432. data/tests/rackspace/requests/{servers → compute}/server_tests.rb +20 -20
  433. data/tests/slicehost/helper.rb +3 -3
  434. data/tests/slicehost/requests/{backup_tests.rb → compute/backup_tests.rb} +2 -2
  435. data/tests/slicehost/requests/{flavor_tests.rb → compute/flavor_tests.rb} +4 -4
  436. data/tests/slicehost/requests/{image_tests.rb → compute/image_tests.rb} +4 -4
  437. data/tests/slicehost/requests/{slice_tests.rb → compute/slice_tests.rb} +12 -12
  438. metadata +304 -290
  439. data/lib/fog/aws/models/ec2/flavors.rb +0 -43
  440. data/lib/fog/aws/models/ec2/image.rb +0 -44
  441. data/lib/fog/aws/models/ec2/key_pair.rb +0 -34
  442. data/lib/fog/aws/models/ec2/servers.rb +0 -49
  443. data/lib/fog/bluebox/models/flavor.rb +0 -43
  444. data/lib/fog/bluebox/models/flavors.rb +0 -32
  445. data/lib/fog/bluebox/models/image.rb +0 -17
  446. data/lib/fog/bluebox/models/images.rb +0 -34
  447. data/lib/fog/bluebox/models/server.rb +0 -79
  448. data/lib/fog/bluebox/models/servers.rb +0 -33
  449. data/lib/fog/bluebox/requests/create_block.rb +0 -39
  450. data/lib/fog/bluebox/requests/destroy_block.rb +0 -32
  451. data/lib/fog/bluebox/requests/get_block.rb +0 -32
  452. data/lib/fog/bluebox/requests/get_blocks.rb +0 -34
  453. data/lib/fog/bluebox/requests/get_product.rb +0 -32
  454. data/lib/fog/bluebox/requests/get_products.rb +0 -31
  455. data/lib/fog/bluebox/requests/get_template.rb +0 -32
  456. data/lib/fog/bluebox/requests/get_templates.rb +0 -32
  457. data/lib/fog/bluebox/requests/reboot_block.rb +0 -33
  458. data/lib/fog/go_grid/requests/common_lookup_list.rb +0 -34
  459. data/lib/fog/go_grid/requests/grid_image_list.rb +0 -37
  460. data/lib/fog/go_grid/requests/grid_ip_list.rb +0 -36
  461. data/lib/fog/go_grid/requests/grid_loadbalancer_list.rb +0 -34
  462. data/lib/fog/go_grid/requests/grid_server_add.rb +0 -42
  463. data/lib/fog/go_grid/requests/grid_server_delete.rb +0 -31
  464. data/lib/fog/go_grid/requests/grid_server_get.rb +0 -31
  465. data/lib/fog/go_grid/requests/grid_server_list.rb +0 -36
  466. data/lib/fog/go_grid/requests/grid_server_power.rb +0 -32
  467. data/lib/fog/linode/requests/avail_datacenters.rb +0 -29
  468. data/lib/fog/linode/requests/avail_distributions.rb +0 -36
  469. data/lib/fog/linode/requests/avail_kernels.rb +0 -34
  470. data/lib/fog/linode/requests/avail_linodeplans.rb +0 -33
  471. data/lib/fog/linode/requests/avail_stackscripts.rb +0 -35
  472. data/lib/fog/linode/requests/linode_create.rb +0 -39
  473. data/lib/fog/linode/requests/linode_delete.rb +0 -34
  474. data/lib/fog/linode/requests/linode_list.rb +0 -36
  475. data/lib/fog/linode/requests/linode_reboot.rb +0 -34
  476. data/lib/fog/local/models/directories.rb +0 -37
  477. data/lib/fog/local/models/directory.rb +0 -50
  478. data/lib/fog/local/models/file.rb +0 -58
  479. data/lib/fog/local/models/files.rb +0 -74
  480. data/lib/fog/new_servers/requests/add_server.rb +0 -39
  481. data/lib/fog/new_servers/requests/cancel_server.rb +0 -36
  482. data/lib/fog/new_servers/requests/get_server.rb +0 -42
  483. data/lib/fog/new_servers/requests/list_images.rb +0 -33
  484. data/lib/fog/new_servers/requests/list_plans.rb +0 -36
  485. data/lib/fog/new_servers/requests/list_servers.rb +0 -43
  486. data/lib/fog/new_servers/requests/reboot_server.rb +0 -30
  487. data/lib/fog/slicehost/models/flavor.rb +0 -43
  488. data/lib/fog/slicehost/models/flavors.rb +0 -31
  489. data/lib/fog/slicehost/models/image.rb +0 -15
  490. data/lib/fog/slicehost/models/images.rb +0 -33
  491. data/lib/fog/slicehost/models/server.rb +0 -62
  492. data/lib/fog/slicehost/models/servers.rb +0 -35
  493. data/lib/fog/slicehost/parsers/create_slice.rb +0 -29
  494. data/lib/fog/slicehost/parsers/get_backups.rb +0 -30
  495. data/lib/fog/slicehost/parsers/get_flavor.rb +0 -24
  496. data/lib/fog/slicehost/parsers/get_flavors.rb +0 -28
  497. data/lib/fog/slicehost/parsers/get_image.rb +0 -24
  498. data/lib/fog/slicehost/parsers/get_images.rb +0 -28
  499. data/lib/fog/slicehost/parsers/get_slice.rb +0 -29
  500. data/lib/fog/slicehost/parsers/get_slices.rb +0 -33
  501. data/lib/fog/slicehost/requests/create_slice.rb +0 -47
  502. data/lib/fog/slicehost/requests/delete_slice.rb +0 -43
  503. data/lib/fog/slicehost/requests/get_backups.rb +0 -35
  504. data/lib/fog/slicehost/requests/get_flavor.rb +0 -38
  505. data/lib/fog/slicehost/requests/get_flavors.rb +0 -35
  506. data/lib/fog/slicehost/requests/get_image.rb +0 -36
  507. data/lib/fog/slicehost/requests/get_images.rb +0 -33
  508. data/lib/fog/slicehost/requests/get_slice.rb +0 -44
  509. data/lib/fog/slicehost/requests/get_slices.rb +0 -41
  510. data/lib/fog/slicehost/requests/reboot_slice.rb +0 -42
  511. data/lib/fog/vcloud/extension.rb +0 -37
  512. data/spec/aws/models/ec2/addresses_spec.rb +0 -70
  513. data/spec/aws/models/ec2/key_pairs_spec.rb +0 -71
  514. data/spec/aws/models/ec2/security_groups_spec.rb +0 -71
  515. data/spec/aws/models/ec2/volumes_spec.rb +0 -71
  516. data/spec/aws/models/s3/directories_spec.rb +0 -49
  517. data/spec/bluebox/models/flavors_spec.rb +0 -14
  518. data/spec/rackspace/requests/files/delete_object_spec.rb +0 -37
  519. data/spec/rackspace/requests/files/get_object_spec.rb +0 -21
  520. data/spec/rackspace/requests/files/head_container_spec.rb +0 -30
  521. data/spec/rackspace/requests/files/head_containers_spec.rb +0 -19
  522. data/spec/rackspace/requests/files/head_object_spec.rb +0 -21
  523. data/spec/rackspace/requests/files/put_object_spec.rb +0 -20
  524. data/spec/slicehost/models/flavors_spec.rb +0 -14
  525. data/spec/slicehost/models/servers_spec.rb +0 -22
  526. data/tests/aws/models/s3/directory_tests.rb +0 -8
  527. data/tests/aws/requests/ec2/address_tests.rb +0 -80
  528. data/tests/bluebox/requests/product_tests.rb +0 -25
  529. data/tests/rackspace/requests/servers/address_tests.rb +0 -40
  530. data/tests/rackspace/requests/servers/flavor_tests.rb +0 -34
  531. data/tests/rackspace/requests/servers/image_tests.rb +0 -59
@@ -1,7 +1,9 @@
1
+ require 'lib/fog/vcloud/terremark/ecloud/models/task'
2
+
1
3
  module Fog
2
- module Vcloud
4
+ class Vcloud
3
5
  module Terremark
4
- module Ecloud
6
+ class Ecloud
5
7
 
6
8
  class Tasks < Fog::Vcloud::Collection
7
9
 
@@ -1,7 +1,7 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
  class Vdc < Fog::Vcloud::Model
6
6
 
7
7
  identity :href
@@ -1,27 +1,37 @@
1
+ require 'lib/fog/vcloud/terremark/ecloud/models/vdc'
2
+
1
3
  module Fog
2
- module Vcloud
4
+ class Vcloud
3
5
  module Terremark
4
- module Ecloud
6
+ class Ecloud
7
+
8
+ class Vdcs < Collection
5
9
 
6
- module Real
7
- def vdcs(options = {})
8
- @vdcs ||= Fog::Vcloud::Terremark::Ecloud::Vdcs.new(options.merge(:connection => self))
10
+ model Fog::Vcloud::Terremark::Ecloud::Vdc
11
+
12
+ def all
13
+ data = connection.get_organization(organization_uri).body[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
14
+ data.each { |link| link.delete_if { |key, value| [:rel].include?(key) } }
15
+ load(data)
9
16
  end
10
- end
11
17
 
12
- #FIXME: Should be no need to do this ... duplicte code ... find a better way
13
- module Mock
14
- def vdcs(options = {})
15
- @vdcs ||= Fog::Vcloud::Terremark::Ecloud::Vdcs.new(options.merge(:connection => self))
18
+ def get(uri)
19
+ if data = connection.get_vdc(uri)
20
+ new(data.body)
21
+ end
22
+ rescue Fog::Errors::NotFound
23
+ nil
16
24
  end
17
- end
18
- #/FIXME
19
25
 
20
- class Vdcs < Fog::Vcloud::Vdcs
26
+ def organization_uri
27
+ @organizatio_uri ||= connection.default_organization_uri
28
+ end
21
29
 
22
- undef_method :create
30
+ private
23
31
 
24
- model Fog::Vcloud::Terremark::Ecloud::Vdc
32
+ def organization_uri=(new_organization_uri)
33
+ @organization_uri = new_organization_uri
34
+ end
25
35
 
26
36
  end
27
37
  end
@@ -1,8 +1,8 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
5
- module Real
4
+ class Ecloud
5
+ class Real
6
6
 
7
7
  def generate_internet_service_request(service_data)
8
8
  builder = Builder::XmlMarkup.new
@@ -107,7 +107,7 @@ module Fog
107
107
 
108
108
  end
109
109
 
110
- module Mock
110
+ class Mock
111
111
  #
112
112
  # Based on
113
113
  # http://support.theenterprisecloud.com/kb/default.asp?id=561&Lang=1&SID=
@@ -1,8 +1,8 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
5
- module Real
4
+ class Ecloud
5
+ class Real
6
6
 
7
7
  def add_node(nodes_uri, node_data)
8
8
  validate_node_data(node_data)
@@ -43,7 +43,7 @@ module Fog
43
43
  end
44
44
  end
45
45
 
46
- module Mock
46
+ class Mock
47
47
 
48
48
  def add_node(nodes_uri, node_data)
49
49
  validate_node_data(node_data)
@@ -1,9 +1,9 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
 
8
8
  def validate_clone_vapp_options(options)
9
9
  valid_opts = [:name, :poweron]
@@ -38,7 +38,7 @@ module Fog
38
38
  end
39
39
  end
40
40
 
41
- module Mock
41
+ class Mock
42
42
  def clone_vapp(vdc_uri, vapp_uri, customization_data)
43
43
  validate_customization_data(customization_data)
44
44
  Fog::Mock.not_implemented
@@ -1,8 +1,8 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
5
- module Real
4
+ class Ecloud
5
+ class Real
6
6
 
7
7
  def generate_internet_service_response(service_data,ip_address_data)
8
8
  builder = Builder::XmlMarkup.new
@@ -57,7 +57,7 @@ module Fog
57
57
 
58
58
  end
59
59
 
60
- module Mock
60
+ class Mock
61
61
  #
62
62
  # Based on
63
63
  # http://support.theenterprisecloud.com/kb/default.asp?id=583&Lang=1&SID=
@@ -1,8 +1,8 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
5
- module Real
4
+ class Ecloud
5
+ class Real
6
6
 
7
7
  def validate_network_data(network_data, configure=false)
8
8
  valid_opts = [:id, :href, :name, :rnat, :address, :broadcast, :gateway]
@@ -42,7 +42,7 @@ module Fog
42
42
 
43
43
  end
44
44
 
45
- module Mock
45
+ class Mock
46
46
 
47
47
  def configure_network(network_uri, network_data)
48
48
  Fog::Mock.not_implemented
@@ -1,8 +1,8 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
5
- module Real
4
+ class Ecloud
5
+ class Real
6
6
 
7
7
  def validate_network_ip_data(network_ip_data, configure=false)
8
8
  valid_opts = [:id, :href, :name, :status, :server, :rnat]
@@ -41,7 +41,7 @@ module Fog
41
41
 
42
42
  end
43
43
 
44
- module Mock
44
+ class Mock
45
45
 
46
46
  def configure_network_ip(network_ip_uri, network_ip_data)
47
47
  Fog::Mock.not_implemented
@@ -1,8 +1,8 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
5
- module Real
4
+ class Ecloud
5
+ class Real
6
6
 
7
7
  def configure_node(node_uri, node_data)
8
8
  validate_node_data(node_data, true)
@@ -31,7 +31,7 @@ module Fog
31
31
 
32
32
  end
33
33
 
34
- module Mock
34
+ class Mock
35
35
 
36
36
  def configure_node(node_uri, node_data)
37
37
  node_uri = ensure_unparsed(node_uri)
@@ -1,8 +1,8 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
5
- module Real
4
+ class Ecloud
5
+ class Real
6
6
 
7
7
  def generate_configure_vapp_request(vapp_uri, vapp_data)
8
8
  rasd_xmlns = { "xmlns" => "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" }
@@ -104,7 +104,7 @@ module Fog
104
104
 
105
105
  end
106
106
 
107
- module Mock
107
+ class Mock
108
108
  def configure_vapp(vapp_uri, vapp_data)
109
109
  Fog::Mock.not_implemented
110
110
  end
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  basic_request :delete_internet_service, 200, 'DELETE', {}, ""
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
 
12
12
  def delete_internet_service(service_uri)
13
13
 
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  basic_request :delete_node, 200, 'DELETE', {}, ""
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
 
12
12
  def delete_node(node_uri)
13
13
  node_uri = ensure_unparsed(node_uri)
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  basic_request :delete_vapp, 202, "DELETE"
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
  def delete_vapp(vapp_uri)
12
12
  Fog::Mock.not_implemented
13
13
  end
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  basic_request :get_catalog
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
  def get_catalog(catalog_uri)
12
12
  Fog::Mock.not_implemented
13
13
  end
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  basic_request :get_catalog_item
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
  def get_catalog(catalog_uri)
12
12
  Fog::Mock.not_implemented
13
13
  end
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  basic_request :get_customization_options
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
  def get_customization_options( options_uri )
12
12
  Fog::Mock.not_implemented
13
13
  end
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  basic_request :get_firewall_acl
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
  def get_firewall_acl(firewall_acl_uri)
12
12
  Fog::Mock.not_implemented
13
13
  end
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  basic_request :get_firewall_acls
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
  def get_firewall_acls(firewall_acls_uri)
12
12
  Fog::Mock.not_implemented
13
13
  end
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  basic_request :get_internet_services
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
 
12
12
  #
13
13
  #Based off of:
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  # Handled by the main Vcloud get_network
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
 
12
12
  def get_network(network_uri)
13
13
  #
@@ -1,13 +1,13 @@
1
1
  module Fog
2
- module Vcloud
2
+ class Vcloud
3
3
  module Terremark
4
- module Ecloud
4
+ class Ecloud
5
5
 
6
- module Real
6
+ class Real
7
7
  basic_request :get_network_extensions
8
8
  end
9
9
 
10
- module Mock
10
+ class Mock
11
11
 
12
12
  def get_network_extensions(network_uri)
13
13
  network_uri = ensure_unparsed(network_uri)