fog 0.0.71 → 0.0.72

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 71
+:patch: 72
 :build: 

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.71"
+  s.version = "0.0.72"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-04-09}
+  s.date = %q{2010-04-13}
   s.default_executable = %q{fog}
   s.description = %q{The Ruby cloud computing library.}
   s.email = %q{geemus@gmail.com}
@@ -328,23 +328,6 @@ Gem::Specification.new do |s|
     "spec/rackspace/requests/files/head_object_spec.rb",
     "spec/rackspace/requests/files/put_container_spec.rb",
     "spec/rackspace/requests/files/put_object_spec.rb",
-    "spec/rackspace/requests/servers/create_image_spec.rb",
-    "spec/rackspace/requests/servers/create_server_spec.rb",
-    "spec/rackspace/requests/servers/delete_image_spec.rb",
-    "spec/rackspace/requests/servers/delete_server_spec.rb",
-    "spec/rackspace/requests/servers/get_flavor_details_spec.rb",
-    "spec/rackspace/requests/servers/get_server_details_spec.rb",
-    "spec/rackspace/requests/servers/list_addresses_spec.rb",
-    "spec/rackspace/requests/servers/list_flavors_detail_spec.rb",
-    "spec/rackspace/requests/servers/list_flavors_spec.rb",
-    "spec/rackspace/requests/servers/list_images_detail_spec.rb",
-    "spec/rackspace/requests/servers/list_images_spec.rb",
-    "spec/rackspace/requests/servers/list_private_addresses_spec.rb",
-    "spec/rackspace/requests/servers/list_public_addresses_spec.rb",
-    "spec/rackspace/requests/servers/list_servers_detail_spec.rb",
-    "spec/rackspace/requests/servers/list_servers_spec.rb",
-    "spec/rackspace/requests/servers/reboot_server_spec.rb",
-    "spec/rackspace/requests/servers/update_server_spec.rb",
     "spec/shared_examples/flavors_examples.rb",
     "spec/shared_examples/server_examples.rb",
     "spec/shared_examples/servers_examples.rb",
@@ -362,6 +345,17 @@ Gem::Specification.new do |s|
     "tests/rackspace/requests/servers/get_flavor_details_tests.rb",
     "tests/rackspace/requests/servers/get_image_details_tests.rb",
     "tests/rackspace/requests/servers/get_server_details_tests.rb",
+    "tests/rackspace/requests/servers/list_addresses_tests.rb",
+    "tests/rackspace/requests/servers/list_flavors_detail_tests.rb",
+    "tests/rackspace/requests/servers/list_flavors_tests.rb",
+    "tests/rackspace/requests/servers/list_images_detail_tests.rb",
+    "tests/rackspace/requests/servers/list_images_tests.rb",
+    "tests/rackspace/requests/servers/list_private_addresses_tests.rb",
+    "tests/rackspace/requests/servers/list_public_addresses_tests.rb",
+    "tests/rackspace/requests/servers/list_servers_detail_tests.rb",
+    "tests/rackspace/requests/servers/list_servers_tests.rb",
+    "tests/rackspace/requests/servers/reboot_server_tests.rb",
+    "tests/rackspace/requests/servers/update_server_tests.rb",
     "tests/slicehost/helper.rb",
     "tests/slicehost/requests/create_slice_tests.rb",
     "tests/slicehost/requests/delete_slice_tests.rb",
@@ -462,23 +456,6 @@ Gem::Specification.new do |s|
     "spec/rackspace/requests/files/head_object_spec.rb",
     "spec/rackspace/requests/files/put_container_spec.rb",
     "spec/rackspace/requests/files/put_object_spec.rb",
-    "spec/rackspace/requests/servers/create_image_spec.rb",
-    "spec/rackspace/requests/servers/create_server_spec.rb",
-    "spec/rackspace/requests/servers/delete_image_spec.rb",
-    "spec/rackspace/requests/servers/delete_server_spec.rb",
-    "spec/rackspace/requests/servers/get_flavor_details_spec.rb",
-    "spec/rackspace/requests/servers/get_server_details_spec.rb",
-    "spec/rackspace/requests/servers/list_addresses_spec.rb",
-    "spec/rackspace/requests/servers/list_flavors_detail_spec.rb",
-    "spec/rackspace/requests/servers/list_flavors_spec.rb",
-    "spec/rackspace/requests/servers/list_images_detail_spec.rb",
-    "spec/rackspace/requests/servers/list_images_spec.rb",
-    "spec/rackspace/requests/servers/list_private_addresses_spec.rb",
-    "spec/rackspace/requests/servers/list_public_addresses_spec.rb",
-    "spec/rackspace/requests/servers/list_servers_detail_spec.rb",
-    "spec/rackspace/requests/servers/list_servers_spec.rb",
-    "spec/rackspace/requests/servers/reboot_server_spec.rb",
-    "spec/rackspace/requests/servers/update_server_spec.rb",
     "spec/shared_examples/flavors_examples.rb",
     "spec/shared_examples/server_examples.rb",
     "spec/shared_examples/servers_examples.rb",

data/lib/fog/aws/ec2.rb

@@ -4,52 +4,55 @@ module Fog
 
       def self.new(options={})
 
-        require 'fog/aws/models/ec2/address'
-        require 'fog/aws/models/ec2/addresses'
-        require 'fog/aws/models/ec2/flavor'
-        require 'fog/aws/models/ec2/flavors'
-        require 'fog/aws/models/ec2/image'
-        require 'fog/aws/models/ec2/images'
-        require 'fog/aws/models/ec2/key_pair'
-        require 'fog/aws/models/ec2/key_pairs'
-        require 'fog/aws/models/ec2/security_group'
-        require 'fog/aws/models/ec2/security_groups'
-        require 'fog/aws/models/ec2/server'
-        require 'fog/aws/models/ec2/servers'
-        require 'fog/aws/models/ec2/snapshot'
-        require 'fog/aws/models/ec2/snapshots'
-        require 'fog/aws/models/ec2/volume'
-        require 'fog/aws/models/ec2/volumes'
-        require 'fog/aws/requests/ec2/allocate_address'
-        require 'fog/aws/requests/ec2/associate_address'
-        require 'fog/aws/requests/ec2/attach_volume'
-        require 'fog/aws/requests/ec2/authorize_security_group_ingress'
-        require 'fog/aws/requests/ec2/create_key_pair'
-        require 'fog/aws/requests/ec2/create_security_group'
-        require 'fog/aws/requests/ec2/create_snapshot'
-        require 'fog/aws/requests/ec2/create_volume'
-        require 'fog/aws/requests/ec2/delete_key_pair'
-        require 'fog/aws/requests/ec2/delete_security_group'
-        require 'fog/aws/requests/ec2/delete_snapshot'
-        require 'fog/aws/requests/ec2/delete_volume'
-        require 'fog/aws/requests/ec2/describe_addresses'
-        require 'fog/aws/requests/ec2/describe_availability_zones'
-        require 'fog/aws/requests/ec2/describe_images'
-        require 'fog/aws/requests/ec2/describe_instances'
-        require 'fog/aws/requests/ec2/describe_reserved_instances'
-        require 'fog/aws/requests/ec2/describe_key_pairs'
-        require 'fog/aws/requests/ec2/describe_regions'
-        require 'fog/aws/requests/ec2/describe_security_groups'
-        require 'fog/aws/requests/ec2/describe_snapshots'
-        require 'fog/aws/requests/ec2/describe_volumes'
-        require 'fog/aws/requests/ec2/detach_volume'
-        require 'fog/aws/requests/ec2/disassociate_address'
-        require 'fog/aws/requests/ec2/get_console_output'
-        require 'fog/aws/requests/ec2/reboot_instances'
-        require 'fog/aws/requests/ec2/release_address'
-        require 'fog/aws/requests/ec2/revoke_security_group_ingress'
-        require 'fog/aws/requests/ec2/run_instances'
-        require 'fog/aws/requests/ec2/terminate_instances'
+        unless @required
+          require 'fog/aws/models/ec2/address'
+          require 'fog/aws/models/ec2/addresses'
+          require 'fog/aws/models/ec2/flavor'
+          require 'fog/aws/models/ec2/flavors'
+          require 'fog/aws/models/ec2/image'
+          require 'fog/aws/models/ec2/images'
+          require 'fog/aws/models/ec2/key_pair'
+          require 'fog/aws/models/ec2/key_pairs'
+          require 'fog/aws/models/ec2/security_group'
+          require 'fog/aws/models/ec2/security_groups'
+          require 'fog/aws/models/ec2/server'
+          require 'fog/aws/models/ec2/servers'
+          require 'fog/aws/models/ec2/snapshot'
+          require 'fog/aws/models/ec2/snapshots'
+          require 'fog/aws/models/ec2/volume'
+          require 'fog/aws/models/ec2/volumes'
+          require 'fog/aws/requests/ec2/allocate_address'
+          require 'fog/aws/requests/ec2/associate_address'
+          require 'fog/aws/requests/ec2/attach_volume'
+          require 'fog/aws/requests/ec2/authorize_security_group_ingress'
+          require 'fog/aws/requests/ec2/create_key_pair'
+          require 'fog/aws/requests/ec2/create_security_group'
+          require 'fog/aws/requests/ec2/create_snapshot'
+          require 'fog/aws/requests/ec2/create_volume'
+          require 'fog/aws/requests/ec2/delete_key_pair'
+          require 'fog/aws/requests/ec2/delete_security_group'
+          require 'fog/aws/requests/ec2/delete_snapshot'
+          require 'fog/aws/requests/ec2/delete_volume'
+          require 'fog/aws/requests/ec2/describe_addresses'
+          require 'fog/aws/requests/ec2/describe_availability_zones'
+          require 'fog/aws/requests/ec2/describe_images'
+          require 'fog/aws/requests/ec2/describe_instances'
+          require 'fog/aws/requests/ec2/describe_reserved_instances'
+          require 'fog/aws/requests/ec2/describe_key_pairs'
+          require 'fog/aws/requests/ec2/describe_regions'
+          require 'fog/aws/requests/ec2/describe_security_groups'
+          require 'fog/aws/requests/ec2/describe_snapshots'
+          require 'fog/aws/requests/ec2/describe_volumes'
+          require 'fog/aws/requests/ec2/detach_volume'
+          require 'fog/aws/requests/ec2/disassociate_address'
+          require 'fog/aws/requests/ec2/get_console_output'
+          require 'fog/aws/requests/ec2/reboot_instances'
+          require 'fog/aws/requests/ec2/release_address'
+          require 'fog/aws/requests/ec2/revoke_security_group_ingress'
+          require 'fog/aws/requests/ec2/run_instances'
+          require 'fog/aws/requests/ec2/terminate_instances'
+          @required = true
+        end
 
         unless options[:aws_access_key_id]
           raise ArgumentError.new('aws_access_key_id is required to access ec2')

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -77,7 +77,7 @@ module Fog
               if Time.now - instance['launchTime'] > Fog::Mock::DELAY
                 instance['dnsName']           = "ec2-#{Fog::AWS::Mock.ip_address.gsub('.','-')}.compute-1.amazonaws.com"
                 instance['privateIpAddress']  = Fog::AWS::Mock.ip_address
-                instance['privateDnsName']    = "ip-#{instance['privateDnsName'].gsub('.','-')}.ec2.internal"
+                instance['privateDnsName']    = "ip-#{instance['privateIpAddress'].gsub('.','-')}.ec2.internal"
                 instance['instanceState']     = { 'code' => 16, 'name' => 'running' }
               end
             when 'rebooting'

data/lib/fog/aws/requests/ec2/terminate_instances.rb

@@ -47,7 +47,7 @@ module Fog
               instance = @data[:instances][id]
               @data[:deleted_at][id] = Time.now
               # TODO: the codes are mostly educated guessing, not certainty
-              code = case instance['state']
+              code = case instance['instanceState']['name']
               when 'pending'
                 0
               when 'running'

data/lib/fog/aws/s3.rb

@@ -4,22 +4,25 @@ module Fog
 
       def self.new(options={})
 
-        require 'fog/aws/models/s3/directories'
-        require 'fog/aws/models/s3/directory'
-        require 'fog/aws/models/s3/files'
-        require 'fog/aws/models/s3/file'
-        require 'fog/aws/requests/s3/copy_object'
-        require 'fog/aws/requests/s3/delete_bucket'
-        require 'fog/aws/requests/s3/delete_object'
-        require 'fog/aws/requests/s3/get_bucket'
-        require 'fog/aws/requests/s3/get_bucket_location'
-        require 'fog/aws/requests/s3/get_object'
-        require 'fog/aws/requests/s3/get_request_payment'
-        require 'fog/aws/requests/s3/get_service'
-        require 'fog/aws/requests/s3/head_object'
-        require 'fog/aws/requests/s3/put_bucket'
-        require 'fog/aws/requests/s3/put_object'
-        require 'fog/aws/requests/s3/put_request_payment'
+        unless @required
+          require 'fog/aws/models/s3/directories'
+          require 'fog/aws/models/s3/directory'
+          require 'fog/aws/models/s3/files'
+          require 'fog/aws/models/s3/file'
+          require 'fog/aws/requests/s3/copy_object'
+          require 'fog/aws/requests/s3/delete_bucket'
+          require 'fog/aws/requests/s3/delete_object'
+          require 'fog/aws/requests/s3/get_bucket'
+          require 'fog/aws/requests/s3/get_bucket_location'
+          require 'fog/aws/requests/s3/get_object'
+          require 'fog/aws/requests/s3/get_request_payment'
+          require 'fog/aws/requests/s3/get_service'
+          require 'fog/aws/requests/s3/head_object'
+          require 'fog/aws/requests/s3/put_bucket'
+          require 'fog/aws/requests/s3/put_object'
+          require 'fog/aws/requests/s3/put_request_payment'
+          @required = true
+        end
 
         if Fog.mocking?
           Fog::AWS::S3::Mock.new(options)

data/lib/fog/aws/simpledb.rb

@@ -4,15 +4,18 @@ module Fog
 
       def self.new(options={})
 
-        require 'fog/aws/requests/simpledb/batch_put_attributes'
-        require 'fog/aws/requests/simpledb/create_domain'
-        require 'fog/aws/requests/simpledb/delete_attributes'
-        require 'fog/aws/requests/simpledb/delete_domain'
-        require 'fog/aws/requests/simpledb/domain_metadata'
-        require 'fog/aws/requests/simpledb/get_attributes'
-        require 'fog/aws/requests/simpledb/list_domains'
-        require 'fog/aws/requests/simpledb/put_attributes'
-        require 'fog/aws/requests/simpledb/select'
+        unless @required
+          require 'fog/aws/requests/simpledb/batch_put_attributes'
+          require 'fog/aws/requests/simpledb/create_domain'
+          require 'fog/aws/requests/simpledb/delete_attributes'
+          require 'fog/aws/requests/simpledb/delete_domain'
+          require 'fog/aws/requests/simpledb/domain_metadata'
+          require 'fog/aws/requests/simpledb/get_attributes'
+          require 'fog/aws/requests/simpledb/list_domains'
+          require 'fog/aws/requests/simpledb/put_attributes'
+          require 'fog/aws/requests/simpledb/select'
+          @required = true
+        end
 
         if Fog.mocking?
           Fog::AWS::SimpleDB::Mock.new(options)

data/lib/fog/rackspace/files.rb

@@ -4,20 +4,23 @@ module Fog
 
       def self.new(options={})
 
-        require 'fog/rackspace/models/files/directory'
-        require 'fog/rackspace/models/files/directories'
-        require 'fog/rackspace/models/files/file'
-        require 'fog/rackspace/models/files/files'
-        require 'fog/rackspace/requests/files/delete_container'
-        require 'fog/rackspace/requests/files/delete_object'
-        require 'fog/rackspace/requests/files/get_container'
-        require 'fog/rackspace/requests/files/get_containers'
-        require 'fog/rackspace/requests/files/get_object'
-        require 'fog/rackspace/requests/files/head_container'
-        require 'fog/rackspace/requests/files/head_containers'
-        require 'fog/rackspace/requests/files/head_object'
-        require 'fog/rackspace/requests/files/put_container'
-        require 'fog/rackspace/requests/files/put_object'
+        unless @required
+          require 'fog/rackspace/models/files/directory'
+          require 'fog/rackspace/models/files/directories'
+          require 'fog/rackspace/models/files/file'
+          require 'fog/rackspace/models/files/files'
+          require 'fog/rackspace/requests/files/delete_container'
+          require 'fog/rackspace/requests/files/delete_object'
+          require 'fog/rackspace/requests/files/get_container'
+          require 'fog/rackspace/requests/files/get_containers'
+          require 'fog/rackspace/requests/files/get_object'
+          require 'fog/rackspace/requests/files/head_container'
+          require 'fog/rackspace/requests/files/head_containers'
+          require 'fog/rackspace/requests/files/head_object'
+          require 'fog/rackspace/requests/files/put_container'
+          require 'fog/rackspace/requests/files/put_object'
+          @required = true
+        end
 
         if Fog.mocking?
           Fog::Rackspace::Files::Mock.new(options)

data/lib/fog/rackspace/servers.rb

@@ -4,30 +4,33 @@ module Fog
 
       def self.new(options={})
 
-        require 'fog/rackspace/models/servers/flavor'
-        require 'fog/rackspace/models/servers/flavors'
-        require 'fog/rackspace/models/servers/image'
-        require 'fog/rackspace/models/servers/images'
-        require 'fog/rackspace/models/servers/server'
-        require 'fog/rackspace/models/servers/servers'
-        require 'fog/rackspace/requests/servers/create_image'
-        require 'fog/rackspace/requests/servers/create_server'
-        require 'fog/rackspace/requests/servers/delete_image'
-        require 'fog/rackspace/requests/servers/delete_server'
-        require 'fog/rackspace/requests/servers/get_flavor_details'
-        require 'fog/rackspace/requests/servers/get_image_details'
-        require 'fog/rackspace/requests/servers/get_server_details'
-        require 'fog/rackspace/requests/servers/list_addresses'
-        require 'fog/rackspace/requests/servers/list_private_addresses'
-        require 'fog/rackspace/requests/servers/list_public_addresses'
-        require 'fog/rackspace/requests/servers/list_flavors'
-        require 'fog/rackspace/requests/servers/list_flavors_detail'
-        require 'fog/rackspace/requests/servers/list_images'
-        require 'fog/rackspace/requests/servers/list_images_detail'
-        require 'fog/rackspace/requests/servers/list_servers'
-        require 'fog/rackspace/requests/servers/list_servers_detail'
-        require 'fog/rackspace/requests/servers/reboot_server'
-        require 'fog/rackspace/requests/servers/update_server'
+        unless @required
+          require 'fog/rackspace/models/servers/flavor'
+          require 'fog/rackspace/models/servers/flavors'
+          require 'fog/rackspace/models/servers/image'
+          require 'fog/rackspace/models/servers/images'
+          require 'fog/rackspace/models/servers/server'
+          require 'fog/rackspace/models/servers/servers'
+          require 'fog/rackspace/requests/servers/create_image'
+          require 'fog/rackspace/requests/servers/create_server'
+          require 'fog/rackspace/requests/servers/delete_image'
+          require 'fog/rackspace/requests/servers/delete_server'
+          require 'fog/rackspace/requests/servers/get_flavor_details'
+          require 'fog/rackspace/requests/servers/get_image_details'
+          require 'fog/rackspace/requests/servers/get_server_details'
+          require 'fog/rackspace/requests/servers/list_addresses'
+          require 'fog/rackspace/requests/servers/list_private_addresses'
+          require 'fog/rackspace/requests/servers/list_public_addresses'
+          require 'fog/rackspace/requests/servers/list_flavors'
+          require 'fog/rackspace/requests/servers/list_flavors_detail'
+          require 'fog/rackspace/requests/servers/list_images'
+          require 'fog/rackspace/requests/servers/list_images_detail'
+          require 'fog/rackspace/requests/servers/list_servers'
+          require 'fog/rackspace/requests/servers/list_servers_detail'
+          require 'fog/rackspace/requests/servers/reboot_server'
+          require 'fog/rackspace/requests/servers/update_server'
+          @required = true
+        end
 
         if Fog.mocking?
           Fog::Rackspace::Servers::Mock.new(options)

data/lib/fog/slicehost.rb

@@ -3,22 +3,25 @@ module Fog
 
     def self.new(options={})
 
-      require 'fog/slicehost/models/flavor'
-      require 'fog/slicehost/models/flavors'
-      require 'fog/slicehost/models/image'
-      require 'fog/slicehost/models/images'
-      require 'fog/slicehost/models/server'
-      require 'fog/slicehost/models/servers'
-      require 'fog/slicehost/requests/create_slice'
-      require 'fog/slicehost/requests/delete_slice'
-      require 'fog/slicehost/requests/get_backups'
-      require 'fog/slicehost/requests/get_flavor'
-      require 'fog/slicehost/requests/get_flavors'
-      require 'fog/slicehost/requests/get_image'
-      require 'fog/slicehost/requests/get_images'
-      require 'fog/slicehost/requests/get_slice'
-      require 'fog/slicehost/requests/get_slices'
-      require 'fog/slicehost/requests/reboot_slice'
+      unless @required
+        require 'fog/slicehost/models/flavor'
+        require 'fog/slicehost/models/flavors'
+        require 'fog/slicehost/models/image'
+        require 'fog/slicehost/models/images'
+        require 'fog/slicehost/models/server'
+        require 'fog/slicehost/models/servers'
+        require 'fog/slicehost/requests/create_slice'
+        require 'fog/slicehost/requests/delete_slice'
+        require 'fog/slicehost/requests/get_backups'
+        require 'fog/slicehost/requests/get_flavor'
+        require 'fog/slicehost/requests/get_flavors'
+        require 'fog/slicehost/requests/get_image'
+        require 'fog/slicehost/requests/get_images'
+        require 'fog/slicehost/requests/get_slice'
+        require 'fog/slicehost/requests/get_slices'
+        require 'fog/slicehost/requests/reboot_slice'
+        @required = true
+      end
 
       unless options[:slicehost_password]
         raise ArgumentError.new('slicehost_password is required to access slicehost')

data/lib/fog/terremark.rb

@@ -3,28 +3,31 @@ module Fog
 
     def self.new(options={})
 
-      require 'fog/terremark/requests/add_internet_service'
-      require 'fog/terremark/requests/add_node_service'
-      require 'fog/terremark/requests/create_internet_service'
-      require 'fog/terremark/requests/delete_internet_service'
-      require 'fog/terremark/requests/delete_node_service'
-      require 'fog/terremark/requests/delete_vapp'
-      require 'fog/terremark/requests/deploy_vapp'
-      require 'fog/terremark/requests/get_catalog'
-      require 'fog/terremark/requests/get_catalog_item'
-      require 'fog/terremark/requests/get_organization'
-      require 'fog/terremark/requests/get_organizations'
-      require 'fog/terremark/requests/get_public_ips'
-      require 'fog/terremark/requests/get_task'
-      require 'fog/terremark/requests/get_tasks_list'
-      require 'fog/terremark/requests/get_vapp'
-      require 'fog/terremark/requests/get_vapp_template'
-      require 'fog/terremark/requests/get_vdc'
-      require 'fog/terremark/requests/instantiate_vapp_template'
-      require 'fog/terremark/requests/reset'
-      require 'fog/terremark/requests/power_off'
-      require 'fog/terremark/requests/power_on'
-      require 'fog/terremark/requests/shutdown'
+      unless @required
+        require 'fog/terremark/requests/add_internet_service'
+        require 'fog/terremark/requests/add_node_service'
+        require 'fog/terremark/requests/create_internet_service'
+        require 'fog/terremark/requests/delete_internet_service'
+        require 'fog/terremark/requests/delete_node_service'
+        require 'fog/terremark/requests/delete_vapp'
+        require 'fog/terremark/requests/deploy_vapp'
+        require 'fog/terremark/requests/get_catalog'
+        require 'fog/terremark/requests/get_catalog_item'
+        require 'fog/terremark/requests/get_organization'
+        require 'fog/terremark/requests/get_organizations'
+        require 'fog/terremark/requests/get_public_ips'
+        require 'fog/terremark/requests/get_task'
+        require 'fog/terremark/requests/get_tasks_list'
+        require 'fog/terremark/requests/get_vapp'
+        require 'fog/terremark/requests/get_vapp_template'
+        require 'fog/terremark/requests/get_vdc'
+        require 'fog/terremark/requests/instantiate_vapp_template'
+        require 'fog/terremark/requests/reset'
+        require 'fog/terremark/requests/power_off'
+        require 'fog/terremark/requests/power_on'
+        require 'fog/terremark/requests/shutdown'
+        @required = true
+      end
 
       unless options[:terremark_password]
         raise ArgumentError.new('terremark_password is required to access terremark')