fog 0.0.71 → 0.0.72

Sign up to get free protection for your applications and to get access to all the features.
Files changed (45) hide show
  1. data/VERSION.yml +1 -1
  2. data/fog.gemspec +13 -36
  3. data/lib/fog/aws/ec2.rb +49 -46
  4. data/lib/fog/aws/requests/ec2/describe_instances.rb +1 -1
  5. data/lib/fog/aws/requests/ec2/terminate_instances.rb +1 -1
  6. data/lib/fog/aws/s3.rb +19 -16
  7. data/lib/fog/aws/simpledb.rb +12 -9
  8. data/lib/fog/rackspace/files.rb +17 -14
  9. data/lib/fog/rackspace/servers.rb +27 -24
  10. data/lib/fog/slicehost.rb +19 -16
  11. data/lib/fog/terremark.rb +25 -22
  12. data/tests/rackspace/helper.rb +5 -0
  13. data/tests/rackspace/requests/servers/create_image_tests.rb +1 -1
  14. data/tests/rackspace/requests/servers/delete_image_tests.rb +1 -1
  15. data/tests/rackspace/requests/servers/delete_server_tests.rb +1 -1
  16. data/tests/rackspace/requests/servers/get_server_details_tests.rb +1 -1
  17. data/tests/rackspace/requests/servers/list_addresses_tests.rb +32 -0
  18. data/tests/rackspace/requests/servers/list_flavors_detail_tests.rb +13 -0
  19. data/tests/rackspace/requests/servers/list_flavors_tests.rb +13 -0
  20. data/tests/rackspace/requests/servers/list_images_detail_tests.rb +13 -0
  21. data/tests/rackspace/requests/servers/list_images_tests.rb +13 -0
  22. data/tests/rackspace/requests/servers/list_private_addresses_tests.rb +32 -0
  23. data/tests/rackspace/requests/servers/list_public_addresses_tests.rb +32 -0
  24. data/tests/rackspace/requests/servers/list_servers_detail_tests.rb +19 -0
  25. data/tests/rackspace/requests/servers/list_servers_tests.rb +19 -0
  26. data/tests/rackspace/requests/servers/reboot_server_tests.rb +41 -0
  27. data/tests/rackspace/requests/servers/update_server_tests.rb +32 -0
  28. metadata +14 -37
  29. data/spec/rackspace/requests/servers/create_image_spec.rb +0 -26
  30. data/spec/rackspace/requests/servers/create_server_spec.rb +0 -33
  31. data/spec/rackspace/requests/servers/delete_image_spec.rb +0 -34
  32. data/spec/rackspace/requests/servers/delete_server_spec.rb +0 -27
  33. data/spec/rackspace/requests/servers/get_flavor_details_spec.rb +0 -15
  34. data/spec/rackspace/requests/servers/get_server_details_spec.rb +0 -44
  35. data/spec/rackspace/requests/servers/list_addresses_spec.rb +0 -34
  36. data/spec/rackspace/requests/servers/list_flavors_detail_spec.rb +0 -17
  37. data/spec/rackspace/requests/servers/list_flavors_spec.rb +0 -15
  38. data/spec/rackspace/requests/servers/list_images_detail_spec.rb +0 -17
  39. data/spec/rackspace/requests/servers/list_images_spec.rb +0 -15
  40. data/spec/rackspace/requests/servers/list_private_addresses_spec.rb +0 -32
  41. data/spec/rackspace/requests/servers/list_public_addresses_spec.rb +0 -32
  42. data/spec/rackspace/requests/servers/list_servers_detail_spec.rb +0 -35
  43. data/spec/rackspace/requests/servers/list_servers_spec.rb +0 -24
  44. data/spec/rackspace/requests/servers/reboot_server_spec.rb +0 -33
  45. data/spec/rackspace/requests/servers/update_server_spec.rb +0 -33
data/VERSION.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
2
  :major: 0
3
3
  :minor: 0
4
- :patch: 71
4
+ :patch: 72
5
5
  :build:
data/fog.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{fog}
8
- s.version = "0.0.71"
8
+ s.version = "0.0.72"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["geemus (Wesley Beary)"]
12
- s.date = %q{2010-04-09}
12
+ s.date = %q{2010-04-13}
13
13
  s.default_executable = %q{fog}
14
14
  s.description = %q{The Ruby cloud computing library.}
15
15
  s.email = %q{geemus@gmail.com}
@@ -328,23 +328,6 @@ Gem::Specification.new do |s|
328
328
  "spec/rackspace/requests/files/head_object_spec.rb",
329
329
  "spec/rackspace/requests/files/put_container_spec.rb",
330
330
  "spec/rackspace/requests/files/put_object_spec.rb",
331
- "spec/rackspace/requests/servers/create_image_spec.rb",
332
- "spec/rackspace/requests/servers/create_server_spec.rb",
333
- "spec/rackspace/requests/servers/delete_image_spec.rb",
334
- "spec/rackspace/requests/servers/delete_server_spec.rb",
335
- "spec/rackspace/requests/servers/get_flavor_details_spec.rb",
336
- "spec/rackspace/requests/servers/get_server_details_spec.rb",
337
- "spec/rackspace/requests/servers/list_addresses_spec.rb",
338
- "spec/rackspace/requests/servers/list_flavors_detail_spec.rb",
339
- "spec/rackspace/requests/servers/list_flavors_spec.rb",
340
- "spec/rackspace/requests/servers/list_images_detail_spec.rb",
341
- "spec/rackspace/requests/servers/list_images_spec.rb",
342
- "spec/rackspace/requests/servers/list_private_addresses_spec.rb",
343
- "spec/rackspace/requests/servers/list_public_addresses_spec.rb",
344
- "spec/rackspace/requests/servers/list_servers_detail_spec.rb",
345
- "spec/rackspace/requests/servers/list_servers_spec.rb",
346
- "spec/rackspace/requests/servers/reboot_server_spec.rb",
347
- "spec/rackspace/requests/servers/update_server_spec.rb",
348
331
  "spec/shared_examples/flavors_examples.rb",
349
332
  "spec/shared_examples/server_examples.rb",
350
333
  "spec/shared_examples/servers_examples.rb",
@@ -362,6 +345,17 @@ Gem::Specification.new do |s|
362
345
  "tests/rackspace/requests/servers/get_flavor_details_tests.rb",
363
346
  "tests/rackspace/requests/servers/get_image_details_tests.rb",
364
347
  "tests/rackspace/requests/servers/get_server_details_tests.rb",
348
+ "tests/rackspace/requests/servers/list_addresses_tests.rb",
349
+ "tests/rackspace/requests/servers/list_flavors_detail_tests.rb",
350
+ "tests/rackspace/requests/servers/list_flavors_tests.rb",
351
+ "tests/rackspace/requests/servers/list_images_detail_tests.rb",
352
+ "tests/rackspace/requests/servers/list_images_tests.rb",
353
+ "tests/rackspace/requests/servers/list_private_addresses_tests.rb",
354
+ "tests/rackspace/requests/servers/list_public_addresses_tests.rb",
355
+ "tests/rackspace/requests/servers/list_servers_detail_tests.rb",
356
+ "tests/rackspace/requests/servers/list_servers_tests.rb",
357
+ "tests/rackspace/requests/servers/reboot_server_tests.rb",
358
+ "tests/rackspace/requests/servers/update_server_tests.rb",
365
359
  "tests/slicehost/helper.rb",
366
360
  "tests/slicehost/requests/create_slice_tests.rb",
367
361
  "tests/slicehost/requests/delete_slice_tests.rb",
@@ -462,23 +456,6 @@ Gem::Specification.new do |s|
462
456
  "spec/rackspace/requests/files/head_object_spec.rb",
463
457
  "spec/rackspace/requests/files/put_container_spec.rb",
464
458
  "spec/rackspace/requests/files/put_object_spec.rb",
465
- "spec/rackspace/requests/servers/create_image_spec.rb",
466
- "spec/rackspace/requests/servers/create_server_spec.rb",
467
- "spec/rackspace/requests/servers/delete_image_spec.rb",
468
- "spec/rackspace/requests/servers/delete_server_spec.rb",
469
- "spec/rackspace/requests/servers/get_flavor_details_spec.rb",
470
- "spec/rackspace/requests/servers/get_server_details_spec.rb",
471
- "spec/rackspace/requests/servers/list_addresses_spec.rb",
472
- "spec/rackspace/requests/servers/list_flavors_detail_spec.rb",
473
- "spec/rackspace/requests/servers/list_flavors_spec.rb",
474
- "spec/rackspace/requests/servers/list_images_detail_spec.rb",
475
- "spec/rackspace/requests/servers/list_images_spec.rb",
476
- "spec/rackspace/requests/servers/list_private_addresses_spec.rb",
477
- "spec/rackspace/requests/servers/list_public_addresses_spec.rb",
478
- "spec/rackspace/requests/servers/list_servers_detail_spec.rb",
479
- "spec/rackspace/requests/servers/list_servers_spec.rb",
480
- "spec/rackspace/requests/servers/reboot_server_spec.rb",
481
- "spec/rackspace/requests/servers/update_server_spec.rb",
482
459
  "spec/shared_examples/flavors_examples.rb",
483
460
  "spec/shared_examples/server_examples.rb",
484
461
  "spec/shared_examples/servers_examples.rb",
data/lib/fog/aws/ec2.rb CHANGED
@@ -4,52 +4,55 @@ module Fog
4
4
 
5
5
  def self.new(options={})
6
6
 
7
- require 'fog/aws/models/ec2/address'
8
- require 'fog/aws/models/ec2/addresses'
9
- require 'fog/aws/models/ec2/flavor'
10
- require 'fog/aws/models/ec2/flavors'
11
- require 'fog/aws/models/ec2/image'
12
- require 'fog/aws/models/ec2/images'
13
- require 'fog/aws/models/ec2/key_pair'
14
- require 'fog/aws/models/ec2/key_pairs'
15
- require 'fog/aws/models/ec2/security_group'
16
- require 'fog/aws/models/ec2/security_groups'
17
- require 'fog/aws/models/ec2/server'
18
- require 'fog/aws/models/ec2/servers'
19
- require 'fog/aws/models/ec2/snapshot'
20
- require 'fog/aws/models/ec2/snapshots'
21
- require 'fog/aws/models/ec2/volume'
22
- require 'fog/aws/models/ec2/volumes'
23
- require 'fog/aws/requests/ec2/allocate_address'
24
- require 'fog/aws/requests/ec2/associate_address'
25
- require 'fog/aws/requests/ec2/attach_volume'
26
- require 'fog/aws/requests/ec2/authorize_security_group_ingress'
27
- require 'fog/aws/requests/ec2/create_key_pair'
28
- require 'fog/aws/requests/ec2/create_security_group'
29
- require 'fog/aws/requests/ec2/create_snapshot'
30
- require 'fog/aws/requests/ec2/create_volume'
31
- require 'fog/aws/requests/ec2/delete_key_pair'
32
- require 'fog/aws/requests/ec2/delete_security_group'
33
- require 'fog/aws/requests/ec2/delete_snapshot'
34
- require 'fog/aws/requests/ec2/delete_volume'
35
- require 'fog/aws/requests/ec2/describe_addresses'
36
- require 'fog/aws/requests/ec2/describe_availability_zones'
37
- require 'fog/aws/requests/ec2/describe_images'
38
- require 'fog/aws/requests/ec2/describe_instances'
39
- require 'fog/aws/requests/ec2/describe_reserved_instances'
40
- require 'fog/aws/requests/ec2/describe_key_pairs'
41
- require 'fog/aws/requests/ec2/describe_regions'
42
- require 'fog/aws/requests/ec2/describe_security_groups'
43
- require 'fog/aws/requests/ec2/describe_snapshots'
44
- require 'fog/aws/requests/ec2/describe_volumes'
45
- require 'fog/aws/requests/ec2/detach_volume'
46
- require 'fog/aws/requests/ec2/disassociate_address'
47
- require 'fog/aws/requests/ec2/get_console_output'
48
- require 'fog/aws/requests/ec2/reboot_instances'
49
- require 'fog/aws/requests/ec2/release_address'
50
- require 'fog/aws/requests/ec2/revoke_security_group_ingress'
51
- require 'fog/aws/requests/ec2/run_instances'
52
- require 'fog/aws/requests/ec2/terminate_instances'
7
+ unless @required
8
+ require 'fog/aws/models/ec2/address'
9
+ require 'fog/aws/models/ec2/addresses'
10
+ require 'fog/aws/models/ec2/flavor'
11
+ require 'fog/aws/models/ec2/flavors'
12
+ require 'fog/aws/models/ec2/image'
13
+ require 'fog/aws/models/ec2/images'
14
+ require 'fog/aws/models/ec2/key_pair'
15
+ require 'fog/aws/models/ec2/key_pairs'
16
+ require 'fog/aws/models/ec2/security_group'
17
+ require 'fog/aws/models/ec2/security_groups'
18
+ require 'fog/aws/models/ec2/server'
19
+ require 'fog/aws/models/ec2/servers'
20
+ require 'fog/aws/models/ec2/snapshot'
21
+ require 'fog/aws/models/ec2/snapshots'
22
+ require 'fog/aws/models/ec2/volume'
23
+ require 'fog/aws/models/ec2/volumes'
24
+ require 'fog/aws/requests/ec2/allocate_address'
25
+ require 'fog/aws/requests/ec2/associate_address'
26
+ require 'fog/aws/requests/ec2/attach_volume'
27
+ require 'fog/aws/requests/ec2/authorize_security_group_ingress'
28
+ require 'fog/aws/requests/ec2/create_key_pair'
29
+ require 'fog/aws/requests/ec2/create_security_group'
30
+ require 'fog/aws/requests/ec2/create_snapshot'
31
+ require 'fog/aws/requests/ec2/create_volume'
32
+ require 'fog/aws/requests/ec2/delete_key_pair'
33
+ require 'fog/aws/requests/ec2/delete_security_group'
34
+ require 'fog/aws/requests/ec2/delete_snapshot'
35
+ require 'fog/aws/requests/ec2/delete_volume'
36
+ require 'fog/aws/requests/ec2/describe_addresses'
37
+ require 'fog/aws/requests/ec2/describe_availability_zones'
38
+ require 'fog/aws/requests/ec2/describe_images'
39
+ require 'fog/aws/requests/ec2/describe_instances'
40
+ require 'fog/aws/requests/ec2/describe_reserved_instances'
41
+ require 'fog/aws/requests/ec2/describe_key_pairs'
42
+ require 'fog/aws/requests/ec2/describe_regions'
43
+ require 'fog/aws/requests/ec2/describe_security_groups'
44
+ require 'fog/aws/requests/ec2/describe_snapshots'
45
+ require 'fog/aws/requests/ec2/describe_volumes'
46
+ require 'fog/aws/requests/ec2/detach_volume'
47
+ require 'fog/aws/requests/ec2/disassociate_address'
48
+ require 'fog/aws/requests/ec2/get_console_output'
49
+ require 'fog/aws/requests/ec2/reboot_instances'
50
+ require 'fog/aws/requests/ec2/release_address'
51
+ require 'fog/aws/requests/ec2/revoke_security_group_ingress'
52
+ require 'fog/aws/requests/ec2/run_instances'
53
+ require 'fog/aws/requests/ec2/terminate_instances'
54
+ @required = true
55
+ end
53
56
 
54
57
  unless options[:aws_access_key_id]
55
58
  raise ArgumentError.new('aws_access_key_id is required to access ec2')
data/lib/fog/aws/requests/ec2/describe_instances.rb CHANGED
@@ -77,7 +77,7 @@ module Fog
77
77
  if Time.now - instance['launchTime'] > Fog::Mock::DELAY
78
78
  instance['dnsName'] = "ec2-#{Fog::AWS::Mock.ip_address.gsub('.','-')}.compute-1.amazonaws.com"
79
79
  instance['privateIpAddress'] = Fog::AWS::Mock.ip_address
80
- instance['privateDnsName'] = "ip-#{instance['privateDnsName'].gsub('.','-')}.ec2.internal"
80
+ instance['privateDnsName'] = "ip-#{instance['privateIpAddress'].gsub('.','-')}.ec2.internal"
81
81
  instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
82
82
  end
83
83
  when 'rebooting'
data/lib/fog/aws/requests/ec2/terminate_instances.rb CHANGED
@@ -47,7 +47,7 @@ module Fog
47
47
  instance = @data[:instances][id]
48
48
  @data[:deleted_at][id] = Time.now
49
49
  # TODO: the codes are mostly educated guessing, not certainty
50
- code = case instance['state']
50
+ code = case instance['instanceState']['name']
51
51
  when 'pending'
52
52
  0
53
53
  when 'running'
data/lib/fog/aws/s3.rb CHANGED
@@ -4,22 +4,25 @@ module Fog
4
4
 
5
5
  def self.new(options={})
6
6
 
7
- require 'fog/aws/models/s3/directories'
8
- require 'fog/aws/models/s3/directory'
9
- require 'fog/aws/models/s3/files'
10
- require 'fog/aws/models/s3/file'
11
- require 'fog/aws/requests/s3/copy_object'
12
- require 'fog/aws/requests/s3/delete_bucket'
13
- require 'fog/aws/requests/s3/delete_object'
14
- require 'fog/aws/requests/s3/get_bucket'
15
- require 'fog/aws/requests/s3/get_bucket_location'
16
- require 'fog/aws/requests/s3/get_object'
17
- require 'fog/aws/requests/s3/get_request_payment'
18
- require 'fog/aws/requests/s3/get_service'
19
- require 'fog/aws/requests/s3/head_object'
20
- require 'fog/aws/requests/s3/put_bucket'
21
- require 'fog/aws/requests/s3/put_object'
22
- require 'fog/aws/requests/s3/put_request_payment'
7
+ unless @required
8
+ require 'fog/aws/models/s3/directories'
9
+ require 'fog/aws/models/s3/directory'
10
+ require 'fog/aws/models/s3/files'
11
+ require 'fog/aws/models/s3/file'
12
+ require 'fog/aws/requests/s3/copy_object'
13
+ require 'fog/aws/requests/s3/delete_bucket'
14
+ require 'fog/aws/requests/s3/delete_object'
15
+ require 'fog/aws/requests/s3/get_bucket'
16
+ require 'fog/aws/requests/s3/get_bucket_location'
17
+ require 'fog/aws/requests/s3/get_object'
18
+ require 'fog/aws/requests/s3/get_request_payment'
19
+ require 'fog/aws/requests/s3/get_service'
20
+ require 'fog/aws/requests/s3/head_object'
21
+ require 'fog/aws/requests/s3/put_bucket'
22
+ require 'fog/aws/requests/s3/put_object'
23
+ require 'fog/aws/requests/s3/put_request_payment'
24
+ @required = true
25
+ end
23
26
 
24
27
  if Fog.mocking?
25
28
  Fog::AWS::S3::Mock.new(options)
data/lib/fog/aws/simpledb.rb CHANGED
@@ -4,15 +4,18 @@ module Fog
4
4
 
5
5
  def self.new(options={})
6
6
 
7
- require 'fog/aws/requests/simpledb/batch_put_attributes'
8
- require 'fog/aws/requests/simpledb/create_domain'
9
- require 'fog/aws/requests/simpledb/delete_attributes'
10
- require 'fog/aws/requests/simpledb/delete_domain'
11
- require 'fog/aws/requests/simpledb/domain_metadata'
12
- require 'fog/aws/requests/simpledb/get_attributes'
13
- require 'fog/aws/requests/simpledb/list_domains'
14
- require 'fog/aws/requests/simpledb/put_attributes'
15
- require 'fog/aws/requests/simpledb/select'
7
+ unless @required
8
+ require 'fog/aws/requests/simpledb/batch_put_attributes'
9
+ require 'fog/aws/requests/simpledb/create_domain'
10
+ require 'fog/aws/requests/simpledb/delete_attributes'
11
+ require 'fog/aws/requests/simpledb/delete_domain'
12
+ require 'fog/aws/requests/simpledb/domain_metadata'
13
+ require 'fog/aws/requests/simpledb/get_attributes'
14
+ require 'fog/aws/requests/simpledb/list_domains'
15
+ require 'fog/aws/requests/simpledb/put_attributes'
16
+ require 'fog/aws/requests/simpledb/select'
17
+ @required = true
18
+ end
16
19
 
17
20
  if Fog.mocking?
18
21
  Fog::AWS::SimpleDB::Mock.new(options)
data/lib/fog/rackspace/files.rb CHANGED
@@ -4,20 +4,23 @@ module Fog
4
4
 
5
5
  def self.new(options={})
6
6
 
7
- require 'fog/rackspace/models/files/directory'
8
- require 'fog/rackspace/models/files/directories'
9
- require 'fog/rackspace/models/files/file'
10
- require 'fog/rackspace/models/files/files'
11
- require 'fog/rackspace/requests/files/delete_container'
12
- require 'fog/rackspace/requests/files/delete_object'
13
- require 'fog/rackspace/requests/files/get_container'
14
- require 'fog/rackspace/requests/files/get_containers'
15
- require 'fog/rackspace/requests/files/get_object'
16
- require 'fog/rackspace/requests/files/head_container'
17
- require 'fog/rackspace/requests/files/head_containers'
18
- require 'fog/rackspace/requests/files/head_object'
19
- require 'fog/rackspace/requests/files/put_container'
20
- require 'fog/rackspace/requests/files/put_object'
7
+ unless @required
8
+ require 'fog/rackspace/models/files/directory'
9
+ require 'fog/rackspace/models/files/directories'
10
+ require 'fog/rackspace/models/files/file'
11
+ require 'fog/rackspace/models/files/files'
12
+ require 'fog/rackspace/requests/files/delete_container'
13
+ require 'fog/rackspace/requests/files/delete_object'
14
+ require 'fog/rackspace/requests/files/get_container'
15
+ require 'fog/rackspace/requests/files/get_containers'
16
+ require 'fog/rackspace/requests/files/get_object'
17
+ require 'fog/rackspace/requests/files/head_container'
18
+ require 'fog/rackspace/requests/files/head_containers'
19
+ require 'fog/rackspace/requests/files/head_object'
20
+ require 'fog/rackspace/requests/files/put_container'
21
+ require 'fog/rackspace/requests/files/put_object'
22
+ @required = true
23
+ end
21
24
 
22
25
  if Fog.mocking?
23
26
  Fog::Rackspace::Files::Mock.new(options)
data/lib/fog/rackspace/servers.rb CHANGED
@@ -4,30 +4,33 @@ module Fog
4
4
 
5
5
  def self.new(options={})
6
6
 
7
- require 'fog/rackspace/models/servers/flavor'
8
- require 'fog/rackspace/models/servers/flavors'
9
- require 'fog/rackspace/models/servers/image'
10
- require 'fog/rackspace/models/servers/images'
11
- require 'fog/rackspace/models/servers/server'
12
- require 'fog/rackspace/models/servers/servers'
13
- require 'fog/rackspace/requests/servers/create_image'
14
- require 'fog/rackspace/requests/servers/create_server'
15
- require 'fog/rackspace/requests/servers/delete_image'
16
- require 'fog/rackspace/requests/servers/delete_server'
17
- require 'fog/rackspace/requests/servers/get_flavor_details'
18
- require 'fog/rackspace/requests/servers/get_image_details'
19
- require 'fog/rackspace/requests/servers/get_server_details'
20
- require 'fog/rackspace/requests/servers/list_addresses'
21
- require 'fog/rackspace/requests/servers/list_private_addresses'
22
- require 'fog/rackspace/requests/servers/list_public_addresses'
23
- require 'fog/rackspace/requests/servers/list_flavors'
24
- require 'fog/rackspace/requests/servers/list_flavors_detail'
25
- require 'fog/rackspace/requests/servers/list_images'
26
- require 'fog/rackspace/requests/servers/list_images_detail'
27
- require 'fog/rackspace/requests/servers/list_servers'
28
- require 'fog/rackspace/requests/servers/list_servers_detail'
29
- require 'fog/rackspace/requests/servers/reboot_server'
30
- require 'fog/rackspace/requests/servers/update_server'
7
+ unless @required
8
+ require 'fog/rackspace/models/servers/flavor'
9
+ require 'fog/rackspace/models/servers/flavors'
10
+ require 'fog/rackspace/models/servers/image'
11
+ require 'fog/rackspace/models/servers/images'
12
+ require 'fog/rackspace/models/servers/server'
13
+ require 'fog/rackspace/models/servers/servers'
14
+ require 'fog/rackspace/requests/servers/create_image'
15
+ require 'fog/rackspace/requests/servers/create_server'
16
+ require 'fog/rackspace/requests/servers/delete_image'
17
+ require 'fog/rackspace/requests/servers/delete_server'
18
+ require 'fog/rackspace/requests/servers/get_flavor_details'
19
+ require 'fog/rackspace/requests/servers/get_image_details'
20
+ require 'fog/rackspace/requests/servers/get_server_details'
21
+ require 'fog/rackspace/requests/servers/list_addresses'
22
+ require 'fog/rackspace/requests/servers/list_private_addresses'
23
+ require 'fog/rackspace/requests/servers/list_public_addresses'
24
+ require 'fog/rackspace/requests/servers/list_flavors'
25
+ require 'fog/rackspace/requests/servers/list_flavors_detail'
26
+ require 'fog/rackspace/requests/servers/list_images'
27
+ require 'fog/rackspace/requests/servers/list_images_detail'
28
+ require 'fog/rackspace/requests/servers/list_servers'
29
+ require 'fog/rackspace/requests/servers/list_servers_detail'
30
+ require 'fog/rackspace/requests/servers/reboot_server'
31
+ require 'fog/rackspace/requests/servers/update_server'
32
+ @required = true
33
+ end
31
34
 
32
35
  if Fog.mocking?
33
36
  Fog::Rackspace::Servers::Mock.new(options)
data/lib/fog/slicehost.rb CHANGED
@@ -3,22 +3,25 @@ module Fog
3
3
 
4
4
  def self.new(options={})
5
5
 
6
- require 'fog/slicehost/models/flavor'
7
- require 'fog/slicehost/models/flavors'
8
- require 'fog/slicehost/models/image'
9
- require 'fog/slicehost/models/images'
10
- require 'fog/slicehost/models/server'
11
- require 'fog/slicehost/models/servers'
12
- require 'fog/slicehost/requests/create_slice'
13
- require 'fog/slicehost/requests/delete_slice'
14
- require 'fog/slicehost/requests/get_backups'
15
- require 'fog/slicehost/requests/get_flavor'
16
- require 'fog/slicehost/requests/get_flavors'
17
- require 'fog/slicehost/requests/get_image'
18
- require 'fog/slicehost/requests/get_images'
19
- require 'fog/slicehost/requests/get_slice'
20
- require 'fog/slicehost/requests/get_slices'
21
- require 'fog/slicehost/requests/reboot_slice'
6
+ unless @required
7
+ require 'fog/slicehost/models/flavor'
8
+ require 'fog/slicehost/models/flavors'
9
+ require 'fog/slicehost/models/image'
10
+ require 'fog/slicehost/models/images'
11
+ require 'fog/slicehost/models/server'
12
+ require 'fog/slicehost/models/servers'
13
+ require 'fog/slicehost/requests/create_slice'
14
+ require 'fog/slicehost/requests/delete_slice'
15
+ require 'fog/slicehost/requests/get_backups'
16
+ require 'fog/slicehost/requests/get_flavor'
17
+ require 'fog/slicehost/requests/get_flavors'
18
+ require 'fog/slicehost/requests/get_image'
19
+ require 'fog/slicehost/requests/get_images'
20
+ require 'fog/slicehost/requests/get_slice'
21
+ require 'fog/slicehost/requests/get_slices'
22
+ require 'fog/slicehost/requests/reboot_slice'
23
+ @required = true
24
+ end
22
25
 
23
26
  unless options[:slicehost_password]
24
27
  raise ArgumentError.new('slicehost_password is required to access slicehost')
data/lib/fog/terremark.rb CHANGED
@@ -3,28 +3,31 @@ module Fog
3
3
 
4
4
  def self.new(options={})
5
5
 
6
- require 'fog/terremark/requests/add_internet_service'
7
- require 'fog/terremark/requests/add_node_service'
8
- require 'fog/terremark/requests/create_internet_service'
9
- require 'fog/terremark/requests/delete_internet_service'
10
- require 'fog/terremark/requests/delete_node_service'
11
- require 'fog/terremark/requests/delete_vapp'
12
- require 'fog/terremark/requests/deploy_vapp'
13
- require 'fog/terremark/requests/get_catalog'
14
- require 'fog/terremark/requests/get_catalog_item'
15
- require 'fog/terremark/requests/get_organization'
16
- require 'fog/terremark/requests/get_organizations'
17
- require 'fog/terremark/requests/get_public_ips'
18
- require 'fog/terremark/requests/get_task'
19
- require 'fog/terremark/requests/get_tasks_list'
20
- require 'fog/terremark/requests/get_vapp'
21
- require 'fog/terremark/requests/get_vapp_template'
22
- require 'fog/terremark/requests/get_vdc'
23
- require 'fog/terremark/requests/instantiate_vapp_template'
24
- require 'fog/terremark/requests/reset'
25
- require 'fog/terremark/requests/power_off'
26
- require 'fog/terremark/requests/power_on'
27
- require 'fog/terremark/requests/shutdown'
6
+ unless @required
7
+ require 'fog/terremark/requests/add_internet_service'
8
+ require 'fog/terremark/requests/add_node_service'
9
+ require 'fog/terremark/requests/create_internet_service'
10
+ require 'fog/terremark/requests/delete_internet_service'
11
+ require 'fog/terremark/requests/delete_node_service'
12
+ require 'fog/terremark/requests/delete_vapp'
13
+ require 'fog/terremark/requests/deploy_vapp'
14
+ require 'fog/terremark/requests/get_catalog'
15
+ require 'fog/terremark/requests/get_catalog_item'
16
+ require 'fog/terremark/requests/get_organization'
17
+ require 'fog/terremark/requests/get_organizations'
18
+ require 'fog/terremark/requests/get_public_ips'
19
+ require 'fog/terremark/requests/get_task'
20
+ require 'fog/terremark/requests/get_tasks_list'
21
+ require 'fog/terremark/requests/get_vapp'
22
+ require 'fog/terremark/requests/get_vapp_template'
23
+ require 'fog/terremark/requests/get_vdc'
24
+ require 'fog/terremark/requests/instantiate_vapp_template'
25
+ require 'fog/terremark/requests/reset'
26
+ require 'fog/terremark/requests/power_off'
27
+ require 'fog/terremark/requests/power_on'
28
+ require 'fog/terremark/requests/shutdown'
29
+ @required = true
30
+ end
28
31
 
29
32
  unless options[:terremark_password]
30
33
  raise ArgumentError.new('terremark_password is required to access terremark')