fog 1.19.0 → 1.20.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (533) hide show
  1. data/.gitignore +2 -0
  2. data/.travis.yml +10 -0
  3. data/CONTRIBUTORS.md +694 -0
  4. data/Gemfile.1.8.7 +1 -1
  5. data/LICENSE.md +17 -17
  6. data/Rakefile +1 -1
  7. data/benchs/each_provider.sh +6 -0
  8. data/benchs/each_service.sh +6 -0
  9. data/benchs/load_times.rb +6 -0
  10. data/changelog.txt +312 -0
  11. data/fog.gemspec +3 -5
  12. data/lib/fog.rb +1 -0
  13. data/lib/fog/atmos.rb +1 -11
  14. data/lib/fog/atmos/core.rb +11 -0
  15. data/lib/fog/atmos/requests/storage/get_namespace.rb +1 -1
  16. data/lib/fog/atmos/requests/storage/head_namespace.rb +1 -1
  17. data/lib/fog/atmos/storage.rb +1 -1
  18. data/lib/fog/aws.rb +22 -327
  19. data/lib/fog/aws/auto_scaling.rb +1 -1
  20. data/lib/fog/aws/beanstalk.rb +1 -1
  21. data/lib/fog/aws/cdn.rb +1 -1
  22. data/lib/fog/aws/cloud_formation.rb +1 -1
  23. data/lib/fog/aws/cloud_watch.rb +1 -1
  24. data/lib/fog/aws/compute.rb +12 -1
  25. data/lib/fog/aws/core.rb +329 -0
  26. data/lib/fog/aws/data_pipeline.rb +1 -1
  27. data/lib/fog/aws/dns.rb +1 -1
  28. data/lib/fog/aws/dynamodb.rb +1 -1
  29. data/lib/fog/aws/elasticache.rb +10 -3
  30. data/lib/fog/aws/elb.rb +1 -1
  31. data/lib/fog/aws/emr.rb +1 -2
  32. data/lib/fog/aws/glacier.rb +1 -1
  33. data/lib/fog/aws/iam.rb +1 -1
  34. data/lib/fog/aws/models/compute/dhcp_option.rb +2 -2
  35. data/lib/fog/aws/models/compute/flavor.rb +2 -0
  36. data/lib/fog/aws/models/compute/flavors.rb +363 -49
  37. data/lib/fog/aws/models/compute/network_acl.rb +170 -0
  38. data/lib/fog/aws/models/compute/network_acls.rb +138 -0
  39. data/lib/fog/aws/models/compute/server.rb +2 -2
  40. data/lib/fog/aws/models/compute/servers.rb +7 -2
  41. data/lib/fog/aws/models/compute/subnet.rb +2 -2
  42. data/lib/fog/aws/models/elasticache/cluster.rb +6 -0
  43. data/lib/fog/aws/models/elasticache/subnet_group.rb +35 -0
  44. data/lib/fog/aws/models/elasticache/subnet_groups.rb +27 -0
  45. data/lib/fog/aws/models/rds/snapshot.rb +1 -0
  46. data/lib/fog/aws/models/storage/file.rb +1 -1
  47. data/lib/fog/aws/parsers/compute/create_network_acl.rb +28 -0
  48. data/lib/fog/aws/parsers/compute/create_subnet.rb +2 -3
  49. data/lib/fog/aws/parsers/compute/describe_network_acls.rb +42 -0
  50. data/lib/fog/aws/parsers/compute/describe_reserved_instances.rb +29 -3
  51. data/lib/fog/aws/parsers/compute/network_acl_parser.rb +105 -0
  52. data/lib/fog/aws/parsers/compute/network_interface_parser.rb +16 -0
  53. data/lib/fog/aws/parsers/compute/replace_network_acl_association.rb +20 -0
  54. data/lib/fog/aws/parsers/compute/run_instances.rb +1 -1
  55. data/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb +2 -2
  56. data/lib/fog/aws/parsers/elasticache/create_cache_subnet_group.rb +38 -0
  57. data/lib/fog/aws/parsers/elasticache/describe_cache_subnet_groups.rb +38 -0
  58. data/lib/fog/aws/parsers/elasticache/subnet_group_parser.rb +38 -0
  59. data/lib/fog/aws/parsers/iam/upload_server_certificate.rb +1 -1
  60. data/lib/fog/aws/parsers/rds/db_parser.rb +6 -0
  61. data/lib/fog/aws/parsers/rds/snapshot_parser.rb +1 -0
  62. data/lib/fog/aws/rds.rb +1 -1
  63. data/lib/fog/aws/redshift.rb +1 -1
  64. data/lib/fog/aws/requests/compute/associate_address.rb +1 -0
  65. data/lib/fog/aws/requests/compute/create_network_acl.rb +105 -0
  66. data/lib/fog/aws/requests/compute/create_network_acl_entry.rb +80 -0
  67. data/lib/fog/aws/requests/compute/create_subnet.rb +14 -4
  68. data/lib/fog/aws/requests/compute/create_vpc.rb +7 -1
  69. data/lib/fog/aws/requests/compute/delete_network_acl.rb +52 -0
  70. data/lib/fog/aws/requests/compute/delete_network_acl_entry.rb +55 -0
  71. data/lib/fog/aws/requests/compute/delete_vpc.rb +4 -0
  72. data/lib/fog/aws/requests/compute/describe_addresses.rb +1 -1
  73. data/lib/fog/aws/requests/compute/describe_network_acls.rb +104 -0
  74. data/lib/fog/aws/requests/compute/describe_network_interfaces.rb +4 -0
  75. data/lib/fog/aws/requests/compute/disassociate_address.rb +4 -3
  76. data/lib/fog/aws/requests/compute/replace_network_acl_association.rb +66 -0
  77. data/lib/fog/aws/requests/compute/replace_network_acl_entry.rb +81 -0
  78. data/lib/fog/aws/requests/compute/replace_route.rb +84 -0
  79. data/lib/fog/aws/requests/compute/request_spot_instances.rb +8 -0
  80. data/lib/fog/aws/requests/compute/run_instances.rb +23 -3
  81. data/lib/fog/aws/requests/data_pipeline/put_pipeline_definition.rb +29 -21
  82. data/lib/fog/aws/requests/elasticache/create_cache_cluster.rb +18 -11
  83. data/lib/fog/aws/requests/elasticache/create_cache_subnet_group.rb +66 -0
  84. data/lib/fog/aws/requests/elasticache/delete_cache_subnet_group.rb +40 -0
  85. data/lib/fog/aws/requests/elasticache/describe_cache_subnet_groups.rb +63 -0
  86. data/lib/fog/aws/requests/elb/create_load_balancer.rb +3 -2
  87. data/lib/fog/aws/requests/iam/delete_server_certificate.rb +3 -1
  88. data/lib/fog/aws/requests/rds/create_db_instance.rb +2 -0
  89. data/lib/fog/aws/requests/rds/create_db_instance_read_replica.rb +1 -0
  90. data/lib/fog/aws/requests/rds/create_db_snapshot.rb +1 -1
  91. data/lib/fog/aws/requests/rds/create_db_subnet_group.rb +2 -0
  92. data/lib/fog/aws/requests/rds/modify_db_instance.rb +1 -0
  93. data/lib/fog/aws/requests/storage/abort_multipart_upload.rb +18 -0
  94. data/lib/fog/aws/requests/storage/complete_multipart_upload.rb +23 -0
  95. data/lib/fog/aws/requests/storage/initiate_multipart_upload.rb +24 -0
  96. data/lib/fog/aws/requests/storage/put_object.rb +18 -54
  97. data/lib/fog/aws/requests/storage/shared_mock_methods.rb +87 -0
  98. data/lib/fog/aws/requests/storage/upload_part.rb +18 -0
  99. data/lib/fog/aws/ses.rb +1 -1
  100. data/lib/fog/aws/simpledb.rb +1 -1
  101. data/lib/fog/aws/sns.rb +1 -2
  102. data/lib/fog/aws/sqs.rb +5 -4
  103. data/lib/fog/aws/storage.rb +15 -5
  104. data/lib/fog/aws/sts.rb +1 -1
  105. data/lib/fog/bare_metal_cloud.rb +1 -11
  106. data/lib/fog/bare_metal_cloud/compute.rb +1 -1
  107. data/lib/fog/bare_metal_cloud/core.rb +11 -0
  108. data/lib/fog/bin.rb +1 -0
  109. data/lib/fog/bin/rage4.rb +31 -0
  110. data/lib/fog/bluebox.rb +3 -13
  111. data/lib/fog/bluebox/blb.rb +2 -2
  112. data/lib/fog/bluebox/compute.rb +1 -1
  113. data/lib/fog/bluebox/core.rb +13 -0
  114. data/lib/fog/bluebox/dns.rb +2 -2
  115. data/lib/fog/bluebox/models/compute/server.rb +1 -1
  116. data/lib/fog/brightbox.rb +1 -10
  117. data/lib/fog/brightbox/compute.rb +20 -1
  118. data/lib/fog/brightbox/core.rb +10 -0
  119. data/lib/fog/brightbox/models/compute/cloud_ip.rb +5 -0
  120. data/lib/fog/brightbox/models/compute/database_server.rb +91 -0
  121. data/lib/fog/brightbox/models/compute/database_servers.rb +28 -0
  122. data/lib/fog/brightbox/models/compute/database_snapshot.rb +52 -0
  123. data/lib/fog/brightbox/models/compute/database_snapshots.rb +24 -0
  124. data/lib/fog/brightbox/models/compute/database_type.rb +19 -0
  125. data/lib/fog/brightbox/models/compute/database_types.rb +26 -0
  126. data/lib/fog/brightbox/requests/compute/create_database_server.rb +25 -0
  127. data/lib/fog/brightbox/requests/compute/delete_database_server.rb +26 -0
  128. data/lib/fog/brightbox/requests/compute/delete_database_snapshot.rb +26 -0
  129. data/lib/fog/brightbox/requests/compute/get_database_server.rb +19 -0
  130. data/lib/fog/brightbox/requests/compute/get_database_snapshot.rb +19 -0
  131. data/lib/fog/brightbox/requests/compute/get_database_type.rb +21 -0
  132. data/lib/fog/brightbox/requests/compute/list_database_servers.rb +17 -0
  133. data/lib/fog/brightbox/requests/compute/list_database_snapshots.rb +17 -0
  134. data/lib/fog/brightbox/requests/compute/list_database_types.rb +19 -0
  135. data/lib/fog/brightbox/requests/compute/reset_password_database_server.rb +19 -0
  136. data/lib/fog/brightbox/requests/compute/snapshot_database_server.rb +19 -0
  137. data/lib/fog/brightbox/requests/compute/update_database_server.rb +25 -0
  138. data/lib/fog/brightbox/requests/compute/update_database_snapshot.rb +26 -0
  139. data/lib/fog/clodo.rb +1 -34
  140. data/lib/fog/clodo/compute.rb +2 -0
  141. data/lib/fog/clodo/core.rb +34 -0
  142. data/lib/fog/clodo/models/compute/server.rb +2 -2
  143. data/lib/fog/cloudsigma.rb +1 -9
  144. data/lib/fog/cloudsigma/compute.rb +2 -2
  145. data/lib/fog/cloudsigma/core.rb +9 -0
  146. data/lib/fog/cloudstack.rb +1 -40
  147. data/lib/fog/cloudstack/compute.rb +1 -1
  148. data/lib/fog/cloudstack/core.rb +40 -0
  149. data/lib/fog/cloudstack/models/compute/server.rb +3 -0
  150. data/lib/fog/compute/models/server.rb +33 -7
  151. data/lib/fog/core/collection.rb +1 -3
  152. data/lib/fog/core/errors.rb +2 -0
  153. data/lib/fog/core/hmac.rb +3 -16
  154. data/lib/fog/core/logger.rb +3 -3
  155. data/lib/fog/core/provider.rb +1 -2
  156. data/lib/fog/digitalocean.rb +1 -9
  157. data/lib/fog/digitalocean/compute.rb +1 -1
  158. data/lib/fog/digitalocean/core.rb +9 -0
  159. data/lib/fog/digitalocean/models/compute/server.rb +3 -2
  160. data/lib/fog/digitalocean/models/compute/servers.rb +23 -4
  161. data/lib/fog/digitalocean/requests/compute/create_server.rb +2 -1
  162. data/lib/fog/digitalocean/requests/compute/destroy_server.rb +3 -1
  163. data/lib/fog/dnsimple.rb +1 -11
  164. data/lib/fog/dnsimple/core.rb +11 -0
  165. data/lib/fog/dnsimple/dns.rb +5 -2
  166. data/lib/fog/dnsimple/models/dns/record.rb +3 -3
  167. data/lib/fog/dnsimple/requests/dns/create_domain.rb +26 -22
  168. data/lib/fog/dnsimple/requests/dns/create_record.rb +21 -24
  169. data/lib/fog/dnsimple/requests/dns/delete_domain.rb +7 -6
  170. data/lib/fog/dnsimple/requests/dns/delete_record.rb +7 -5
  171. data/lib/fog/dnsimple/requests/dns/get_domain.rb +12 -18
  172. data/lib/fog/dnsimple/requests/dns/get_record.rb +11 -17
  173. data/lib/fog/dnsimple/requests/dns/list_domains.rb +7 -15
  174. data/lib/fog/dnsimple/requests/dns/list_records.rb +10 -15
  175. data/lib/fog/dnsimple/requests/dns/update_record.rb +14 -19
  176. data/lib/fog/dnsmadeeasy.rb +1 -11
  177. data/lib/fog/dnsmadeeasy/core.rb +11 -0
  178. data/lib/fog/dnsmadeeasy/dns.rb +1 -1
  179. data/lib/fog/dreamhost.rb +1 -11
  180. data/lib/fog/dreamhost/core.rb +11 -0
  181. data/lib/fog/dreamhost/dns.rb +1 -1
  182. data/lib/fog/dynect.rb +1 -26
  183. data/lib/fog/dynect/core.rb +26 -0
  184. data/lib/fog/dynect/dns.rb +1 -1
  185. data/lib/fog/dynect/requests/dns/put_record.rb +5 -4
  186. data/lib/fog/dynect/requests/dns/put_zone.rb +5 -4
  187. data/lib/fog/ecloud.rb +1 -31
  188. data/lib/fog/ecloud/compute.rb +1 -0
  189. data/lib/fog/ecloud/core.rb +31 -0
  190. data/lib/fog/glesys.rb +1 -11
  191. data/lib/fog/glesys/compute.rb +6 -4
  192. data/lib/fog/glesys/core.rb +11 -0
  193. data/lib/fog/glesys/models/compute/server.rb +2 -2
  194. data/lib/fog/go_grid.rb +1 -11
  195. data/lib/fog/go_grid/compute.rb +1 -1
  196. data/lib/fog/go_grid/core.rb +11 -0
  197. data/lib/fog/go_grid/models/compute/server.rb +2 -2
  198. data/lib/fog/google.rb +2 -24
  199. data/lib/fog/google/README.md +8 -5
  200. data/lib/fog/google/compute.rb +60 -17
  201. data/lib/fog/google/core.rb +24 -0
  202. data/lib/fog/google/examples/create.rb +12 -1
  203. data/lib/fog/google/examples/eric-fail.rb +13 -2
  204. data/lib/fog/google/examples/image_create.rb +0 -1
  205. data/lib/fog/google/examples/launch_micro_instance.rb +1 -2
  206. data/lib/fog/google/examples/metadata.rb +14 -2
  207. data/lib/fog/google/examples/network.rb +13 -2
  208. data/lib/fog/google/models/compute/disk.rb +12 -11
  209. data/lib/fog/google/models/compute/flavor.rb +1 -0
  210. data/lib/fog/google/models/compute/flavors.rb +1 -1
  211. data/lib/fog/google/models/compute/image.rb +10 -3
  212. data/lib/fog/google/models/compute/images.rb +2 -0
  213. data/lib/fog/google/models/compute/server.rb +27 -4
  214. data/lib/fog/google/models/compute/servers.rb +26 -10
  215. data/lib/fog/google/models/compute/zone.rb +1 -0
  216. data/lib/fog/google/models/compute/zones.rb +1 -1
  217. data/lib/fog/google/requests/compute/attach_disk.rb +29 -0
  218. data/lib/fog/google/requests/compute/delete_address.rb +31 -0
  219. data/lib/fog/google/requests/compute/delete_snapshot.rb +35 -0
  220. data/lib/fog/google/requests/compute/detach_disk.rb +29 -0
  221. data/lib/fog/google/requests/compute/get_address.rb +31 -0
  222. data/lib/fog/google/requests/compute/insert_address.rb +30 -0
  223. data/lib/fog/google/requests/compute/insert_disk.rb +38 -20
  224. data/lib/fog/google/requests/compute/insert_firewall.rb +6 -9
  225. data/lib/fog/google/requests/compute/insert_image.rb +1 -5
  226. data/lib/fog/google/requests/compute/insert_server.rb +13 -29
  227. data/lib/fog/google/requests/compute/list_addresses.rb +28 -0
  228. data/lib/fog/google/requests/compute/set_metadata.rb +4 -5
  229. data/lib/fog/google/requests/compute/set_tags.rb +33 -0
  230. data/lib/fog/google/requests/storage/get_bucket_acl.rb +2 -2
  231. data/lib/fog/google/requests/storage/put_bucket_acl.rb +39 -48
  232. data/lib/fog/google/requests/storage/put_object_acl.rb +55 -0
  233. data/lib/fog/google/storage.rb +2 -1
  234. data/lib/fog/hp.rb +9 -352
  235. data/lib/fog/hp/block_storage.rb +1 -1
  236. data/lib/fog/hp/block_storage_v2.rb +1 -1
  237. data/lib/fog/hp/cdn.rb +1 -1
  238. data/lib/fog/hp/compute.rb +1 -1
  239. data/lib/fog/hp/compute_v2.rb +1 -1
  240. data/lib/fog/hp/core.rb +352 -0
  241. data/lib/fog/hp/dns.rb +1 -1
  242. data/lib/fog/hp/lb.rb +1 -1
  243. data/lib/fog/hp/models/compute/server.rb +2 -2
  244. data/lib/fog/hp/models/compute_v2/server.rb +2 -2
  245. data/lib/fog/hp/models/storage/directory.rb +12 -6
  246. data/lib/fog/hp/network.rb +1 -1
  247. data/lib/fog/hp/storage.rb +1 -1
  248. data/lib/fog/ibm.rb +2 -176
  249. data/lib/fog/ibm/compute.rb +1 -1
  250. data/lib/fog/ibm/core.rb +176 -0
  251. data/lib/fog/ibm/storage.rb +1 -1
  252. data/lib/fog/internet_archive.rb +1 -292
  253. data/lib/fog/internet_archive/core.rb +292 -0
  254. data/lib/fog/internet_archive/models/storage/file.rb +1 -1
  255. data/lib/fog/internet_archive/storage.rb +1 -1
  256. data/lib/fog/joyent.rb +2 -10
  257. data/lib/fog/joyent/compute.rb +1 -1
  258. data/lib/fog/joyent/core.rb +10 -0
  259. data/lib/fog/joyent/errors.rb +1 -0
  260. data/lib/fog/libvirt.rb +1 -11
  261. data/lib/fog/libvirt/compute.rb +1 -1
  262. data/lib/fog/libvirt/core.rb +11 -0
  263. data/lib/fog/libvirt/models/compute/README.md +1 -1
  264. data/lib/fog/libvirt/models/compute/server.rb +6 -6
  265. data/lib/fog/libvirt/models/compute/templates/volume.xml.erb +12 -0
  266. data/lib/fog/libvirt/models/compute/volume.rb +1 -0
  267. data/lib/fog/linode.rb +2 -10
  268. data/lib/fog/linode/compute.rb +1 -1
  269. data/lib/fog/linode/core.rb +10 -0
  270. data/lib/fog/linode/dns.rb +1 -1
  271. data/lib/fog/local.rb +1 -11
  272. data/lib/fog/local/core.rb +11 -0
  273. data/lib/fog/local/storage.rb +1 -1
  274. data/lib/fog/ninefold.rb +1 -12
  275. data/lib/fog/ninefold/compute.rb +1 -1
  276. data/lib/fog/ninefold/core.rb +12 -0
  277. data/lib/fog/openstack.rb +8 -249
  278. data/lib/fog/openstack/compute.rb +3 -1
  279. data/lib/fog/openstack/core.rb +249 -0
  280. data/lib/fog/openstack/docs/compute.md +681 -0
  281. data/lib/fog/openstack/docs/getting_started.md +81 -0
  282. data/lib/fog/openstack/docs/storage.md +441 -0
  283. data/lib/fog/openstack/identity.rb +1 -1
  284. data/lib/fog/openstack/image.rb +1 -1
  285. data/lib/fog/openstack/metering.rb +1 -1
  286. data/lib/fog/openstack/models/compute/server.rb +13 -5
  287. data/lib/fog/openstack/models/compute/servers.rb +13 -0
  288. data/lib/fog/openstack/models/network/network.rb +9 -11
  289. data/lib/fog/openstack/models/network/security_group.rb +32 -0
  290. data/lib/fog/openstack/models/network/security_group_rule.rb +33 -0
  291. data/lib/fog/openstack/models/network/security_group_rules.rb +33 -0
  292. data/lib/fog/openstack/models/network/security_groups.rb +34 -0
  293. data/lib/fog/openstack/models/storage/directories.rb +1 -0
  294. data/lib/fog/openstack/network.rb +19 -1
  295. data/lib/fog/openstack/orchestration.rb +1 -1
  296. data/lib/fog/openstack/requests/compute/add_security_group.rb +24 -0
  297. data/lib/fog/openstack/requests/compute/create_flavor.rb +1 -1
  298. data/lib/fog/openstack/requests/compute/create_server.rb +3 -3
  299. data/lib/fog/openstack/requests/compute/remove_security_group.rb +24 -0
  300. data/lib/fog/openstack/requests/image/update_image_members.rb +2 -2
  301. data/lib/fog/openstack/requests/network/create_security_group.rb +94 -0
  302. data/lib/fog/openstack/requests/network/create_security_group_rule.rb +79 -0
  303. data/lib/fog/openstack/requests/network/delete_security_group.rb +32 -0
  304. data/lib/fog/openstack/requests/network/delete_security_group_rule.rb +36 -0
  305. data/lib/fog/openstack/requests/network/get_security_group.rb +52 -0
  306. data/lib/fog/openstack/requests/network/get_security_group_rule.rb +47 -0
  307. data/lib/fog/openstack/requests/network/list_networks.rb +0 -1
  308. data/lib/fog/openstack/requests/network/list_security_group_rules.rb +52 -0
  309. data/lib/fog/openstack/requests/network/list_security_groups.rb +57 -0
  310. data/lib/fog/openstack/storage.rb +2 -2
  311. data/lib/fog/openstack/volume.rb +1 -1
  312. data/lib/fog/openvz.rb +1 -9
  313. data/lib/fog/openvz/compute.rb +1 -1
  314. data/lib/fog/openvz/core.rb +9 -0
  315. data/lib/fog/ovirt.rb +1 -17
  316. data/lib/fog/ovirt/compute.rb +2 -0
  317. data/lib/fog/ovirt/core.rb +17 -0
  318. data/lib/fog/rackspace.rb +12 -145
  319. data/lib/fog/rackspace/auto_scale.rb +1 -1
  320. data/lib/fog/rackspace/block_storage.rb +5 -1
  321. data/lib/fog/rackspace/cdn.rb +22 -16
  322. data/lib/fog/rackspace/compute.rb +1 -1
  323. data/lib/fog/rackspace/compute_v2.rb +6 -2
  324. data/lib/fog/rackspace/core.rb +145 -0
  325. data/lib/fog/rackspace/databases.rb +5 -1
  326. data/lib/fog/rackspace/dns.rb +1 -1
  327. data/lib/fog/rackspace/docs/compute_v2.md +2 -10
  328. data/lib/fog/rackspace/errors.rb +1 -1
  329. data/lib/fog/rackspace/examples/storage/upload_file.rb +1 -1
  330. data/lib/fog/rackspace/identity.rb +26 -16
  331. data/lib/fog/rackspace/load_balancers.rb +7 -1
  332. data/lib/fog/rackspace/mock_data.rb +17 -0
  333. data/lib/fog/rackspace/models/compute/server.rb +2 -2
  334. data/lib/fog/rackspace/models/compute_v2/key_pair.rb +1 -1
  335. data/lib/fog/rackspace/models/compute_v2/server.rb +42 -5
  336. data/lib/fog/rackspace/models/monitoring/entities.rb +1 -1
  337. data/lib/fog/rackspace/models/queues/claim.rb +9 -1
  338. data/lib/fog/rackspace/models/storage/directory.rb +5 -2
  339. data/lib/fog/rackspace/models/storage/file.rb +14 -0
  340. data/lib/fog/rackspace/monitoring.rb +11 -2
  341. data/lib/fog/rackspace/queues.rb +318 -34
  342. data/lib/fog/rackspace/requests/compute_v2/create_keypair.rb +16 -5
  343. data/lib/fog/rackspace/requests/compute_v2/create_server.rb +7 -1
  344. data/lib/fog/rackspace/requests/compute_v2/delete_keypair.rb +1 -1
  345. data/lib/fog/rackspace/requests/identity/create_token.rb +192 -0
  346. data/lib/fog/rackspace/requests/identity/list_tenants.rb +23 -0
  347. data/lib/fog/rackspace/requests/monitoring/get_agent.rb +45 -0
  348. data/lib/fog/rackspace/requests/monitoring/get_cpus_info.rb +63 -0
  349. data/lib/fog/rackspace/requests/monitoring/get_disks_info.rb +56 -0
  350. data/lib/fog/rackspace/requests/monitoring/get_filesystems_info.rb +64 -0
  351. data/lib/fog/rackspace/requests/monitoring/get_logged_in_user_info.rb +58 -0
  352. data/lib/fog/rackspace/requests/monitoring/get_memory_info.rb +59 -0
  353. data/lib/fog/rackspace/requests/monitoring/get_network_interfaces_info.rb +91 -0
  354. data/lib/fog/rackspace/requests/monitoring/get_processes_info.rb +72 -0
  355. data/lib/fog/rackspace/requests/monitoring/get_system_info.rb +53 -0
  356. data/lib/fog/rackspace/requests/monitoring/list_agents.rb +62 -0
  357. data/lib/fog/rackspace/requests/queues/create_claim.rb +37 -0
  358. data/lib/fog/rackspace/requests/queues/create_message.rb +23 -0
  359. data/lib/fog/rackspace/requests/queues/create_queue.rb +15 -1
  360. data/lib/fog/rackspace/requests/queues/delete_claim.rb +18 -0
  361. data/lib/fog/rackspace/requests/queues/delete_message.rb +34 -0
  362. data/lib/fog/rackspace/requests/queues/delete_queue.rb +12 -0
  363. data/lib/fog/rackspace/requests/queues/get_claim.rb +15 -0
  364. data/lib/fog/rackspace/requests/queues/get_message.rb +17 -0
  365. data/lib/fog/rackspace/requests/queues/get_queue.rb +14 -1
  366. data/lib/fog/rackspace/requests/queues/get_queue_stats.rb +36 -0
  367. data/lib/fog/rackspace/requests/queues/list_messages.rb +33 -0
  368. data/lib/fog/rackspace/requests/queues/list_queues.rb +35 -1
  369. data/lib/fog/rackspace/requests/queues/update_claim.rb +17 -0
  370. data/lib/fog/rackspace/requests/storage/delete_container.rb +15 -0
  371. data/lib/fog/rackspace/requests/storage/delete_multiple_objects.rb +57 -0
  372. data/lib/fog/rackspace/requests/storage/delete_object.rb +14 -0
  373. data/lib/fog/rackspace/requests/storage/delete_static_large_object.rb +33 -0
  374. data/lib/fog/rackspace/requests/storage/extract_archive.rb +39 -0
  375. data/lib/fog/rackspace/requests/storage/get_container.rb +25 -0
  376. data/lib/fog/rackspace/requests/storage/get_containers.rb +17 -0
  377. data/lib/fog/rackspace/requests/storage/get_object.rb +26 -0
  378. data/lib/fog/rackspace/requests/storage/get_object_http_url.rb +9 -2
  379. data/lib/fog/rackspace/requests/storage/get_object_https_url.rb +8 -1
  380. data/lib/fog/rackspace/requests/storage/head_container.rb +12 -0
  381. data/lib/fog/rackspace/requests/storage/head_containers.rb +19 -0
  382. data/lib/fog/rackspace/requests/storage/head_object.rb +26 -0
  383. data/lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb +10 -0
  384. data/lib/fog/rackspace/requests/storage/put_container.rb +16 -0
  385. data/lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb +23 -0
  386. data/lib/fog/rackspace/requests/storage/put_object.rb +39 -0
  387. data/lib/fog/rackspace/requests/storage/put_object_manifest.rb +9 -1
  388. data/lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb +48 -0
  389. data/lib/fog/rackspace/storage.rb +320 -67
  390. data/lib/fog/rage4.rb +2 -0
  391. data/lib/fog/rage4/core.rb +11 -0
  392. data/lib/fog/rage4/dns.rb +74 -0
  393. data/lib/fog/rage4/models/dns/record.rb +77 -0
  394. data/lib/fog/rage4/models/dns/records.rb +42 -0
  395. data/lib/fog/rage4/models/dns/zone.rb +46 -0
  396. data/lib/fog/rage4/models/dns/zones.rb +34 -0
  397. data/lib/fog/rage4/requests/dns/create_domain.rb +33 -0
  398. data/lib/fog/rage4/requests/dns/create_domain_vanity.rb +34 -0
  399. data/lib/fog/rage4/requests/dns/create_record.rb +65 -0
  400. data/lib/fog/rage4/requests/dns/create_reverse_domain_4.rb +32 -0
  401. data/lib/fog/rage4/requests/dns/delete_domain.rb +28 -0
  402. data/lib/fog/rage4/requests/dns/delete_record.rb +28 -0
  403. data/lib/fog/rage4/requests/dns/get_domain.rb +30 -0
  404. data/lib/fog/rage4/requests/dns/get_domain_by_name.rb +30 -0
  405. data/lib/fog/rage4/requests/dns/list_domains.rb +41 -0
  406. data/lib/fog/rage4/requests/dns/list_geo_regions.rb +27 -0
  407. data/lib/fog/rage4/requests/dns/list_record_types.rb +26 -0
  408. data/lib/fog/rage4/requests/dns/list_records.rb +31 -0
  409. data/lib/fog/rage4/requests/dns/set_record_failover.rb +29 -0
  410. data/lib/fog/rage4/requests/dns/show_current_usage.rb +25 -0
  411. data/lib/fog/rage4/requests/dns/show_global_usage.rb +25 -0
  412. data/lib/fog/rage4/requests/dns/update_domain.rb +43 -0
  413. data/lib/fog/rage4/requests/dns/update_record.rb +64 -0
  414. data/lib/fog/riakcs.rb +2 -122
  415. data/lib/fog/riakcs/core.rb +122 -0
  416. data/lib/fog/riakcs/provisioning.rb +1 -1
  417. data/lib/fog/riakcs/usage.rb +1 -1
  418. data/lib/fog/serverlove.rb +1 -10
  419. data/lib/fog/serverlove/compute.rb +2 -0
  420. data/lib/fog/serverlove/core.rb +10 -0
  421. data/lib/fog/storm_on_demand.rb +9 -20
  422. data/lib/fog/storm_on_demand/account.rb +1 -1
  423. data/lib/fog/storm_on_demand/billing.rb +1 -1
  424. data/lib/fog/storm_on_demand/compute.rb +1 -1
  425. data/lib/fog/storm_on_demand/core.rb +20 -0
  426. data/lib/fog/storm_on_demand/dns.rb +1 -1
  427. data/lib/fog/storm_on_demand/monitoring.rb +1 -1
  428. data/lib/fog/storm_on_demand/network.rb +1 -1
  429. data/lib/fog/storm_on_demand/shared.rb +0 -1
  430. data/lib/fog/storm_on_demand/storage.rb +1 -1
  431. data/lib/fog/storm_on_demand/support.rb +1 -1
  432. data/lib/fog/storm_on_demand/vpn.rb +1 -1
  433. data/lib/fog/vcloud.rb +1 -11
  434. data/lib/fog/vcloud/compute.rb +1 -1
  435. data/lib/fog/vcloud/core.rb +11 -0
  436. data/lib/fog/vcloud_director.rb +1 -67
  437. data/lib/fog/vcloud_director/compute.rb +1 -1
  438. data/lib/fog/vcloud_director/core.rb +67 -0
  439. data/lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb +1 -1
  440. data/lib/fog/version.rb +1 -1
  441. data/lib/fog/vmfusion.rb +1 -11
  442. data/lib/fog/vmfusion/compute.rb +1 -1
  443. data/lib/fog/vmfusion/core.rb +11 -0
  444. data/lib/fog/vmfusion/models/compute/server.rb +5 -5
  445. data/lib/fog/voxel.rb +1 -16
  446. data/lib/fog/voxel/compute.rb +1 -1
  447. data/lib/fog/voxel/core.rb +16 -0
  448. data/lib/fog/vsphere.rb +1 -17
  449. data/lib/fog/vsphere/compute.rb +1 -0
  450. data/lib/fog/vsphere/core.rb +17 -0
  451. data/lib/fog/xenserver.rb +1 -83
  452. data/lib/fog/xenserver/compute.rb +1 -1
  453. data/lib/fog/xenserver/core.rb +83 -0
  454. data/lib/fog/xenserver/models/compute/storage_manager.rb +1 -1
  455. data/lib/fog/zerigo.rb +1 -11
  456. data/lib/fog/zerigo/core.rb +11 -0
  457. data/lib/fog/zerigo/dns.rb +1 -1
  458. data/lib/tasks/changelog_task.rb +2 -0
  459. data/tests/aws/models/compute/network_acl_tests.rb +109 -0
  460. data/tests/aws/models/compute/network_acls_tests.rb +7 -0
  461. data/tests/aws/models/elasticache/subnet_groups_tests.rb +44 -0
  462. data/tests/aws/requests/compute/network_acl_tests.rb +86 -0
  463. data/tests/aws/requests/compute/route_tests.rb +64 -3
  464. data/tests/aws/requests/compute/subnet_tests.rb +18 -11
  465. data/tests/aws/requests/elasticache/helper.rb +19 -0
  466. data/tests/aws/requests/elasticache/subnet_group_tests.rb +52 -0
  467. data/tests/aws/requests/iam/server_certificate_tests.rb +3 -0
  468. data/tests/aws/requests/rds/subnet_groups_tests.rb +1 -1
  469. data/tests/aws/requests/storage/multipart_upload_tests.rb +3 -14
  470. data/tests/brightbox/compute/schema.rb +118 -2
  471. data/tests/brightbox/helper.rb +1 -0
  472. data/tests/brightbox/models/compute/cloud_ip_tests.rb +32 -0
  473. data/tests/brightbox/models/compute/database_server_tests.rb +66 -0
  474. data/tests/brightbox/models/compute/database_snapshot_tests.rb +26 -0
  475. data/tests/brightbox/models/compute/database_type_tests.rb +27 -0
  476. data/tests/brightbox/requests/compute/database_server_tests.rb +54 -0
  477. data/tests/brightbox/requests/compute/database_snapsnot_tests.rb +47 -0
  478. data/tests/brightbox/requests/compute/database_type_tests.rb +17 -0
  479. data/tests/compute/models/server_tests.rb +20 -2
  480. data/tests/digitalocean/helper.rb +9 -4
  481. data/tests/digitalocean/models/compute/server_tests.rb +1 -0
  482. data/tests/digitalocean/models/compute/servers_tests.rb +19 -4
  483. data/tests/digitalocean/requests/compute/create_server_tests.rb +13 -6
  484. data/tests/digitalocean/requests/compute/list_servers_tests.rb +2 -1
  485. data/tests/dns/helper.rb +3 -0
  486. data/tests/dns/models/record_tests.rb +1 -1
  487. data/tests/dns/models/records_tests.rb +1 -1
  488. data/tests/dns/models/zone_tests.rb +1 -1
  489. data/tests/dns/models/zones_tests.rb +1 -1
  490. data/tests/google/helpers/disk_helper.rb +12 -0
  491. data/tests/google/models/compute/server_tests.rb +4 -1
  492. data/tests/google/models/compute/servers_tests.rb +4 -1
  493. data/tests/google/requests/compute/image_tests.rb +0 -1
  494. data/tests/google/requests/compute/server_tests.rb +2 -1
  495. data/tests/helper.rb +7 -1
  496. data/tests/helpers/compute/server_helper.rb +1 -0
  497. data/tests/helpers/compute/servers_helper.rb +1 -0
  498. data/tests/openstack/models/network/security_group_rule_tests.rb +27 -0
  499. data/tests/openstack/models/network/security_group_rules_tests.rb +25 -0
  500. data/tests/openstack/models/network/security_group_tests.rb +17 -0
  501. data/tests/openstack/models/network/security_groups_tests.rb +16 -0
  502. data/tests/openstack/requests/compute/helper.rb +5 -0
  503. data/tests/openstack/requests/compute/server_tests.rb +11 -0
  504. data/tests/openstack/requests/network/security_group_rule_tests.rb +58 -0
  505. data/tests/openstack/requests/network/security_group_tests.rb +43 -0
  506. data/tests/rackspace/identity_tests.rb +0 -4
  507. data/tests/rackspace/models/compute_v2/server_tests.rb +36 -8
  508. data/tests/rackspace/models/queues/claim_tests.rb +1 -3
  509. data/tests/rackspace/models/queues/claims_tests.rb +1 -3
  510. data/tests/rackspace/models/queues/message_tests.rb +1 -3
  511. data/tests/rackspace/models/queues/messages_tests.rb +1 -3
  512. data/tests/rackspace/models/queues/queue_tests.rb +1 -3
  513. data/tests/rackspace/models/queues/queues_tests.rb +1 -3
  514. data/tests/rackspace/models/storage/account_tests.rb +0 -2
  515. data/tests/rackspace/models/storage/directories_tests.rb +0 -3
  516. data/tests/rackspace/models/storage/directory_tests.rb +2 -5
  517. data/tests/rackspace/models/storage/file_tests.rb +49 -2
  518. data/tests/rackspace/models/storage/files_tests.rb +1 -4
  519. data/tests/rackspace/queues_tests.rb +0 -13
  520. data/tests/rackspace/requests/identity/token_tests.rb +1 -3
  521. data/tests/rackspace/requests/monitoring/agent_tests.rb +42 -0
  522. data/tests/rackspace/requests/queues/claim_tests.rb +1 -3
  523. data/tests/rackspace/requests/queues/messages_tests.rb +0 -6
  524. data/tests/rackspace/requests/queues/queues_tests.rb +0 -5
  525. data/tests/rackspace/requests/storage/account_tests.rb +0 -1
  526. data/tests/rackspace/requests/storage/container_tests.rb +7 -11
  527. data/tests/rackspace/requests/storage/large_object_tests.rb +33 -43
  528. data/tests/rackspace/requests/storage/object_tests.rb +2 -27
  529. data/tests/rackspace/storage_tests.rb +9 -15
  530. data/tests/rage4/requests/dns/dns_tests.rb +241 -0
  531. data/tests/vcloud/requests/compute/disk_configure_tests.rb +0 -8
  532. metadata +193 -38
  533. data/lib/fog/brightbox/requests/compute/destroy_user_collaboration.rb +0 -21
@@ -16,6 +16,7 @@ module Fog
16
16
  :aliases => 'maximumPersistentDisks'
17
17
  attribute :maximum_persistent_disks_size,
18
18
  :aliases => 'maximumPersistentDisksSizeGb'
19
+ attribute :self_link, :aliases => 'selfLink'
19
20
 
20
21
  end
21
22
 
@@ -18,7 +18,7 @@ module Fog
18
18
  def get(identity, zone_name = nil)
19
19
  data = connection.get_machine_type(identity, zone_name).body
20
20
  new(data)
21
- rescue Excon::Errors::NotFound
21
+ rescue Fog::Errors::NotFound
22
22
  nil
23
23
  end
24
24
 
@@ -8,10 +8,11 @@ module Fog
8
8
 
9
9
  identity :name
10
10
 
11
+ attribute :id
11
12
  attribute :kind
13
+ attribute :self_link, :aliases => 'selfLink'
12
14
  attribute :creation_timestamp, :aliases => 'creationTimestamp'
13
15
  attribute :description
14
- attribute :preferred_kernel, :aliases => 'preferredKernel'
15
16
 
16
17
  # This attribute is not available in the representation of an
17
18
  # 'image' returned by the GCE servser (see GCE API). However,
@@ -30,6 +31,14 @@ module Fog
30
31
 
31
32
  attribute :status
32
33
 
34
+ def preferred_kernel=(args)
35
+ Fog::Logger.deprecation("preferred_kernel= is no longer used [light_black](#{caller.first})[/]")
36
+ end
37
+ def preferred_kernel
38
+ Fog::Logger.deprecation("preferred_kernel is no longer used [light_black](#{caller.first})[/]")
39
+ nil
40
+ end
41
+
33
42
  def reload
34
43
  requires :name
35
44
 
@@ -41,11 +50,9 @@ module Fog
41
50
 
42
51
  def save
43
52
  requires :name
44
- requires :preferred_kernel
45
53
  requires :raw_disk
46
54
 
47
55
  options = {
48
- 'preferredKernel' => preferred_kernel,
49
56
  'rawDisk' => raw_disk,
50
57
  'description' => description,
51
58
  }
@@ -12,6 +12,8 @@ module Fog
12
12
  GLOBAL_PROJECTS = [ 'google',
13
13
  'debian-cloud',
14
14
  'centos-cloud',
15
+ # RHEL removed from this list because not everyone has access to it.
16
+ # 'rhel-cloud',
15
17
  ]
16
18
 
17
19
  def all
@@ -8,7 +8,7 @@ module Fog
8
8
  class Server < Fog::Compute::Server
9
9
 
10
10
  identity :name
11
- attribute :image_name, :aliases => 'image'
11
+
12
12
  attribute :network_interfaces, :aliases => 'networkInterfaces'
13
13
  attribute :network, :aliases => 'network'
14
14
  attribute :external_ip, :aliases => 'externalIP'
@@ -16,9 +16,31 @@ module Fog
16
16
  attribute :zone_name, :aliases => 'zone'
17
17
  attribute :machine_type, :aliases => 'machineType'
18
18
  attribute :disks, :aliases => 'disks'
19
- attribute :kernel, :aliases => 'kernel'
20
19
  attribute :metadata
21
20
  attribute :tags, :squash => 'items'
21
+ attribute :self_link, :aliases => 'selfLink'
22
+
23
+ def image_name=(args)
24
+ Fog::Logger.deprecation("image_name= is no longer used [light_black](#{caller.first})[/]")
25
+ end
26
+
27
+ def image_name
28
+ boot_disk = disks.first
29
+ unless boot_disk.is_a?(Disk)
30
+ source = boot_disk['source']
31
+ match = source.match(%r{/zones/(.*)/disks/(.*)$})
32
+ boot_disk = service.disks.get match[2], match[1]
33
+ end
34
+ boot_disk.source_image.nil? ? nil : boot_disk.source_image
35
+ end
36
+
37
+ def kernel=(args)
38
+ Fog::Logger.deprecation("kernel= is no longer used [light_black](#{caller.first})[/]")
39
+ end
40
+ def kernel
41
+ Fog::Logger.deprecation("kernel is no longer used [light_black](#{caller.first})[/]")
42
+ nil
43
+ end
22
44
 
23
45
  def flavor_id
24
46
  machine_type
@@ -39,7 +61,9 @@ module Fog
39
61
  operation
40
62
  end
41
63
 
64
+ # not used since v1
42
65
  def image
66
+ Fog::Logger.deprecation("Server.image is deprecated, get source_image from boot disk")
43
67
  service.get_image(self.image_name.split('/')[-1])
44
68
  end
45
69
 
@@ -112,6 +136,7 @@ module Fog
112
136
  requires :name
113
137
  requires :machine_type
114
138
  requires :zone_name
139
+ requires :disks
115
140
 
116
141
  if not service.zones.find{ |zone| zone.name == self.zone_name }
117
142
  raise ArgumentError.new "#{self.zone_name.inspect} is either down or you don't have permission to use it."
@@ -120,13 +145,11 @@ module Fog
120
145
  self.add_ssh_key(self.username, self.public_key) if self.public_key
121
146
 
122
147
  options = {
123
- 'image' => image_name,
124
148
  'machineType' => machine_type,
125
149
  'networkInterfaces' => network_interfaces,
126
150
  'network' => network,
127
151
  'externalIp' => external_ip,
128
152
  'disks' => disks,
129
- 'kernel' => kernel,
130
153
  'metadata' => metadata,
131
154
  'tags' => tags
132
155
  }.delete_if {|key, value| value.nil?}
@@ -40,27 +40,43 @@ module Fog
40
40
  else
41
41
  new(response.body)
42
42
  end
43
- rescue Excon::Errors::NotFound
43
+ rescue Fog::Errors::NotFound
44
44
  nil
45
45
  end
46
46
 
47
47
  def bootstrap(new_attributes = {})
48
+ name = "fog-#{Time.now.to_i}"
49
+ zone = "us-central1-b"
50
+
51
+ disks = new_attributes[:disks]
52
+
53
+ if disks.nil? or disks.empty?
54
+ # create the persistent boot disk
55
+ disk_defaults = {
56
+ :name => name,
57
+ :size_gb => 10,
58
+ :zone_name => zone,
59
+ :source_image => "debian-7-wheezy-v20131120",
60
+ }
61
+
62
+ # backwards compatibility to pre-v1
63
+ new_attributes[:source_image] = new_attributes[:image_name] if new_attributes[:image_name]
64
+
65
+ disk = service.disks.create(disk_defaults.merge(new_attributes))
66
+ disk.wait_for { disk.ready? }
67
+ disks = [disk]
68
+ end
69
+
48
70
  defaults = {
49
- :name => "fog-#{Time.now.to_i}",
50
- :image_name => "debian-7-wheezy-v20131014",
71
+ :name => name,
72
+ :disks => disks,
51
73
  :machine_type => "n1-standard-1",
52
- :zone_name => "us-central1-b",
74
+ :zone_name => zone,
53
75
  :private_key_path => File.expand_path("~/.ssh/id_rsa"),
54
76
  :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"),
55
77
  :username => ENV['USER'],
56
78
  }
57
79
 
58
- if new_attributes[:disks]
59
- new_attributes[:disks].each do |disk|
60
- defaults.delete :image_name if disk['boot']
61
- end
62
- end
63
-
64
80
  server = create(defaults.merge(new_attributes))
65
81
  server.wait_for { sshable? }
66
82
 
@@ -14,6 +14,7 @@ module Fog
14
14
  attribute :end_time, :aliases => 'endTime'
15
15
  attribute :quotas
16
16
  attribute :region
17
+ attribute :self_link, :aliases => 'selfLink'
17
18
 
18
19
  def up?
19
20
  self.status == "UP"
@@ -17,7 +17,7 @@ module Fog
17
17
  def get(identity)
18
18
  data = service.get_zone(identity).body
19
19
  new(data)
20
- rescue Excon::Errors::NotFound
20
+ rescue Fog::Errors::NotFound
21
21
  nil
22
22
  end
23
23
 
@@ -0,0 +1,29 @@
1
+ module Fog
2
+ module Compute
3
+ class Google
4
+
5
+ class Mock
6
+ def attach_disk(instance, zone, deviceName)
7
+ Fog::Mock.not_implemented
8
+ end
9
+ end
10
+
11
+ class Real
12
+
13
+ def attach_disk(instance, zone, deviceName)
14
+ api_method = @compute.instances.attach_disk
15
+ parameters = {
16
+ 'project' => @project,
17
+ 'instance' => instance,
18
+ 'zone' => zone
19
+ }
20
+ body_object = {
21
+ "deviceName" => deviceName
22
+ }
23
+ result = self.build_result(api_method, parameters, body_object=body_object)
24
+ response = self.build_response(result)
25
+ end
26
+ end
27
+ end
28
+ end
29
+ end
@@ -0,0 +1,31 @@
1
+ module Fog
2
+ module Compute
3
+ class Google
4
+
5
+ class Mock
6
+
7
+ def delete_address(address_name, region_name)
8
+ Fog::Mock.not_implemented
9
+ end
10
+
11
+ end
12
+
13
+ class Real
14
+
15
+ def delete_address(address_name, region_name)
16
+ api_method = @compute.addresses.delete
17
+ parameters = {
18
+ 'project' => @project,
19
+ 'address' => address_name,
20
+ 'region' => region_name
21
+ }
22
+
23
+ result = self.build_result(api_method, parameters)
24
+ response = self.build_response(result)
25
+ end
26
+
27
+ end
28
+
29
+ end
30
+ end
31
+ end
@@ -0,0 +1,35 @@
1
+ module Fog
2
+ module Compute
3
+ class Google
4
+
5
+ class Mock
6
+
7
+ def delete_snapshot(snapshot_name, zone_name)
8
+ Fog::Mock.not_implemented
9
+ end
10
+
11
+ end
12
+
13
+ class Real
14
+
15
+ def delete_snapshot(snapshot_name, zone_name)
16
+ if zone_name.start_with? 'http'
17
+ zone_name = zone_name.split('/')[-1]
18
+ end
19
+
20
+ api_method = @compute.snapshots.delete
21
+ parameters = {
22
+ 'project' => @project,
23
+ 'snapshot' => snapshot_name,
24
+ 'zone' => zone_name,
25
+ }
26
+
27
+ result = self.build_result(api_method, parameters)
28
+ response = self.build_response(result)
29
+ end
30
+
31
+ end
32
+
33
+ end
34
+ end
35
+ end
@@ -0,0 +1,29 @@
1
+ module Fog
2
+ module Compute
3
+ class Google
4
+
5
+ class Mock
6
+ def detach_disk(instance, zone, deviceName)
7
+ Fog::Mock.not_implemented
8
+ end
9
+ end
10
+
11
+ class Real
12
+
13
+ def detach_disk(instance, zone, deviceName)
14
+ api_method = @compute.instances.detach_disk
15
+ parameters = {
16
+ 'project' => @project,
17
+ 'instance' => instance,
18
+ 'zone' => zone,
19
+ }
20
+ body_object = { "deviceName" => deviceName }
21
+ result = self.build_result(api_method, parameters, body_object=body_object)
22
+ response = self.build_response(result)
23
+ end
24
+
25
+ end
26
+
27
+ end
28
+ end
29
+ end
@@ -0,0 +1,31 @@
1
+ module Fog
2
+ module Compute
3
+ class Google
4
+
5
+ class Mock
6
+
7
+ def get_address(address_name, region_name)
8
+ Fog::Mock.not_implemented
9
+ end
10
+
11
+ end
12
+
13
+ class Real
14
+
15
+ def get_address(address_name, region_name)
16
+ api_method = @compute.addresses.get
17
+ parameters = {
18
+ 'project' => @project,
19
+ 'address' => address_name,
20
+ 'region' => region_name
21
+ }
22
+
23
+ result = self.build_result(api_method, parameters)
24
+ response = self.build_response(result)
25
+ end
26
+
27
+ end
28
+
29
+ end
30
+ end
31
+ end
@@ -0,0 +1,30 @@
1
+ module Fog
2
+ module Compute
3
+ class Google
4
+
5
+ class Mock
6
+
7
+ def insert_address(address_name, region_name)
8
+ Fog::Mock.not_implemented
9
+ end
10
+
11
+ end
12
+
13
+ class Real
14
+
15
+ def insert_address(address_name, region_name)
16
+ api_method = @compute.addresses.insert
17
+ parameters = {
18
+ 'project' => @project,
19
+ 'region' => region_name,
20
+ }
21
+ body_object = { 'name' => address_name }
22
+
23
+ result = self.build_result(api_method, parameters,
24
+ body_object=body_object)
25
+ response = self.build_response(result)
26
+ end
27
+ end
28
+ end
29
+ end
30
+ end
@@ -6,18 +6,15 @@ module Fog
6
6
 
7
7
  def insert_disk(disk_name, zone_name, image_name=nil, options={})
8
8
  # check that image and zone exist
9
- image_project = nil
10
- unless image_name.nil?
11
- ([ @project ] + Fog::Compute::Google::Images::GLOBAL_PROJECTS).each do |project|
12
- image_project = project
13
- break if data(project)[:images][options['image']]
14
- end
15
- get_image(image_name, image_project) # ok if image exists, will fail otherwise
9
+ image = nil
10
+ if image_name
11
+ image = images.get(image_name)
12
+ raise ArgumentError.new("Invalid image specified: #{image_name}") unless image
16
13
  end
17
14
  get_zone(zone_name)
18
15
 
19
16
  id = Fog::Mock.random_numbers(19).to_s
20
- self.data[:disks][disk_name] = {
17
+ object = {
21
18
  "kind" => "compute#disk",
22
19
  "id" => id,
23
20
  "creationTimestamp" => Time.now.iso8601,
@@ -27,22 +24,37 @@ module Fog
27
24
  "sizeGb" => options['sizeGb'] || "10",
28
25
  "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}"
29
26
  }
27
+ if image
28
+ object.merge({
29
+ "sourceImage" => image.self_link,
30
+ "sourceImageId" => image.id
31
+ })
32
+ end
33
+ self.data[:disks][disk_name] = object
34
+
35
+ if image
36
+ object.merge!({
37
+ "sourceImage" => image.self_link,
38
+ "sourceImageId" => image.id
39
+ })
40
+ end
41
+ self.data[:disks][disk_name] = object
30
42
 
31
43
  operation = self.random_operation
32
44
  self.data[:operations][operation] = {
33
45
  "kind" => "compute#operation",
34
46
  "id" => Fog::Mock.random_numbers(19).to_s,
35
47
  "name" => operation,
36
- "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
48
+ "zone" => object["zone"],
37
49
  "operationType" => "insert",
38
- "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}",
50
+ "targetLink" => object["selfLink"],
39
51
  "targetId" => id,
40
52
  "status" => Fog::Compute::Google::Operation::PENDING_STATE,
41
53
  "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
42
54
  "progress" => 0,
43
55
  "insertTime" => Time.now.iso8601,
44
56
  "startTime" => Time.now.iso8601,
45
- "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
57
+ "selfLink" => "#{object["zone"]}/operations/#{operation}"
46
58
  }
47
59
 
48
60
  build_response(:body => self.data[:operations][operation])
@@ -60,26 +72,32 @@ module Fog
60
72
  }
61
73
 
62
74
  if image_name
75
+ # New disk from image
63
76
  image = images.get(image_name)
64
- raise ArgumentError.new('Invalid image specified') unless image
77
+ raise ArgumentError.new("Invalid image specified: #{image_name}") unless image
65
78
  @image_url = @api_url + image.resource_url
66
79
  parameters['sourceImage'] = @image_url
67
80
  end
68
81
 
69
82
  body_object = { 'name' => disk_name }
70
83
 
71
- # These must be present if image_name is not specified
84
+ # According to Google docs, if image name is not present, only one of
85
+ # sizeGb or sourceSnapshot need to be present, one will create blank
86
+ # disk of desired size, other will create disk from snapshot
72
87
  if image_name.nil?
73
- unless opts.has_key?('sourceSnapshot') and opts.has_key?('sizeGb')
74
- raise ArgumentError.new('Must specify image OR snapshot and '\
88
+ if opts.has_key?('sourceSnapshot')
89
+ # New disk from snapshot
90
+ snap = snapshots.get(opts.delete('sourceSnapshot'))
91
+ raise ArgumentError.new('Invalid source snapshot') unless snap
92
+ body_object['sourceSnapshot'] = @api_url + snap.resource_url
93
+ elsif opts.has_key?('sizeGb')
94
+ # New blank disk
95
+ body_object['sizeGb'] = opts.delete('sizeGb')
96
+ else
97
+ raise ArgumentError.new('Must specify image OR snapshot OR '\
75
98
  'disk size when creating a disk.')
76
99
  end
77
100
 
78
- body_object['sizeGb'] = opts.delete('sizeGb')
79
-
80
- snap = snapshots.get(opts.delete('sourceSnapshot'))
81
- raise ArgumentError.new('Invalid source snapshot') unless snap
82
- body_object['sourceSnapshot'] = @api_url + snap.resource_url
83
101
  end
84
102
 
85
103
  # Merge in any remaining options (only 'description' should remain)