fog 0.8.1 → 0.8.2

data/lib/fog/compute/requests/aws/delete_key_pair.rb

@@ -15,6 +15,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteKeyPair.html]
         def delete_key_pair(key_name)
           request(
             'Action'    => 'DeleteKeyPair',
@@ -30,7 +32,7 @@ module Fog
 
         def delete_key_pair(key_name)
           response = Excon::Response.new
-          @data[:key_pairs].delete(key_name)
+          self.data[:key_pairs].delete(key_name)
           response.status = 200
           response.body = {
             'requestId' => Fog::AWS::Mock.request_id,

data/lib/fog/compute/requests/aws/delete_security_group.rb

@@ -15,6 +15,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSecurityGroup.html]
         def delete_security_group(name)
           request(
             'Action'    => 'DeleteSecurityGroup',
@@ -29,8 +31,8 @@ module Fog
       class Mock
         def delete_security_group(name)
           response = Excon::Response.new
-          if @data[:security_groups][name]
-            @data[:security_groups].delete(name)
+          if self.data[:security_groups][name]
+            self.data[:security_groups].delete(name)
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,

data/lib/fog/compute/requests/aws/delete_snapshot.rb

@@ -15,6 +15,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSnapshot.html]
         def delete_snapshot(snapshot_id)
           request(
             'Action'      => 'DeleteSnapshot',
@@ -30,7 +32,7 @@ module Fog
 
         def delete_snapshot(snapshot_id)
           response = Excon::Response.new
-          if snapshot = @data[:snapshots].delete(snapshot_id)
+          if snapshot = self.data[:snapshots].delete(snapshot_id)
             response.status = true
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,

data/lib/fog/compute/requests/aws/delete_tags.rb

@@ -16,6 +16,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteTags.html]
         def delete_tags(resources, tags)
           resources = [*resources]
           params = {}
@@ -51,7 +53,7 @@ module Fog
             when /^vol\-[a-z0-9]{8}$/i
               'volume'
             end
-            if type && @data[:"#{type}s"][resource_id]
+            if type && self.data[:"#{type}s"][resource_id]
               { 'resourceId' => resource_id, 'resourceType' => type }
             else
               raise(Fog::Service::NotFound.new("The #{type} ID '#{resource_id}' does not exist"))
@@ -59,11 +61,11 @@ module Fog
           end
           
           tags.each do |key, value|
-            @data[:tags][key][value] = @data[:tags][key][value] - tagged
+            self.data[:tags][key][value] = self.data[:tags][key][value] - tagged
           end
           
           tagged.each do |resource|
-            object = @data[:"#{resource['resourceType']}s"][resource['resourceId']]
+            object = self.data[:"#{resource['resourceType']}s"][resource['resourceId']]
             tags.each do |key, value|
               tagset = object['tagSet']
               tagset.delete(key) if tagset.has_key?(key) && (value.nil? || tagset[key] == value)

data/lib/fog/compute/requests/aws/delete_volume.rb

@@ -15,6 +15,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteVolume.html]
         def delete_volume(volume_id)
           request(
             'Action'    => 'DeleteVolume',
@@ -30,12 +32,12 @@ module Fog
 
         def delete_volume(volume_id)
           response = Excon::Response.new
-          if volume = @data[:volumes][volume_id]
+          if volume = self.data[:volumes][volume_id]
             if volume["attachmentSet"].any?
               attach = volume["attachmentSet"].first
               raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}")
             end
-            @data[:deleted_at][volume_id] = Time.now
+            self.data[:deleted_at][volume_id] = Time.now
             volume['status'] = 'deleting'
             response.status = 200
             response.body = {

data/lib/fog/compute/requests/aws/deregister_image.rb

@@ -15,6 +15,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'return'<~Boolean> - Returns true if deregistration succeeded
         #     * 'requestId'<~String> - Id of request
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeregisterImage.html]
         def deregister_image(image_id)
           request(
             'Action'      => 'DeregisterImage',

data/lib/fog/compute/requests/aws/describe_addresses.rb

@@ -17,6 +17,8 @@ module Fog
         #     * 'addressesSet'<~Array>:
         #       * 'instanceId'<~String> - instance for ip address
         #       * 'publicIp'<~String> - ip address for instance
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAddresses.html]
         def describe_addresses(filters = {})
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead[/] [light_black](#{caller.first})[/]")
@@ -42,7 +44,7 @@ module Fog
 
           response = Excon::Response.new
 
-          addresses_set = @data[:addresses].values
+          addresses_set = self.data[:addresses].values
 
           aliases = {'public-ip' => 'publicIp', 'instance-id' => 'instanceId'}
           for filter_key, filter_value in filters

data/lib/fog/compute/requests/aws/describe_availability_zones.rb

@@ -18,6 +18,8 @@ module Fog
         #       * 'regionName'<~String> - Name of region
         #       * 'zoneName'<~String> - Name of zone
         #       * 'zoneState'<~String> - State of zone
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAvailabilityZones.html]
         def describe_availability_zones(filters = {})
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead[/] [light_black](#{caller.first})[/]")

data/lib/fog/compute/requests/aws/describe_images.rb

@@ -36,6 +36,8 @@ module Fog
         #       * 'rootDeviceName'<~String> - Root device name, e.g. /dev/sda1
         #       * 'rootDeviceType'<~String> - Root device type, ebs or instance-store
         #       * 'virtualizationType'<~String> - Type of virtualization
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeImages.html]
         def describe_images(filters = {})
           options = {}
           for key in ['ExecutableBy', 'ImageId', 'Owner']
@@ -91,7 +93,7 @@ module Fog
             'virtualization-type' => 'virtualizationType'
           }
           
-          image_set = @data[:images].values
+          image_set = self.data[:images].values
           
           for filter_key, filter_value in filters
             aliased_key = aliases[filter_key]

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

@@ -50,6 +50,8 @@ module Fog
         #           * 'rootDeviceType'<~String> - root device type used by AMI in [ebs, instance-store]
         #           * 'ramdiskId'<~String> - Id of ramdisk used to launch instance
         #           * 'reason'<~String> - reason for most recent state transition, or blank
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html]
         def describe_instances(filters = {})
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead[/] [light_black](#{caller.first})[/]")
@@ -81,7 +83,7 @@ module Fog
 
           response = Excon::Response.new
 
-          instance_set = @data[:instances].values
+          instance_set = self.data[:instances].values
           instance_set = apply_tag_filters(instance_set, filters)
           
           aliases = {
@@ -154,7 +156,7 @@ module Fog
           instance_set.each do |instance|
             case instance['instanceState']['name']
             when 'pending'
-              if Time.now - instance['launchTime'] > Fog::Mock.delay
+              if Time.now - instance['launchTime'] >= Fog::Mock.delay
                 instance['ipAddress']         = Fog::AWS::Mock.ip_address
                 instance['dnsName']           = Fog::AWS::Mock.dns_name_for(instance['ipAddress'])
                 instance['privateIpAddress']  = Fog::AWS::Mock.ip_address
@@ -164,20 +166,20 @@ module Fog
             when 'rebooting'
               instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
             when 'shutting-down'
-              if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay * 2
-                @data[:deleted_at].delete(instance['instanceId'])
-                @data[:instances].delete(instance['instanceId'])
-              elsif Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
+              if Time.now - self.data[:deleted_at][instance['instanceId']] >= Fog::Mock.delay * 2
+                self.data[:deleted_at].delete(instance['instanceId'])
+                self.data[:instances].delete(instance['instanceId'])
+              elsif Time.now - self.data[:deleted_at][instance['instanceId']] >= Fog::Mock.delay
                 instance['instanceState'] = { 'code' => 48, 'name' => 'terminating' }
               end
             when 'terminating'
-              if Time.now - @data[:deleted_at][instance['instanceId']] > Fog::Mock.delay
-                @data[:deleted_at].delete(instance['instanceId'])
-                @data[:instances].delete(instance['instanceId'])
+              if Time.now - self.data[:deleted_at][instance['instanceId']] >= Fog::Mock.delay
+                self.data[:deleted_at].delete(instance['instanceId'])
+                self.data[:instances].delete(instance['instanceId'])
               end
             end
 
-            if @data[:instances][instance['instanceId']]
+            if self.data[:instances][instance['instanceId']]
 
               reservation_set[instance['reservationId']] ||= {
                 'groupSet'      => instance['groupSet'],

data/lib/fog/compute/requests/aws/describe_key_pairs.rb

@@ -17,6 +17,8 @@ module Fog
         #     * 'keySet'<~Array>:
         #       * 'keyName'<~String> - Name of key
         #       * 'keyFingerprint'<~String> - Fingerprint of key
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeKeyPairs.html]
         def describe_key_pairs(filters = {})
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead[/] [light_black](#{caller.first})[/]")
@@ -42,7 +44,7 @@ module Fog
 
           response = Excon::Response.new
 
-          key_set = @data[:key_pairs].values
+          key_set = self.data[:key_pairs].values
 
           aliases = {'fingerprint' => 'keyFingerprint', 'key-name' => 'keyName'}
           for filter_key, filter_value in filters

data/lib/fog/compute/requests/aws/describe_regions.rb

@@ -17,6 +17,8 @@ module Fog
         #     * 'regionInfo'<~Array>:
         #       * 'regionName'<~String> - Name of region
         #       * 'regionEndpoint'<~String> - Service endpoint for region
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html]
         def describe_regions(filters = {})
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead[/] [light_black](#{caller.first})[/]")

data/lib/fog/compute/requests/aws/describe_reserved_instances.rb

@@ -25,6 +25,8 @@ module Fog
         #       * 'start'<~Time> - start time for reservation
         #       * 'state'<~String> - state of reserved instance purchase, in .[pending-payment, active, payment-failed, retired]
         #       * 'usagePrice"<~Float> - usage price of reserved instances, per hour
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstances.html]
         def describe_reserved_instances(filters = {})
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] describe_reserved_instances with #{filters.class} param is deprecated, use describe_reserved_instances('reserved-instances-id' => []) instead[/] [light_black](#{caller.first})[/]")

data/lib/fog/compute/requests/aws/describe_reserved_instances_offerings.rb

@@ -22,6 +22,8 @@ module Fog
         #       * 'productDescription'<~String> - description of offering
         #       * 'reservedInstancesOfferingId'<~String> - id of offering
         #       * 'usagePrice'<~Float> - usage price of offering, per hour
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstancesOfferings.html]
         def describe_reserved_instances_offerings(filters = {})
           params = AWS.indexed_filters(filters)
           request({

data/lib/fog/compute/requests/aws/describe_security_groups.rb

@@ -27,6 +27,8 @@ module Fog
         #           * 'cidrIp'<~String> - CIDR range
         #         * 'toPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
         #       * 'ownerId'<~String> - AWS Access Key Id of the owner of the security group
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSecurityGroups.html]
         def describe_security_groups(filters = {})
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead[/] [light_black](#{caller.first})[/]")
@@ -52,7 +54,7 @@ module Fog
 
           response = Excon::Response.new
 
-          security_group_info = @data[:security_groups].values
+          security_group_info = self.data[:security_groups].values
 
           aliases = {
             'description' => 'groupDescription',

data/lib/fog/compute/requests/aws/describe_snapshots.rb

@@ -23,6 +23,8 @@ module Fog
         #       * 'startTime'<~Time>: Timestamp of when snapshot was initiated
         #       * 'status'<~String>: Snapshot state, in ['pending', 'completed']
         #       * 'volumeId'<~String>: Id of volume that snapshot contains
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSnapshots.html]
         def describe_snapshots(filters = {}, options = {})
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead[/] [light_black](#{caller.first})[/]")
@@ -61,7 +63,7 @@ module Fog
 
           response = Excon::Response.new
 
-          snapshot_set = @data[:snapshots].values
+          snapshot_set = self.data[:snapshots].values
 
           if filters.delete('owner-alias')
             Formatador.display_line("[yellow][WARN] describe_snapshots with owner-alias is not mocked[/] [light_black](#{caller.first})[/]")
@@ -91,10 +93,10 @@ module Fog
           snapshot_set.each do |snapshot|
             case snapshot['status']
             when 'in progress', 'pending'
-              if Time.now - snapshot['startTime'] > Fog::Mock.delay * 2
+              if Time.now - snapshot['startTime'] >= Fog::Mock.delay * 2
                 snapshot['progress']  = '100%'
                 snapshot['status']    = 'completed'
-              elsif Time.now - snapshot['startTime'] > Fog::Mock.delay
+              elsif Time.now - snapshot['startTime'] >= Fog::Mock.delay
                 snapshot['progress']  = '50%'
                 snapshot['status']    = 'in progress'
               else

data/lib/fog/compute/requests/aws/describe_tags.rb

@@ -19,6 +19,8 @@ module Fog
         #       * 'resourceType'<~String> - type of resource tag belongs to
         #       * 'key'<~String> - Tag's key
         #       * 'value'<~String> - Tag's value
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeTags.html]
         def describe_tags(filters = {})
           params = AWS.indexed_filters(filters)
           request({

data/lib/fog/compute/requests/aws/describe_volumes.rb

@@ -27,6 +27,8 @@ module Fog
         #         * 'instanceId'<~String> - Reference to attached instance
         #         * 'status'<~String> - Attachment state
         #         * 'volumeId'<~String> - Reference to volume
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVolumes.html]
         def describe_volumes(filters = {})
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead[/] [light_black](#{caller.first})[/]")
@@ -52,7 +54,7 @@ module Fog
 
           response = Excon::Response.new
 
-          volume_set = @data[:volumes].values
+          volume_set = self.data[:volumes].values
           volume_set = apply_tag_filters(volume_set, filters)
           
           aliases = {
@@ -83,22 +85,22 @@ module Fog
           volume_set.each do |volume|
             case volume['status']
             when 'attaching'
-              if Time.now - volume['attachmentSet'].first['attachTime'] > Fog::Mock.delay
+              if Time.now - volume['attachmentSet'].first['attachTime'] >= Fog::Mock.delay
                 volume['attachmentSet'].first['status'] = 'in-use'
                 volume['status'] = 'in-use'
               end
             when 'creating'
-              if Time.now - volume['createTime'] > Fog::Mock.delay
+              if Time.now - volume['createTime'] >= Fog::Mock.delay
                 volume['status'] = 'available'
               end
             when 'deleting'
-              if Time.now - @data[:deleted_at][volume['volumeId']] > Fog::Mock.delay
-                @data[:deleted_at].delete(volume['volumeId'])
-                @data[:volumes].delete(volume['volumeId'])
+              if Time.now - self.data[:deleted_at][volume['volumeId']] >= Fog::Mock.delay
+                self.data[:deleted_at].delete(volume['volumeId'])
+                self.data[:volumes].delete(volume['volumeId'])
               end
             end
           end
-          volume_set = volume_set.reject {|volume| !@data[:volumes][volume['volumeId']]}
+          volume_set = volume_set.reject {|volume| !self.data[:volumes][volume['volumeId']]}
 
           response.status = 200
           response.body = {

data/lib/fog/compute/requests/aws/detach_volume.rb

@@ -23,6 +23,8 @@ module Fog
         #     * 'requestId'<~String> - Id of request
         #     * 'status'<~String> - Status of volume
         #     * 'volumeId'<~String> - Reference to volume
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DetachVolume.html]
         def detach_volume(volume_id, options = {})
           request({
             'Action'    => 'DetachVolume',
@@ -39,7 +41,7 @@ module Fog
         def detach_volume(volume_id, options = {})
           response = Excon::Response.new
           response.status = 200
-          if (volume = @data[:volumes][volume_id]) && !volume['attachmentSet'].empty?
+          if (volume = self.data[:volumes][volume_id]) && !volume['attachmentSet'].empty?
             data = volume['attachmentSet'].pop
             volume['status'] = 'available'
             response.status = 200

data/lib/fog/compute/requests/aws/disassociate_address.rb

@@ -15,6 +15,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DisassociateAddress.html]
         def disassociate_address(public_ip)
           request(
             'Action'    => 'DisassociateAddress',
@@ -31,9 +33,9 @@ module Fog
         def disassociate_address(public_ip)
           response = Excon::Response.new
           response.status = 200
-          if address = @data[:addresses][public_ip]
+          if address = self.data[:addresses][public_ip]
             instance_id = address['instanceId']
-            instance = @data[:instances][instance_id]
+            instance = self.data[:instances][instance_id]
             instance['ipAddress']         = instance['originalIpAddress']
             instance['dnsName']           = Fog::AWS::Mock.dns_name_for(instance['ipAddress'])
             address['instanceId'] = nil

data/lib/fog/compute/requests/aws/get_console_output.rb

@@ -17,6 +17,8 @@ module Fog
         #     * 'output'<~String> - Console output
         #     * 'requestId'<~String> - Id of request
         #     * 'timestamp'<~Time> - Timestamp of last update to output
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-GetConsoleOutput.html]
         def get_console_output(instance_id)
           request(
             'Action'      => 'GetConsoleOutput',
@@ -32,7 +34,7 @@ module Fog
 
         def get_console_output(instance_id)
           response = Excon::Response.new
-          if instance = @data[:instances][instance_id]
+          if instance = self.data[:instances][instance_id]
             response.status = 200
             response.body = {
               'instanceId'    => instance_id,

data/lib/fog/compute/requests/aws/get_password_data.rb

@@ -19,6 +19,8 @@ module Fog
         #     * 'timestamp'<~Time> - Timestamp of last update to output
         #
         # See http://docs.amazonwebservices.com/AWSEC2/2010-08-31/APIReference/index.html?ApiReference-query-GetPasswordData.html
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-GetPasswordData.html]
         def get_password_data(instance_id)
           request(
             'Action'      => 'GetPasswordData',
@@ -33,7 +35,19 @@ module Fog
       class Mock
 
         def get_password_data(instance_id)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          if instance = self.data[:instances][instance_id]
+            response.status = 200
+            response.body = {
+              'instanceId'   => instance_id,
+              'passwordData' => nil,
+              'requestId'    => Fog::AWS::Mock.request_id,
+              'timestamp'    => Time.now
+            }
+            response
+          else;
+            raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_id}' does not exist")
+          end
         end
 
       end