fog 0.10.0 → 0.11.0

data/lib/fog/compute/models/brightbox/account.rb

@@ -23,7 +23,7 @@ module Fog
         attribute :telephone_verified
         attribute :ram_limit
         attribute :ram_used
-        attribute :limits_cloudips
+        attribute :cloud_ips_limit
         attribute :library_ftp_host
         attribute :library_ftp_user
         # This is always returned as null/nil unless performing a reset_ftp_password request

data/lib/fog/compute/models/brightbox/server.rb

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class Brightbox
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
 
         identity  :id
 

data/lib/fog/compute/models/go_grid/server.rb

@@ -1,4 +1,4 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
@@ -6,7 +6,7 @@ module Fog
 
       class BlockInstantiationError < StandardError; end
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
         extend Fog::Deprecation
         deprecate(:ip, :public_ip_address)
 
@@ -70,22 +70,6 @@ module Fog
           true
         end
 
-        def ssh(commands)
-          requires :identity, :public_ip_address, :username
-
-          options = {}
-          options[:key_data] = [private_key] if private_key
-          Fog::SSH.new(public_ip_address, username, options).run(commands)
-        end
-
-        def scp(local_path, remote_path, upload_options = {})
-          requires :public_ip_address, :username
-
-          scp_options = {}
-          scp_options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
-        end
-
         def setup(credentials = {})
           requires :identity, :public_ip_address, :public_key, :username
           Fog::SSH.new(public_ip_address, username, credentials).run([

data/lib/fog/compute/models/linode/server.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class Linode
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
         attr_reader :stack_script
         identity :id
         attribute :name
@@ -31,7 +31,7 @@ module Fog
 
         def boot
           connection.linode_boot id, config
-        end        
+        end
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
@@ -61,14 +61,14 @@ module Fog
         def config
           connection.linode_config_list(id).body['DATA'].first['ConfigID']
         end
-        
+
         def create_linode
           self.id = connection.linode_create(@data_center.id, @flavor.id, @payment_terms).body['DATA']['LinodeID']
           connection.linode_update id, :label => @name
           ips.create
           reload
         end
-        
+
         def create_disks
           @swap = disks.create :type => :swap, :name => @name, :size => @flavor.ram
           @disk = disks.create(:type => @type, :image => @image, :stack_script => @stack_script,

data/lib/fog/compute/models/ninefold/server.rb

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class Ninefold
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
         extend Fog::Deprecation
         deprecate :serviceofferingid, :flavor_id
         deprecate :templateid,        :image_id

data/lib/fog/compute/models/rackspace/server.rb

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class Rackspace
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
 
         identity :id
 
@@ -112,22 +112,6 @@ module Fog
           retry
         end
 
-        def ssh(commands)
-          requires :public_ip_address, :identity, :username
-
-          options = {}
-          options[:key_data] = [private_key] if private_key
-          Fog::SSH.new(public_ip_address, username, options).run(commands)
-        end
-
-        def scp(local_path, remote_path, upload_options = {})
-          requires :public_ip_address, :username
-
-          scp_options = {}
-          scp_options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
-        end
-
         def username
           @username ||= 'root'
         end

data/lib/fog/compute/models/server.rb

@@ -0,0 +1,27 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Server < Fog::Model
+
+      def scp(local_path, remote_path, upload_options = {})
+        require 'net/scp'
+        requires :public_ip_address, :username
+
+        scp_options = {}
+        scp_options[:key_data] = [private_key] if private_key
+        Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
+      end
+
+      def ssh(commands)
+        require 'net/ssh'
+        requires :public_ip_address, :username
+
+        options = {}
+        options[:key_data] = [private_key] if private_key
+        Fog::SSH.new(public_ip_address, username, options).run(commands)
+      end
+
+    end
+  end
+end

data/lib/fog/compute/models/slicehost/server.rb

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class Slicehost
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
 
         identity :id
 
@@ -102,22 +102,6 @@ module Fog
           retry
         end
 
-        def ssh(commands)
-          requires :addresses, :identity, :username
-
-          options = {}
-          options[:key_data] = [private_key] if private_key
-          Fog::SSH.new(addresses.first, username, options).run(commands)
-        end
-
-        def scp(local_path, remote_path, upload_options = {})
-          requires :addresses, :username
-
-          scp_options = {}
-          scp_options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(addresses.first, username, scp_options).upload(local_path, remote_path, upload_options)
-        end
-
         def username
           @username ||= 'root'
         end

data/lib/fog/compute/models/storm_on_demand/server.rb

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class StormOnDemand
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
         identity :uniq_id
 
         attribute :accnt
@@ -25,7 +25,7 @@ module Fog
         attribute :template_description
         attribute :zone
         attribute :active
-        
+
         attr_writer :password, :username
 
         def initialize(attributes={})

data/lib/fog/compute/models/voxel/server.rb

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class Voxel
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
 
         identity :id
 

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

@@ -7,8 +7,9 @@ module Fog
 
           def reset
             @block_device_mapping = {}
-            @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'tagSet' => {} }
+            @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }
             @response = { 'imagesSet' => [] }
+            @state_reason = {}
             @tag = {}
           end
 
@@ -17,6 +18,8 @@ module Fog
             case name
             when 'blockDeviceMapping'
               @in_block_device_mapping = true
+            when 'stateReason'
+              @in_state_reason = true
             when 'tagSet'
               @in_tag_set = true
             end
@@ -45,9 +48,18 @@ module Fog
                   @image['blockDeviceMapping'] << @block_device_mapping
                   @block_device_mapping = {}
               end
+            elsif @in_state_reason
+              case name
+              when 'code', 'message'
+                @state_reason[name] = value
+              when 'stateReason'
+                @image['stateReason'] = @state_reason
+                @state_reason = {}
+                @in_state_reason = false
+              end
             else
               case name
-              when 'architecture', 'description', 'imageId', 'imageLocation', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'name', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName','virtualizationType'
+              when 'architecture', 'description', 'hypervisor', 'imageId', 'imageLocation', 'imageOwnerAlias', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'name', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName','virtualizationType'
                 @image[name] = value
               when 'isPublic'
                 if value == 'true'
@@ -57,7 +69,7 @@ module Fog
                 end
               when 'item'
                 @response['imagesSet'] << @image
-                @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'tagSet' => {} }
+                @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }
               when 'productCode'
                 @image['productCodes'] << value
               when 'requestId'

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

@@ -30,7 +30,7 @@ module Fog
               @instance['placement'][name] = value
             when 'architecture', 'clientToken', 'dnsName', 'imageId',
                   'instanceId', 'instanceType', 'ipAddress', 'kernelId',
-                  'keyName', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
+                  'keyName', 'platform', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
                   'reason', 'rootDeviceType'
               @instance[name] = value
             when 'attachTime'

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

@@ -8,8 +8,9 @@ module Fog
           def reset
             @group = {}
             @ip_permission = { 'groups' => [], 'ipRanges' => []}
+            @ip_permission_egress = { 'groups' => [], 'ipRanges' => []}
             @ip_range = {}
-            @security_group = { 'ipPermissions' => [] }
+            @security_group = { 'ipPermissions' => [], 'ipPermissionsEgress' => [] }
             @response = { 'securityGroupInfo' => [] }
           end
 
@@ -20,6 +21,8 @@ module Fog
               @in_groups = true
             when 'ipPermissions'
               @in_ip_permissions = true
+            when 'ipPermissionsEgress'
+              @in_ip_permissions_egress = true
             when 'ipRanges'
               @in_ip_ranges = true
             end
@@ -30,7 +33,11 @@ module Fog
             when 'cidrIp'
               @ip_range[name] = value
             when 'fromPort', 'toPort'
-              @ip_permission[name] = value.to_i
+              if @in_ip_permissions_egress
+                @ip_permission_egress[name] = value.to_i              
+              else
+                @ip_permission[name] = value.to_i
+              end
             when 'groups'
               @in_groups = false
             when 'groupDescription', 'ownerId'
@@ -43,23 +50,40 @@ module Fog
               end
             when 'ipPermissions'
               @in_ip_permissions = false
+            when 'ipPermissionsEgress'
+              @in_ip_permissions_egress = false
             when 'ipProtocol'
-              @ip_permission[name] = value
+              if @in_ip_permissions_egress
+                @ip_permission_egress[name] = value
+              else
+                @ip_permission[name] = value
+              end
             when 'ipRanges'
               @in_ip_ranges = false
             when 'item'
               if @in_groups
-                @ip_permission['groups'] << @group
+                if @in_ip_permissions_egress
+                  @ip_permission_egress['group'] << @group
+                else
+                  @ip_permission['groups'] << @group
+                end
                 @group = {}
               elsif @in_ip_ranges
-                @ip_permission['ipRanges'] << @ip_range
+                if @in_ip_permissions_egress
+                  @ip_permission_egress['ipRanges'] << @ip_range
+                else
+                  @ip_permission['ipRanges'] << @ip_range
+                end
                 @ip_range = {}
               elsif @in_ip_permissions
                 @security_group['ipPermissions'] << @ip_permission
                 @ip_permission = { 'groups' => [], 'ipRanges' => []}
-               else
+              elsif @in_ip_permissions_egress
+                @security_group['ipPermissionsEgress'] << @ip_permission_egress
+                @ip_permission_egress = { 'groups' => [], 'ipRanges' => []}
+              else
                 @response['securityGroupInfo'] << @security_group
-                @security_group = { 'ipPermissions' => [] }
+                @security_group = { 'ipPermissions' => [], 'ipPermissionsEgress' => [] }
               end
             when 'requestId'
               @response[name] = value

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

@@ -25,6 +25,7 @@ module Fog
         #       * 'description'<~String> - Description of image
         #       * 'imageId'<~String> - Id of the image
         #       * 'imageLocation'<~String> - Location of the image
+        #       * 'imageOwnerAlias'<~String> - Alias of the owner of the image
         #       * 'imageOwnerId'<~String> - Id of the owner of the image
         #       * 'imageState'<~String> - State of the image
         #       * 'imageType'<~String> - Type of the image
@@ -59,22 +60,25 @@ module Fog
 
         def describe_images(filters = {})
           unless filters.is_a?(Hash)
-            Formatador.display_line("[yellow][WARN] describe_images with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead[/] [light_black](#{caller.first})[/]")
-            filters = {'snapshot-id' => [*filters]}
+            Formatador.display_line("[yellow][WARN] describe_images with #{filters.class} param is deprecated, use describe_images('image-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'image-id' => [*filters]}
           end
-          
+
           if filters.keys.any? {|key| key =~ /^block-device/}
             Formatador.display_line("[yellow][WARN] describe_images block-device-mapping filters are not yet mocked[/] [light_black](#{caller.first})[/]")
             Fog::Mock.not_implemented
           end
-          
-          if filters.keys.any? {|key| key =~ /^tag/}
-            Formatador.display_line("[yellow][WARN] describe_images tag filters are not yet mocked[/] [light_black](#{caller.first})[/]")
-            Fog::Mock.not_implemented
+
+          if owner = filters.delete('Owner')
+            if owner == 'self'
+              filters['owner-id'] = self.data[:owner_id]
+            else
+              filters['owner-alias'] = owner
+            end
           end
-          
+
           response = Excon::Response.new
-          
+
           aliases = {
             'architecture'        => 'architecture',
             'description'         => 'description',
@@ -84,7 +88,8 @@ module Fog
             'is-public'           => 'isPublic',
             'kernel-id'           => 'kernelId',
             'manifest-location'   => 'manifestLocation',
-            'name'                => 'name',            
+            'name'                => 'name',
+            'owner-alias'         => 'imageOwnerAlias',
             'owner-id'            => 'imageOwnerId',
             'ramdisk-id'          => 'ramdiskId',
             'root-device-name'    => 'rootDeviceName',
@@ -92,12 +97,26 @@ module Fog
             'state'               => 'imageState',
             'virtualization-type' => 'virtualizationType'
           }
-          
+
           image_set = self.data[:images].values
-          
+
           for filter_key, filter_value in filters
-            aliased_key = aliases[filter_key]
-            image_set = image_set.reject{|image| ![*filter_value].include?(image[aliased_key])}
+            if tag_key = filter_key.split('tag:')[1]
+              image_set = image_set.reject{|image| ![*filter_value].include?(image['tagSet'][tag_key])}
+            else
+              aliased_key = aliases[filter_key]
+              image_set = image_set.reject{|image| ![*filter_value].include?(image[aliased_key])}
+            end
+          end
+
+          image_set = image_set.map do |image|
+            case image['imageState']
+            when 'pending'
+              if Time.now - image['registered'] >= Fog::Mock.delay
+                image['imageState'] = 'available'
+              end
+            end
+            image.reject { |key, value| ['registered'].include?(key) }
           end
 
           response.status = 200